Nick Winter
d341e59b54
Merge branch 'master' of git://github.com/ArthurLu/codecombat into ArthurLu-master
2015-02-03 12:29:16 -08:00
Bård Eik-Hvidsten
5159ff56f7
Update nb.coffee
2015-02-03 20:25:05 +01:00
Imperadeiro98
2448be11b3
Small fix
2015-02-03 18:25:13 +00:00
Imperadeiro98
036ae7d7f7
Revert "Update zh-HANT.coffee"
2015-02-03 18:16:32 +00:00
Imperadeiro98
51f55bb376
Merge pull request #2230 from Coderaulic/patch-1
...
Update ja.coffee
2015-02-03 18:03:47 +00:00
Imperadeiro98
5fb9268603
Merge pull request #2229 from ArthurLu/patch-1
...
Update zh-HANT.coffee
2015-02-03 18:02:26 +00:00
Nick Winter
86aa265679
Added campaign label banner art.
2015-02-03 09:56:27 -08:00
Pammer
bd5ddab9e9
Update ru.coffee
2015-02-04 01:18:49 +09:00
newmilktea
275fb219a3
Update zh-HANT.coffee
2015-02-03 23:54:13 +08:00
newmilktea
89d4ca6039
Update zh-HANT.coffee
2015-02-03 23:26:17 +08:00
Pammer
641e8d7abf
Update ru.coffee
2015-02-03 14:37:58 +09:00
Coderaulic
d8cdb6960c
Update ja.coffee
...
Updated misc translations.
2015-02-02 20:13:58 -08:00
Arthur
d47a04208a
Update zh-HANT.coffee
...
Finish the rest of general
2015-02-03 11:50:55 +08:00
Arthur
752e71f74c
Update zh-HANT.coffee
...
update the part of general
2015-02-03 11:36:21 +08:00
Nick Winter
60d68ca23c
Fixed some memory leaks and particle disposal problems. Re-enabled particles. Tweaked particle stylings.
2015-02-02 18:02:57 -08:00
Imperadeiro98
837ad8b5a4
Update pt-PT.coffee
2015-02-02 20:20:41 +00:00
Nick Winter
b3db9962bd
Propagated i18n.
2015-02-02 11:51:15 -08:00
Nick Winter
3f78071e5e
A few small fixes.
2015-02-02 11:50:25 -08:00
Imperadeiro98
cd61969475
Small fixes for last PR
2015-02-02 19:48:42 +00:00
Imperadeiro98
3d5ae45565
Merge pull request #2201 from Coderaulic/patch-1
...
Update ja.coffee
2015-02-02 19:44:55 +00:00
Nick Winter
c8a5712d43
Merge pull request #2197 from purenickery/patch-3
...
Update en.coffee
2015-02-02 09:24:32 -08:00
Nick Winter
730753d67b
Merge pull request #2196 from purenickery/patch-2
...
Update level_loading.jade
2015-02-02 09:24:25 -08:00
Nick Winter
6e9db9f39b
Merge pull request #2189 from purenickery/patch-1
...
Update names.coffee
2015-02-02 09:20:36 -08:00
Nick Winter
59a6d369a3
Merge pull request #2183 from rishiloyola/patch-7
...
Update hero-victory-modal.sass
2015-02-02 09:00:27 -08:00
Coderaulic
92e779259a
Update ja.coffee
...
Fixed miscellaneous translations from previous.
Updated all of -
game_menu:
inventory:
buy_gems:
choose_hero:
general:
I left in the original English as comments for long translations should there be a need to revisit, unless single words.
Lines 179, 186, 155, 396 all seem to cause 'compiler error'. They begin with key words so not sure how to fix those...maybe senior coder can take a look and fix?
2015-02-01 21:38:38 -08:00
Imperadeiro98
6551395278
A little fix
2015-02-01 19:19:22 +00:00
Imperadeiro98
734a401974
Merge pull request #2199 from nixel2007/master
...
Update ru.coffee
2015-02-01 19:18:20 +00:00
Imperadeiro98
afe188104b
Fixed a typo
2015-02-01 19:16:51 +00:00
nixel2007
f70f1e2896
ru.coffee - teachers block
2015-02-01 21:58:23 +03:00
nixel2007
25190a5dfd
Update ru.coffee
...
Leaderboard block + unlock_help_vidoes
2015-02-01 17:16:12 +03:00
Imperadeiro98
3068f18443
Added a translator
2015-02-01 11:01:18 +00:00
Nick Winter
55bc48c61d
Fixed problem with error messages in production.
2015-01-31 18:40:38 -08:00
Nick Winter
415cbceaf9
Disabling particles for now until performance can be fixed.
2015-01-31 16:59:03 -08:00
purenickery
b47bbe5704
Update en.coffee
2015-01-31 17:01:57 -07:00
purenickery
81b69e0c3c
Update level_loading.jade
2015-01-31 17:01:43 -07:00
Nick Winter
1e410e0b14
Worked around bug with item portraits disappearing after item purchase. Fixed #1980 .
2015-01-31 14:38:54 -08:00
purenickery
b7624c0c58
Update names.coffee
...
-added new names for #53
2015-01-31 15:26:41 -07:00
Imperadeiro98
1b42dceb4f
Last merge fix
2015-01-31 22:02:26 +00:00
Coderaulic
bf54331f21
Update ja.coffee
...
Updated translation in:
nav:
play:
login:
signup:
recover:
items:
units: Note that in Japanese, measurements of time don't have individual or singular form: As in "a year" and "years" is still the same.
play_level:
2015-01-31 13:47:40 -08:00
Imperadeiro98
95b6801dab
Update about.jade
2015-01-31 21:43:43 +00:00
Imperadeiro98
128dc55c1d
Merge pull request #2187 from SuperPranx/patch-2
...
Added a few translations
2015-01-31 21:23:08 +00:00
Nick Winter
936ebf67a7
Fixed #2140 .
2015-01-31 13:18:32 -08:00
Nick Winter
26ac0c8947
Making sure tooltips are destroyed when their parent views are destroyed.
2015-01-31 12:48:44 -08:00
Nick Winter
4b388f2775
Fixed some memory leaks. Fixed a couple minor bugs.
2015-01-31 12:23:44 -08:00
Ivan Milanov
15939cbc17
Added a few translations
2015-01-31 21:19:23 +01:00
Imperadeiro98
b8214e8b3c
Last merge fixes
2015-01-31 19:02:24 +00:00
Imperadeiro98
a0e4a410f7
Merge pull request #2185 from jacobakkerboom/patch-2
...
Update nl-NL.coffee
2015-01-31 18:53:59 +00:00
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
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
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
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
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
Matt Lott
8b51c3cb5d
Stop subscribe modal A/B test
...
Group A (original) wins.
2015-01-28 16:20:10 -08:00
yaur
dc39a55cf8
remove logging
2015-01-28 18:37:07 -05:00
yaur
30f9188090
Remove the scheme from help videos so that they maintain the scheme of the
...
calling page
2015-01-28 18:33:28 -05:00
nixel2007
1ff5832436
fix ru.coffee
2015-01-28 22:07:19 +03:00
nixel2007
d086555fb7
Update ru.coffee
2015-01-28 21:50:16 +03:00
Imperadeiro98
354a7cb71b
Merge pull request #2160 from rsiwady29/spanish_translations
...
Update es-419.coffee
2015-01-28 18:18:35 +00:00
Imperadeiro98
8cf424f7ef
Update pt-PT.coffee
2015-01-28 18:16:34 +00:00
