codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-02 03:47:09 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
3472 commits 27 branches 0 tags 134 MiB
Commit graph

3472 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Winter
511dcef313 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-21 10:30:03 -07:00
Michael Schmatz
fc4047b429 Merge pull request #1058 from codecombat/master 
More temp fixes for 422s
 2014-05-21 10:29:56 -07:00
Michael Schmatz
585b907f4e More temp fixes for 422s 2014-05-21 10:29:16 -07:00
Nick Winter
8fb1237810 Added noty error messages when unable to save CocoModels. 2014-05-21 10:27:47 -07:00
Jayant Jain
8f1f378bcb Fixes issue with thang being added twice upon click 2014-05-21 10:27:47 -07:00
Jayant Jain
c05780de4c Resolves #170, thang can be directly placed by dragging onto the map 2014-05-21 10:27:46 -07:00
Michael Schmatz
e7d1899910 Merge pull request #1057 from codecombat/master 
Temp fix for occasional 422
 2014-05-21 10:16:34 -07:00
Michael Schmatz
02f8458dfe Temp fix for occasional 422 2014-05-21 10:16:01 -07:00
dpen2000
ce661a5493 Update simulate_tab.coffee 
Add back in current user to nearby simulators
 2014-05-21 15:06:52 +01:00
Burlutskiy Ivan
70403409f3 Update ru.coffee 
reverted team translation by @M-r-A request.
 2014-05-21 12:18:44 +04:00
Michael Schmatz
85c63fc1ca Merge pull request #1050 from codecombat/master 
Made backbone mediator validate only on development.
 2014-05-20 15:59:53 -07:00
Scott Erickson
a8b54f3cdc Made backbone mediator validate only on development. 2014-05-20 15:58:57 -07:00
Michael Schmatz
aecc88f32d Merge pull request #1049 from codecombat/master 
Master into production
 2014-05-20 15:56:07 -07:00
Michael Schmatz
47c41e0a6e Added error handling for findNearestBetterSessionID 2014-05-20 15:55:25 -07:00
Scott Erickson
a7f24ab04f Some work on subscription definitions for the validated Backbone Mediator. Added 'script-manager:tick' channel. 2014-05-20 15:36:15 -07:00
Michael Schmatz
e9e36f8c7d Merge pull request #1046 from codecombat/master 
Master into production
 2014-05-20 15:36:12 -07:00
Michael Schmatz
a6352c214a Add temp error handling for updateSessions 2014-05-20 15:35:44 -07:00
Nick Winter
88ef5ffe93 Prevent default ACE go-to-line alert when pressing Ctrl/Cmd+L. 2014-05-20 15:24:57 -07:00
Michael Schmatz
f06b154fa1 Merge pull request #1045 from codecombat/master 
Master into production
 2014-05-20 15:14:26 -07:00
Michael Schmatz
de93dfd357 Stopgap measure for incorrectly formatted session results 2014-05-20 15:12:25 -07:00
Nick Winter
c712494d17 Merge branch 'gutierri-master' 2014-05-20 15:10:07 -07:00
Nick Winter
de9f1fab0d Merged. 2014-05-20 15:09:48 -07:00
Michael Schmatz
c5e8c441cf Merge pull request #1044 from codecombat/master 
Revert "Stop sending out untranspiled code"
 2014-05-20 14:59:43 -07:00
Michael Schmatz
6fde166190 Revert "Stop sending out untranspiled code" 
This reverts commit f794ec4a46.
 2014-05-20 14:59:06 -07:00
Michael Schmatz
14170b6412 Merge pull request #1043 from codecombat/master 
Master into production
 2014-05-20 14:33:56 -07:00
Michael Schmatz
f794ec4a46 Stop sending out untranspiled code 2014-05-20 14:33:01 -07:00
Burlutskiy Ivan
a8a50df025 Update ru.coffee 
Fixed previous typos; uncommented translations.
 2014-05-21 01:32:15 +04:00
Scott Erickson
70525ec57a Fixed the music starting when you restart the level, even if music is off. 2014-05-20 13:43:52 -07:00
Burlutskiy Ivan
65a364d3f7 Update ru.coffee 2014-05-21 00:21:10 +04:00
Michael Schmatz
e5e1631363 Merge pull request #1040 from codecombat/master 
Made both game selections random
 2014-05-20 12:46:38 -07:00
Michael Schmatz
e732e7227c Made both game selections random 2014-05-20 12:45:25 -07:00
Nick Winter
161c81772c Merge branch 'master' into production 2014-05-20 12:32:47 -07:00
Nick Winter
88a5685c37 Fix for WizardSprite scale thing. 2014-05-20 12:32:26 -07:00
Scott Erickson
86736d8f4a Fixed a bug. 2014-05-20 12:22:24 -07:00
Scott Erickson
2b56dffcb0 Fixed a bug where sometimes scripts setting playback would be overridden by the surface resetting playback after casting is done. 2014-05-20 12:21:43 -07:00
Nick Winter
465721fbda Merge branch 'master' into production 2014-05-20 12:01:19 -07:00
Scott Erickson
3f884e71e5 Fixed the LevelLoader in headless settings. 2014-05-20 11:25:32 -07:00
Scott Erickson
93c6f72f07 Asynchronously building things again. 2014-05-20 10:49:19 -07:00
Nick Winter
a04130f26a Fixed a bug with ladder tab not reloading. 2014-05-20 10:40:15 -07:00
Michael Schmatz
b31e6312ac Updated rules to be subject to change 2014-05-20 10:10:40 -07:00
Nick Winter
022722a19f Fixed cosmetic GoalManager destruction error. 2014-05-20 09:19:31 -07:00
Nick Winter
1cd2035450 Merge branch 'master' into production 2014-05-20 08:24:15 -07:00
Nick Winter
248cec1e6e Transpile code properly. 2014-05-20 08:23:25 -07:00
Nick Winter
f93753b4bc Merge branch 'master' into production 2014-05-20 08:01:08 -07:00
Nick Winter
d058b16283 Fixed some memory leaks. 2014-05-20 08:00:49 -07:00
Scott Erickson
04da5b4714 Fixed thang avatar view thang loading some more. 2014-05-19 23:02:02 -07:00
Scott Erickson
a8abe8c887 Fixed mark sprite scaling some more. 2014-05-19 23:01:48 -07:00
Nick Winter
704e44bc66 Merge branch 'master' into production 2014-05-19 22:45:20 -07:00
Scott Erickson
042fd7ac0d Made the guide, when it shows up the first time, only show the first doc. 2014-05-19 22:25:40 -07:00
Scott Erickson
f24ee98295 More work on mark sizing. 2014-05-19 22:17:23 -07:00