Commit graph

4822 commits

Author SHA1 Message Date
Michael Schmatz
76b949ac1e Various changes before merge 2014-02-11 15:47:06 -08:00
Scott Erickson
d9f4594c9f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-11 15:39:02 -08:00
Scott Erickson
ac49e5eec1 More memory fixes. 2014-02-11 15:38:36 -08:00
Michael Schmatz
b29ab56fe2 Fixed simulation goals 2014-02-11 15:26:57 -08:00
Nick Winter
c29e4d6c9c Stupid casting sound effect. 2014-02-11 15:05:54 -08:00
Scott Erickson
2a19da5ba2 More memory fixes. 2014-02-11 14:58:45 -08:00
Nick Winter
6505064fb6 Slightly less aggressively preload workers. 2014-02-11 14:38:47 -08:00
Nick Winter
1097d56d50 Increased maxTranslation in box2d to fix arrow max speed limit problem. 2014-02-11 14:25:35 -08:00
Scott Erickson
b904e1f939 More memory fixes. 2014-02-11 14:24:06 -08:00
Scott Erickson
1b0c3fb236 Upgraded to CoffeeScript 1.7 2014-02-11 14:23:36 -08:00
Michael Schmatz
a6b15663a4 Merge branch 'master' into feature/task-queue
Conflicts:
	app/views/play/level/tome/spell.coffee
2014-02-11 13:10:59 -08:00
Michael Schmatz
cef7e89326 Added goal states listener 2014-02-11 13:09:53 -08:00
Michael Schmatz
58bfddeebf Background simulation is now showing signs of life! 2014-02-11 12:58:23 -08:00
Scott Erickson
47eeda5af4 More memory fixes. 2014-02-11 12:54:08 -08:00
Scott Erickson
7ddb97fa22 More memory fixes. 2014-02-11 12:32:12 -08:00
Scott Erickson
b0a74e5b1a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-11 12:24:25 -08:00
Nick Winter
2d9606a8eb includeFlow only on the currently selected Thang. 2014-02-11 12:16:53 -08:00
Scott Erickson
166bb6db45 More memory cleanup. 2014-02-11 12:10:21 -08:00
Nick Winter
d22c716dce Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-11 12:02:53 -08:00
Scott Erickson
aa4cc8d9c4 Added a whole bunch of view teardown. 2014-02-11 12:02:49 -08:00
Nick Winter
d2a7bfd11c Added GoldView. 2014-02-11 12:02:27 -08:00
Scott Erickson
7ad6faa0c0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-11 11:31:13 -08:00
Scott Erickson
8ff38a724d Fixing some event tearing down. 2014-02-11 11:31:02 -08:00
Scott Erickson
21c93e85ed Fixed a bug with tearing down angels. 2014-02-11 11:30:47 -08:00
Michael Schmatz
612a374b3f Progress on simulator 2014-02-11 11:27:39 -08:00
Nick Winter
f9bb6de3ff Typoooo 2014-02-11 09:33:35 -08:00
Nick Winter
c61e2496d8 Trying a faint gold coin noise when you kill something worth money. 2014-02-11 09:28:26 -08:00
Michael Schmatz
c0d43ea32b Merge branch 'master' into feature/task-queue 2014-02-10 17:10:26 -08:00
Michael Schmatz
7faabc37e3 Simulation button 2014-02-10 17:09:51 -08:00
Nick Winter
7d5db41f5d God prepares Workers for Angelic consumption ahead of time. 2014-02-10 17:09:19 -08:00
Michael Schmatz
0cbf669474 Added teamSpells persistence 2014-02-10 16:31:21 -08:00
Michael Schmatz
cc3b93a0f8 Transfer teamSpellMap from tome to levelBus 2014-02-10 16:18:39 -08:00
Nick Winter
f812241bd5 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-10 14:50:35 -08:00
Nick Winter
9507be4c9a Turned off includeFlow for horrific performance reasons on project-dota for now. 2014-02-10 14:19:54 -08:00
Michael Schmatz
465ea22b1a More progress with queues and client-side simulation 2014-02-10 13:18:39 -08:00
Scott Erickson
9f5b51da19 Made goals for other teams invisible. 2014-02-10 12:49:38 -08:00
Scott Erickson
d95b66df0a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-10 12:12:49 -08:00
Scott Erickson
97d823cc48 Made the LatestVersionReferenceNode use projection results. 2014-02-10 12:12:22 -08:00
Scott Erickson
3f2fde0fa9 Tweaked the level schema nextLevel property to only be an object. 2014-02-10 12:11:53 -08:00
Isaac
23554315e2 Merge branch 'master' of github.com:LightAndLight/codecombat 2014-02-11 04:33:12 +10:00
Isaac
d36630323c Removed my silly helper server helper script 2014-02-11 04:32:09 +10:00
Isaac
3351bfce2f Modified python scripts to support both python2.7 and python3 natively 2014-02-11 04:30:58 +10:00
Michael Schmatz
824af18e39 Improved Mongo queueing and various refactors 2014-02-10 10:30:08 -08:00
Nick Winter
26016f48e2 Skip protectAPI for now. Defer worker termination until after it reports stats. 2014-02-09 18:44:31 -08:00
justin
719dbea3bf Add indentation to fix template engine output 2014-02-09 12:31:15 -05:00
Yinkan Li
6ced32a1de update Chinese (simplified)
update ‘…’ to ‘……’
add ‘ ’ before and after for each english in Chinese
add ‘。’ for some value
add translation value for ‘email_notifications_description’
update ‘customize_wizard’
update ‘:’ to ‘:’
update ‘!’ to ‘!’
2014-02-09 16:43:13 +08:00
Andrew Wong
3927795c06 Merge remote-tracking branch 'cocomaster/master' 2014-02-08 20:27:19 -08:00
Cassio Cardoso
8d383bc7ea Update pt-BR.coffee
Work in progress.
2014-02-08 23:25:46 -02:00
Nick Winter
eb3f57ce34 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-08 15:32:23 -08:00
Nick Winter
f2bcf019fa Should update code when other player changes it again. 2014-02-08 15:32:14 -08:00