Commit graph

7039 commits

Author SHA1 Message Date
Nick Winter
b538a83fd1 Oops, that was just for testing... 2015-01-31 10:37:43 -08:00
Popey Gilbert
ec5d54cc97 Merge branch 'master' of https://github.com/codecombat/codecombat 2015-01-31 10:10:24 -08:00
Popey Gilbert
8098c76ba5 Changed Particles 2015-01-31 10:08:54 -08:00
Nick Winter
c977ecc16f Adding easy observing of leaderboard matches (except top 5). 2015-01-31 10:04:11 -08:00
Jacob
cf76143e60 Update nl-NL.coffee
Worked upwards from the bottom until the section "about". Edited some longer sentences reasonably carefully. Made use of the word email more consistent, by changing most to email. Wiki says the official spelling is e-mail, so perhaps we should revert this, but I think consistency is most important. I suppose we should work together with our Belgian partners, but I have only looked at the NL version. Again, feel free to contact me. I will browse some more in the Dutch version to see if everything looks ok.
2015-01-31 17:28:27 +01:00
Nick Winter
c5e47fda50 Merge pull request #2184 from Imperadeiro98/master
i18n of teachers page, and some fixes to legal and about
2015-01-31 07:36:22 -08:00
Imperadeiro98
55d9731720 Removed Scott's website
It was not working.
2015-01-31 15:04:50 +00:00
Imperadeiro98
850cd99069 i18n of teachers (part 2) 2015-01-31 14:17:24 +00:00
Imperadeiro98
06860f4338 Added teachers strings 2015-01-31 14:06:32 +00:00
Imperadeiro98
bae3053585 i18n of teachers (part 1) 2015-01-31 12:57:32 +00:00
Imperadeiro98
d497a3ac24 Update legal.jade 2015-01-31 12:42:57 +00:00
Imperadeiro98
7cb2a9403b Using .spr and .spl
Also removed an image that was not working
2015-01-31 12:35:02 +00:00
Imperadeiro98
24529d0d7c Update legal.sass 2015-01-31 12:11:09 +00:00
Rishi
106d5f640e Update hero-victory-modal.sass 2015-01-31 17:40:34 +05:30
Imperadeiro98
d99e790df1 Fixed last merge issue 2015-01-31 11:04:11 +00:00
Imperadeiro98
3db3b0790c Merge pull request #2177 from negesti/patch-2
Update de-DE.coffee
2015-01-31 11:03:48 +00:00
Nick Winter
031a32ce44 Merge pull request #2182 from sotonin/patch-1
Adding support for hudName property
2015-01-30 22:08:17 -08:00
sotonin
751ae0fac8 Adding support for hudName property 2015-01-31 00:07:23 -06:00
Nick Winter
e59f2bcc62 Recording scores even for non-real-time-submit levels. 2015-01-30 22:06:22 -08:00
Nick Winter
022d31c19a Basic leaderboards are working. 2015-01-30 21:36:48 -08:00
Nick Winter
4efbe0a12f Leaderboard skeletons. 2015-01-30 21:36:47 -08:00
Matt Lott
a092444455 Add browser info to level session 2015-01-30 14:45:36 -08:00
Nick Winter
848341dbd1 I guess I'll be finding these for a while. 2015-01-30 11:24:48 -08:00
Matt Lott
58f8eb6688 Add support for premium video tutorials 2015-01-30 10:48:49 -08:00
negesti
1eeeb25315 Update de-DE.coffee 2015-01-30 19:32:50 +01:00
Nick Winter
f78ea3d786 Yaaaaay 2015-01-30 09:40:46 -08:00
Nick Winter
2571b41cca Found another one, missed due to insufficient grep-fu. 2015-01-30 09:24:07 -08:00
Nick Winter
9ca2663e0e Fixed one more instance of the previous bug. 2015-01-30 08:12:34 -08:00
Nick Winter
36fcd1bb79 Merge branch 'master' of https://github.com/codecombat/codecombat 2015-01-30 07:52:09 -08:00
Nick Winter
77cca7189f Updated a bunch of code that got busted with CoffeeScript 1.9.0. 2015-01-30 07:51:57 -08:00
Imperadeiro98
ad05ddc221 Fixed merge issues 2015-01-30 15:33:53 +00:00
Imperadeiro98
32dc5fdc34 Merge pull request #2176 from jacobakkerboom/patch-1
Update nl-NL.coffee,
2015-01-30 15:30:32 +00:00
Imperadeiro98
cd7f09e626 Merge pull request #2172 from JulR43/patch-1
Update fr.coffee
2015-01-30 15:29:23 +00:00
Jacob
6e08e5406e Update nl-NL.coffee,
Submitted reasonably many translations. Did not look how the translations looked on my own server, but I did recognise most texts for which I provided a translation (so that for most options I had a good idea what their purpose was). This is my first edit, so I am not well aware of any unwritten rules about translating. 

