codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-24 08:08:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
6513 commits 27 branches 0 tags 134 MiB
Commit graph

5140 commits

Author SHA1 Message Date
Imperadeiro98
4ca342c389 Fixed spacing 2014-12-19 20:46:34 +00:00
Imperadeiro98
560a3aaf44 Merge pull request #1940 from uaMithril/patch-1 
Update uk.coffee
 2014-12-19 20:45:19 +00:00
David Nagy
0c88f9f39c Update hu.coffee 2014-12-19 20:18:08 +00:00
Scott Erickson
a742772b8f Also added campaign view jade and sass file clones. 2014-12-19 13:06:20 -05:00
Scott Erickson
23da22a559 Added a new CampaignView, cloned from WorldMapView. Will migrate to using db data rather than hardcoded data. 2014-12-19 13:04:04 -05:00
Scott Erickson
59318b2f78 Merge branch 'master' into feature/campaign-editor 2014-12-19 12:54:11 -05:00
Nick Winter
d801ed61ce Separating contact emails into premium subscriber support and basic general support. 2014-12-18 20:35:14 -08:00
George Saines
31fb5fe80e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-12-18 16:31:33 -08:00
George Saines
9e88caf1e1 redesigned the contribute page 2014-12-18 16:31:30 -08:00
Matt Lott
f853259304 Updating help videos 
Moving dungeons-of-kithgard to Vimeo
Adding original style for haunted-kithmaze
 2014-12-18 14:04:48 -08:00
Matt Lott
f2835a998a Add second kith maze help video 2014-12-18 12:05:10 -08:00
Matt Lott
7c87dc0c3a Make spell palette help label a button 2014-12-18 00:19:40 -08:00
Matt Lott
70cd8aa20d Update Vimeo embed player params 2014-12-17 23:59:59 -08:00
Matt Lott
9d4c3cc163 A/B Test video tutorial styles 2014-12-17 23:55:11 -08:00
Scott Erickson
b63b4d64da More work on the CampaignEditorView. Data gets saved to models now. 2014-12-17 22:53:04 -08:00
Matt Lott
d494dc9c79 Add video tutorials to game guide 2014-12-17 22:26:36 -08:00
Nick Winter
fe0c89e433 Reverting 1167655f and 30ed0a0e to re-enable the analytics log handler. 2014-12-17 21:54:56 -08:00
Nick Winter
1b584ae72c Some fixes for desert campaign options. 2014-12-17 19:37:57 -08:00
nemoyatpeace
0496c9338d Update SpellView.coffee 
Fixed issue #1950 so attack defaults to enemy if player has findNearest or findNearestEnemy
 2014-12-18 09:10:07 +08:00
Nick Winter
da72991260 A few misc tweaks for the new desert level options. 2014-12-17 12:42:42 -08:00
nixel2007
97cdb76b82 Fixed i18n-coverage bug 
Added analysis of the translation of all available properties
 2014-12-17 23:21:54 +03:00
Imperadeiro98
d1e4a98981 Merge pull request #1947 from Martin005/patch-4 
Update cs.coffee
 2014-12-17 15:42:48 +00:00
Martin005
821f31f02e Update cs.coffee 2014-12-17 12:19:17 +01:00
Fernando H. Crozetta
a248828493 Update pt-BR.coffee 2014-12-17 08:56:31 -02:00
Nick Winter
a98deb1ff8 Making item requiring smarter about which slots can be required for non-warriors. 2014-12-16 18:57:54 -08:00
Scott Erickson
1cc6a97e43 Added basic campaign view, working on campaign handlers. 2014-12-16 17:46:24 -08:00
Nick Winter
6e6ce6cd27 Added Minesweeper original. 2014-12-16 16:40:14 -08:00
Matt Lott
1167655faf Disable internal event tracking 
Tracking down a server CPU issue.
 2014-12-16 16:38:17 -08:00
Nick Winter
688a8dc624 Thangs can now respect custom Component colorization. 2014-12-16 12:59:39 -08:00
Imperadeiro98
31953660f4 Fixed some commented translations 2014-12-16 20:16:42 +00:00
Martin005
50058147ed Update cs.coffee 
Adding some translations again, hopefully will do them all.
 2014-12-16 21:05:50 +01:00
George Saines
9d72c37876 removing gradient 2014-12-16 11:41:07 -08:00
Nick Winter
17db7c111c Merged zh-HANS.coffee again. 2014-12-16 10:49:01 -08:00
Nick Winter
79b3d8d1a2 Merged zh-HANS.coffee. 2014-12-16 10:47:48 -08:00
nixel2007
fcc5fb7537 Update ru.coffee 
problem_alert_help
 2014-12-16 15:28:02 +03:00
