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

6552 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Winter
0b7a41bb62 Merge branch 'master' into production 2014-12-09 18:13:59 -08:00
Scott Erickson
0b36e15c50 Updated SoundJS again. 2014-12-09 17:59:34 -08:00
Matt Lott
8d7c8dc52a Merge branch 'master' into production 2014-12-09 17:33:26 -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
Matt Lott
203374d2cc Merge branch 'master' into production 2014-12-09 12:30:16 -08: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
Nick Winter
07fd54bbb3 Merge branch 'master' into production 2014-12-09 06:07:17 -08: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
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
7dfc2e2130 Merge branch 'master' into production 2014-12-08 16:14:19 -08:00
Matt Lott
a21a2f7c8f Add tracking for FB and G+ signups 2014-12-08 15:00:49 -08:00
Matt Lott
b69bdfd360 A/B Test quick victory save/continue buttons 
Fixing typo in hu.coffee
 2014-12-08 14:24:33 -08:00
Nick Winter
499666d7b3 Starting to add first three desert levels. 2014-12-08 13:59:13 -08:00
Nick Winter
8795be7560 Merge pull request #1889 from divaDseidnA/patch-4 
Update hu.coffee
 2014-12-08 13:56:24 -08:00
David Nagy
bbd72c568b Update hu.coffee 2014-12-08 21:55:38 +00:00
Matt Lott
b9adcd1ab2 Add signup tracking to victory modal 2014-12-08 13:45:01 -08:00
Matt Lott
3fa95b698d Add signup tracking to game menu signup tab 2014-12-08 13:13:30 -08:00
Matt Lott
fcafe5e249 Add a bit more Tracker debug info 2014-12-08 11:34:41 -08:00
Nick Winter
0e660e29e9 Merge branch 'master' into production 2014-12-08 11:18:06 -08:00
Nick Winter
c42385637f Fixed some typos with propagated i18n. 2014-12-08 11:17:55 -08:00
Nick Winter
0750fcf293 Merge branch 'master' into production 2014-12-08 11:14:06 -08:00
Nick Winter
f3f078f9e8 Propagated i18n. 2014-12-08 11:13:33 -08:00
Nick Winter
b3b3e250a1 Merge pull request #1877 from felipedelta0/patch-1 
Update pt-BR.coffee
 2014-12-08 11:10:32 -08:00
Nick Winter
5ccd5d6d24 Got rid of some memory leaks in the InventoryModal. Fixed fr subscribe section header. 2014-12-08 11:09:04 -08:00
Nick Winter
144e1888e0 Merge pull request #1885 from Rubiconline/patch-2 
Update fr.coffee
 2014-12-08 10:53:22 -08:00
Rubiconline
26c46d025b Update fr.coffee 
Extra translations
 2014-12-08 19:51:49 +01:00
Nick Winter
713645e3a9 Uncommented items section header to realize a section of hu translations. 2014-12-08 10:48:59 -08:00
Nick Winter
04858101a0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-12-08 10:46:51 -08:00
Nick Winter
0c3c6fb181 Merge pull request #1884 from nixel2007/master 
Update ru. lines-sync and small fixes.
 2014-12-08 10:46:41 -08:00
Nick Winter
52d55449b5 Merge pull request #1883 from carteluo/patch-1 
Update es-419.coffee
 2014-12-08 10:46:08 -08:00
Nick Winter
4f10bcb235 Merge pull request #1881 from divaDseidnA/patch-3 
Update hu.coffee
 2014-12-08 10:45:48 -08:00
Scott Erickson
32f0bc745f Disabling saving of lastIP user property for now. 2014-12-08 10:45:32 -08:00
Nick Winter
fc84003883 Merge pull request #1878 from divaDseidnA/patch-1 
Update DiplomatView.coffee
 2014-12-08 10:45:10 -08:00
Nick Winter
6bc9d6e7cc Merge branch 'master' of https://github.com/codecombat/codecombat 2014-12-08 10:42:31 -08:00
Nick Winter
39aa34e426 Updated teacher's page description now that core levels are free again. 2014-12-08 10:41:56 -08:00
nixel2007
8508118dcb Merge remote-tracking branch 'upstream/master' 2014-12-08 21:40:04 +03:00