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
3610 commits 27 branches 0 tags 134 MiB
Commit graph

3610 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
George Saines
5d8e199c2d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-19 22:14:09 -07:00
George Saines
5d603f625e removing China 2014-05-19 22:14:05 -07:00
Nick Winter
513a73c62e Added grayscale filter until hover for tournament sponsor logos. 2014-05-19 22:07:36 -07:00
Nick Winter
b6406b9b0e Put some tournament details in there. Muted some extra casting sounds during level load. 2014-05-19 21:56:20 -07:00
Scott Erickson
f463966a22 Fixed a bug with thangs not being properly scaled when first created sometimes. 2014-05-19 21:55:41 -07:00
Scott Erickson
6c3ff16bed Fixed setting registration points for thangs that match world dimensions. 2014-05-19 21:55:31 -07:00
Scott Erickson
ae8d28182c Fixed a bug where sometimes thang avatar views wouldn't render the portrait, because 'loading' wouldn't be set to false properly. 2014-05-19 21:55:30 -07:00
Scott Erickson
b816055f9e Fixed goal states to handle teams. 2014-05-19 21:55:30 -07:00
George Saines
8b5014a053 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-19 21:39:45 -07:00
George Saines
5b6b26415b making the Firebase logo look good 2014-05-19 21:39:41 -07:00
Nick Winter
39178daff6 Trying to show loading ready and initialize the Surface earlier. 2014-05-19 20:49:17 -07:00
Nick Winter
b2cc3d0692 Fixed bug with preloading the world replacing casting the same world if timing was wrong. 2014-05-19 20:12:16 -07:00