Eric Shen
ec00b74c92 Update zh-HANS.coffee - account profile & employer 2014-12-16 15:57:23 +08:00
Matt Lott
f1d7fb5fbd Add help button to problem alert 2014-12-15 15:11:27 -08:00
Mithril
6554800fbd Update uk.coffee 
Added some translations
 2014-12-16 00:38:55 +02:00
Matt Lott
eadde0590e Turn off fast hero victory modal A/B test 
Didn’t make a difference in level completion, opting for no delay in
showing the modal buttons.
 2014-12-15 14:05:37 -08:00
Matt Lott
c76662c967 Log analytics events internally 2014-12-15 11:45:12 -08:00
Matt Lott
5817553d54 Remove virtual page view tracking 
Wasn’t useful, and distorts our GA real page view analytics.
 2014-12-15 10:28:40 -08:00
Rubiconline
52853a31b5 Update fr.coffee 
Only minor corrections
 2014-12-14 21:06:06 +01:00
Igzok
d6642d83d2 Update fr.coffee 2014-12-14 18:48:42 +00:00
Rubiconline
37476e7849 Update fr.coffee 2014-12-14 19:30:44 +01:00
Nick Winter
72d4cad858 Fixed analytics tracking a whole level instead of just its name in one case. Fixed a Sarven typo. 2014-12-14 07:54:50 -08:00
Nick Winter
68678a6057 Add upcoming desert levels to the world map. 2014-12-13 19:43:12 -08:00
Nick Winter
3b2bebf427 Ended HoC sale. 2014-12-13 09:00:33 -08:00
nixel2007
6d480820f3 Update ru.coffee 2014-12-13 17:45:24 +03:00
Nick Winter
dec11d77f5 Uncommented some zh-HANT section headers. 2014-12-13 06:32:59 -08:00
Nick Winter
62ad7a3d10 Merge pull request #1927 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-12-13 06:30:52 -08:00
jibaigao
77202c9bd7 Update zh-HANT.coffee 2014-12-13 13:13:35 +01:00
Imperadeiro98
2c6756675d Update pt-PT.coffee 2014-12-13 08:58:45 +00:00
Nick Winter
4d347e0d5f Propagated i18n. 2014-12-12 16:13:18 -08:00
Nick Winter
719ca503fb Merge pull request #1925 from jibaigao/patch-1 
Update zh-HANT.coffee
 2014-12-12 16:12:09 -08:00
Nick Winter
25b91f900d Merge pull request #1926 from Imperadeiro98/master 
Internationalized more stuff
 2014-12-12 16:11:03 -08:00
Scott Erickson
b0de331a10 Shored up stripe transaction payment defences to try and fix #1906. 2014-12-12 15:27:58 -08:00
Imperadeiro98
a6653501e5 Update en.coffee 2014-12-12 22:35:22 +00:00
Imperadeiro98
f98469122a Update i18n-edit-model-view.jade 2014-12-12 22:35:16 +00:00
Imperadeiro98
9c911ce149 Update thang-type-edit-view.jade 2014-12-12 22:32:19 +00:00
Imperadeiro98
e609ea7c5c Update edit.jade 2014-12-12 22:25:17 +00:00
jibaigao
023f150b5a Update zh-HANT.coffee 2014-12-12 23:16:30 +01:00
Imperadeiro98
3ab5ee22c9 Update versions-modal.jade 2014-12-12 22:15:10 +00:00
Imperadeiro98
72485eb5a9 Update patches.jade 
Couldn't figure out how to handle "Pending", "Accepted", etc.
 2014-12-12 22:04:21 +00:00
Imperadeiro98
237b022147 Update edit.jade 2014-12-12 21:43:20 +00:00
Scott Erickson
e5c5f0ba04 Fixed Karma client test runner. 2014-12-12 13:12:35 -08:00
Nick Winter
71ad9248ca Merge pull request #1923 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-12-12 10:01:31 -08:00
Imperadeiro98
93e8691291 Update pt-PT.coffee 2014-12-12 16:55:08 +00:00
nixel2007
050de32163 Update ru.coffee 2014-12-12 19:51:49 +03:00
Nick Winter
f04bb3d030 Propagated i18n. 2014-12-12 08:40:57 -08:00
Imperadeiro98
091f80daff Update en.coffee 2014-12-12 16:33:16 +00:00
Imperadeiro98
a793339ee1 Update contact.jade 2014-12-12 16:28:56 +00:00
Nick Winter
b897055618 Added translation key for subscription status label. 2014-12-12 07:27:28 -08:00
Nick Winter
5d030a96ac Fixed some indentation typos in es-419.coffee. 2014-12-12 06:59:44 -08:00
Nick Winter
d90fb60eb2 Merge pull request #1910 from FedericoTomas/patch-5 
Updated..
 2014-12-12 06:58:01 -08:00