I tried to be reasonable in using comments. For some things like the translation of subscriber (abonnee), running (uitvoeren o.i.d.) and equipment (uitrusting) some discussion might be nice, in order to have consistency. I have however refrained from using very long comments. I am actually not even aware of what the default action is when no translation is present, which I assume is simply to use the English version. I suppose the main purpose of the Dutch translation is to help children, so this is what I mainly had in mind. Feel free to contact me about subjects like this. I will try to learn more by inspecting previous edits.
2015-01-30 12:42:27 +01:00
Nick Winter
39ad9b8e35 Show hero unlocks in campaign editor, too. 2015-01-29 19:29:37 -08:00
Nick Winter
1630b30351 Fixed showing hero unlock portraits on world map. Showing them now even before their levels are unlocked, and showing until you purchase, not just unlock them. 2015-01-29 19:05:30 -08:00
Nick Winter
fd0e7a8c44 Picked some slightly less awful particle colors for different terrains and level types. Enabled for half the players. 2015-01-29 18:19:03 -08:00
Matt Lott
92f070ecca Fix help video events
Removing the protocol broke the video player event hooks.
2015-01-29 16:45:18 -08:00
Nick Winter
5addacddf0 First draft of ParticleMan particle emitters for showing hidden levels in CampaignView. 2015-01-29 16:11:13 -08:00
Nick Winter
57d12c199e Tweaks to campaign status view. Hooking up i18n for Campaigns, but it doesn't work yet. 2015-01-29 09:07:25 -08:00
JulR43
0c1897bbb3 Update fr.coffee
Several translates
2015-01-29 16:56:37 +00:00
Nick Winter
aab6d17047 Added campaign completion progress indicator. 2015-01-29 08:26:12 -08:00
Imperadeiro98
239b72dd01 Merge pull request #2169 from scenix007/patch-1
add some translation for tips
2015-01-29 16:17:34 +00:00
Imperadeiro98
093f3e93c1 Merge pull request #2170 from jhoon/patch-1
Finished translations on tips
2015-01-29 16:15:33 +00:00
Jhoon Saravia
8325d522fb Finished translations on tips 2015-01-29 08:57:29 -05:00
Long Shao
14af5c309d add some translation for tips
Update zh-HANS.coffee : add some translation for tips
2015-01-29 18:13:10 +08:00
Matt Lott
35cf7afb8d Update level played before sub script 2015-01-28 20:04:51 -08:00
Nick Winter
a6043ca1be Merge branch 'master' of https://github.com/codecombat/codecombat 2015-01-28 17:59:11 -08:00
Nick Winter
22070ddff2 Identifying lastLevel to Segment. Added Ogre Headhunter names. 2015-01-28 17:58:56 -08:00
Nick Winter
f9d2a06379 Merge pull request #2168 from yaur/master
Fix windows build
2015-01-28 17:52:49 -08:00