Commit graph

6494 commits

Author SHA1 Message Date
Nick Winter
0e13e25d0a Merge branch 'fcrozetta-master' 2014-12-11 06:15:16 -08:00
Nick Winter
7b9f4bcbc4 Merged pt-BR.coffee. 2014-12-11 06:15:07 -08:00
Nick Winter
ddffe56522 Merge branch 'ericshentw-master' 2014-12-11 06:09:44 -08:00
Nick Winter
f73bf73344 Merged zh-HANS.coffee. 2014-12-11 06:09:23 -08:00
nixel2007
ae1aca8917 update ru.coffee. Line-sync to en, more translation 2014-12-11 13:55:01 +03:00
Nick Winter
e37c1afc17 Properly ended HoC sale price. 2014-12-10 21:24:42 -08:00
Nick Winter
dae39321e2 Properly ended HoC sale price. 2014-12-10 21:21:00 -08:00
Matt Lott
d4cfaac7e5 Sub price test 2014-12-10 16:05:55 -08:00
FedericoTomas
7aae2096de Update es-419.coffee 2014-12-10 19:22:52 -03:00
Scott Erickson
02953d0e6c Set up a subscription page with subscription info and the subscribe button, taking that logic out of the payments page. 2014-12-10 13:42:12 -08:00
Nick Winter
84cdc5d150 Undisabled new adventurer levels. 2014-12-10 11:28:06 -08:00
Scott Erickson
e870de6146 Tweaked SpriteParser to be smarter about finding root MovieClips and shifting their bounds. 2014-12-10 11:22:47 -08:00
Nick Winter
87c34e81c6 Using new border image popover backgrounds. 2014-12-10 11:00:52 -08:00
Scott Erickson
94a400bfd8 Hero icons now show up on the world map on levels where you can unlock them. 2014-12-10 10:45:11 -08:00
Nick Winter
f8661c4a96 Added the lock image, actually. 2014-12-10 10:40:10 -08:00
Nick Winter
239f94697f Fixed IE hero lock image. 2014-12-10 10:37:57 -08:00
Nick Winter
d51db43823 Added desert campaign. 2014-12-10 10:00:52 -08:00
Nick Winter
2b0231e95f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-12-10 09:45:34 -08:00
Scott Erickson
bf80307142 Put in new, smaller versions of the world map and loading wings for smaller screens. 2014-12-10 09:45:00 -08:00
LetsPlentendo
9fe8e80fba Some more translations made... 2014-12-10 14:12:35 +01:00
kisik21
da843f2d57 Fixed ru.coffee
fixed error: coffeescript_error at line 627
2014-12-10 16:05:04 +03:00
kisik21
6a13c9b0f8 Update ru.coffee
Перевел еще немного. Можете кидаться в меня тапками, но большинство переведенного находится в разделе найма работников. Большая часть остального уже переведена. Вот какой должна быть командная работа!
Translated more things. You can kill me, but big part of this update is in recruiting dashboard. Other things are mostly already translated. That's what the team work should be!
2014-12-10 15:55:34 +03:00
nixel2007
83033287ad Update DiplomatView.coffee
Added myself as ru-diplomat.
2014-12-10 13:20:54 +03:00
nixel2007
72d81630c4 update ru
employers, admin blocks, misc
2014-12-10 13:15:55 +03:00
Nick Winter
b65bc2dd39 Show cool victory text image for players with language defaulted to English. 2014-12-09 19:23:11 -08:00
Scott Erickson
0b36e15c50 Updated SoundJS again. 2014-12-09 17:59:34 -08:00
nykkole
d9a96c3812 Update de-DE.coffee
Translated some sentences
2014-12-09 17:17:57 -08:00
George Saines
40582e97bd adding desert map 2014-12-09 16:16:55 -08:00
Scott Erickson
e86020f3a6 Tweaking responseType to be an empty string, because SoundJS uses it to determine how it treats XHR objects. 2014-12-09 15:58:25 -08:00
Matt Lott
fbece1ddd0 Only show sync pvp UI to admins
Sync PVP isn’t ready for primetime.
2014-12-09 14:30:50 -08:00
Nick Winter
33ea572cdf You know, actually call the method that starts simulating. 2014-12-09 14:21:55 -08:00
Nick Winter
a9247c5018 Decreased amount of unintended menu-button-click sounds. 2014-12-09 14:01:03 -08:00
Matt Lott
8df3eed824 Add revenue tracking to analytics 2014-12-09 13:57:04 -08:00
Scott Erickson
c6502f5dab Updated SoundJS 2014-12-09 13:41:44 -08:00
Scott Erickson
876a663690 Fixed server tests. 2014-12-09 13:41:44 -08:00
Scott Erickson
46f7bbaaf5 Fixed client tests. Also updated mock-ajax to the latest version, carrying over my own tweaks. 2014-12-09 13:41:44 -08:00
Nick Winter
8791eded2c Starting to add Patrol Buster to the world map. 2014-12-09 12:38:58 -08:00
AtaZh
4a5f2f0630 Update uk.locale
Translated several strings, put some commas, capitalized letter 'в' in a polite form 'Ви' (=You), made some other corrections.
Translated but didn't uncomment some unclear phrases for me.
Hope, I didn't delete smth on the go. Would be glad to be helpful.
2014-12-09 22:07:59 +02:00
jonidimo
d9945c03ba Update es-419.coffee
Add some new lines in spanish
2014-12-09 17:02:58 -03:00
Rubiconline
2c92286e46 Update fr.coffee 2014-12-09 20:20:40 +01:00
Nick Winter
7651eaf6cc Fixed A/B test to fire with default English language. 2014-12-09 11:15:03 -08:00
Nick Winter
6f437d11b1 Some work on making simulation unstoppable. 2014-12-09 09:00:34 -08:00
David Nagy
aec43c086b Update hu.coffee 2014-12-09 14:46:58 +00:00
Nick Winter
a97baa2207 HoC sale. 2014-12-09 06:06:14 -08:00
Nick Winter
5365a9fdf1 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-12-09 05:38:28 -08:00
fcrozetta
0c890e6f6d Some translation (pt-BR) 2014-12-09 11:35:30 -02:00
nykkole
9f97c3feb9 Update de-DE.coffee
Translated some sentences.
For the lines 378, 379, 610-613 it might be helpful for the translations to get a bit of context.
Thank you!
nykkole
2014-12-09 00:05:10 -08:00
Matt Lott
6c60f70914 Update subscribe modal copy A/B test 2014-12-09 00:04:07 -08:00
Matt Lott
1aff798c5e A/B Test alternate subscribe modal copy 2014-12-08 23:43:52 -08:00
Nick Winter
58d549fa8a Styled log out button on world map. 2014-12-08 18:49:45 -08:00