Nick Winter
ea22264d68 Fixed some indentation typos in de-CH.coffee. 2014-12-12 06:57:13 -08:00
Nick Winter
31ded35a97 Merge pull request #1899 from LetsPlentendo/patch-1 
Some more translations made...
 2014-12-12 06:55:42 -08:00
Nick Winter
3941606912 Merge pull request #1913 from Rubiconline/patch-4 
Update fr.coffee
 2014-12-12 06:48:37 -08:00
Nick Winter
5a66a914eb Temporarily turning off achievement popups in IE and synchronous multiplayer sessions in PlayLevelView for non-admins due to bugginess. 2014-12-12 06:40:32 -08:00
Matt Lott
d17cd6a2c1 No multiplayer in game-menu for non-ladder levels 
This is a point fix to prevent single player level sessions from
setting multiplayer=true, which results in a bus.connect() in
playlevelview, which can result in a Firebase blocking error.
 2014-12-11 22:05:18 -08:00
Matt Lott
0c81942c71 2nd HoC sub sale 2014-12-11 18:39:03 -08:00
Rubiconline
7736ce3f98 Update fr.coffee 2014-12-11 23:26:49 +01:00
FedericoTomas
ae0917511e Updated.. 
I check it all on Microsoft World, the archive had a lot of wrong translations... i corrected a lot.
Pd: Someone use google translate to edit the archive, and google translate sucks...(at least long sentences)
 2014-12-11 19:09:45 -03:00
Nick Winter
2d7ac81221 Merge pull request #1907 from nykkole/patch-2 
Update de-DE.coffee
 2014-12-11 12:17:51 -08:00
Nick Winter
34bb14935a Merge pull request #1908 from fcrozetta/patch-2 
Update pt-BR.coffee
 2014-12-11 12:17:21 -08:00
jibaigao
759a0675ad Update zh-HANT.coffee 2014-12-11 21:12:50 +01:00
Fernando H. Crozetta
9c4c320542 Update pt-BR.coffee 
More text translated to PT-BR
 2014-12-11 17:55:10 -02:00
nykkole
6096a4eef3 Update de-DE.coffee 
Translated some sentences.
 2014-12-11 11:45:49 -08:00
Scott Erickson
0b81796333 Created the Campaign foundation: schema, model, handler. 2014-12-11 11:26:28 -08:00
Imperadeiro98
2a7d9eb934 Update pt-PT.coffee 2014-12-11 15:29:02 +00:00
Nick Winter
1ef58bcfce Propagated i18n. 2014-12-11 07:02:08 -08:00
Nick Winter
ce36fa461f Fixed i18n typo that Imperadeiro98 noticed. 2014-12-11 06:57:58 -08:00
Nick Winter
0bed8dc460 Merged es-419.coffee. 2014-12-11 06:49:26 -08:00
Nick Winter
d6d9888811 Merged ru.coffee. 2014-12-11 06:41:49 -08:00
Nick Winter
52400c8f18 Merged de-DE.coffee. 2014-12-11 06:37:01 -08:00
Nick Winter
0e5de952e3 Activated a few translations for #1896. 2014-12-11 06:34:54 -08:00
Nick Winter
629fe6188e Merge pull request #1896 from AtaZh/patch-1 
Update uk.locale
 2014-12-11 06:31:31 -08:00
Nick Winter
01f31f5007 Merge pull request #1894 from Rubiconline/patch-3 
Update fr.coffee
 2014-12-11 06:30:10 -08:00
Nick Winter
21870a0ce3 Added some indentation for #1903. 2014-12-11 06:29:33 -08:00
Nick Winter
d129f29d05 Merge pull request #1903 from FedericoTomas/patch-3 
Update es-419.coffee
 2014-12-11 06:27:34 -08:00
Nick Winter
4cfff26b39 Uncommented some hu.coffee section headers for #1891. 2014-12-11 06:25:44 -08:00
Nick Winter
e7bcc61f76 Merge pull request #1891 from divaDseidnA/patch-5 
Update hu.coffee
 2014-12-11 06:23:54 -08:00
Nick Winter
9f909f28cf Merged de-DE.coffee 2014-12-11 06:22:47 -08:00
Nick Winter
46b2906151 Merge pull request #1887 from nixel2007/master 
ru_RU.coffee. account_profile, ladder_prizes, employers, admin, misc
 2014-12-11 06:16:22 -08:00
Nick Winter
bfbcdd4be6 Merge pull request #1886 from Imperadeiro98/patch-1 
Update pt-PT.coffee
 2014-12-11 06:15:44 -08:00
Nick Winter
7b9f4bcbc4 Merged pt-BR.coffee. 2014-12-11 06:15:07 -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
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
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
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
Nick Winter
595ca17c05 Make sessions a little more likely to save if we're not in production. 2014-12-08 16:25:21 -08:00
Matt Lott
a21a2f7c8f Add tracking for FB and G+ signups 2014-12-08 15:00:49 -08:00