Michael Schmatz
11a4c1b6fd
Typecast rank to a number
2014-02-19 14:26:49 -08:00
Nick Winter
01374d63c4
Better comment formatting. Manual cast by default on Project DotA.
2014-02-19 14:00:54 -08:00
Nick Winter
dcf7a0d1fd
Re-enabled Olark.
2014-02-19 12:43:25 -08:00
Scott Erickson
613e7848dc
Fixed a bug with the setting of opposing team spells, not to modify anything when there are no specified teams.
2014-02-19 11:45:29 -08:00
Scott Erickson
86f94cb5fd
Refactored dynamic sound loading to the level view, since the level loader is no longer in service after finishing loading.
2014-02-19 11:42:33 -08:00
Scott Erickson
e85f5c7e6b
Fixed modals not being able to be opened after restarting the level when no scripts are running.
2014-02-19 11:15:36 -08:00
Scott Erickson
0bf772d745
Changing the files view to replace files when there are name collisions.
2014-02-19 10:55:15 -08:00
Scott Erickson
bdbebe886c
Added a log for figuring out what session is causing NaNs.
2014-02-19 08:19:30 -08:00
Scott Erickson
ece08ba366
Fixed the matches order on the ladder team page.
2014-02-19 08:19:13 -08:00
Scott Erickson
07c0edcefe
Fixed the level session schema submitDate property.
2014-02-19 08:18:40 -08:00
Nick Winter
a8794f4e7e
Merged
2014-02-18 12:55:18 -08:00
Nick Winter
1c82fc5bb0
Fix for opponent teams not working.
2014-02-18 12:54:47 -08:00
Michael Schmatz
dc70fec977
Merge pull request #385 from codecombat/redis
...
Merge redis into master
2014-02-18 12:53:57 -08:00
Scott Erickson
27fb2ec37d
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-18 12:27:56 -08:00
Scott Erickson
f383e5b9fa
Fixes for the ladder team view.
2014-02-18 12:27:10 -08:00
Nick Winter
f54fcfe6c0
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-18 11:49:15 -08:00
Nick Winter
636b1bb30d
Fixed home wizard scale.
2014-02-18 11:48:36 -08:00
Michael Schmatz
d02d09ae36
Simulation fixes
2014-02-18 11:46:14 -08:00
Scott Erickson
5a436ce10b
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-18 11:41:29 -08:00
Scott Erickson
d2d2099c4a
Fixing a bug with the tome problem view.
2014-02-18 11:39:11 -08:00
Scott Erickson
cacf6539c1
Working on the ladder and team views.
2014-02-18 11:38:49 -08:00
Nick Winter
9cdc07d07c
Fixed spell palette doc duplication.
2014-02-18 11:23:01 -08:00
George Saines
c8679c37de
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-18 10:28:04 -08:00
George Saines
a44f8756ae
hour of code trivial fix
2014-02-18 10:28:00 -08:00
Nick Winter
d45f67a8c3
Fixed some popover and modal layout and bugs.
2014-02-18 10:03:57 -08:00
Scott Erickson
452a43cae9
Working on the ladder and team views.
2014-02-17 17:42:41 -08:00
Scott Erickson
dcb6c49fd8
Merge remote-tracking branch 'origin/master'
2014-02-17 17:40:41 -08:00
Nick Winter
6f0ed9040a
Fixes for dirt path, fast portraits, and slow transpilation. Starting to move Aether stuff into a Tome worker with Catiline.
2014-02-17 17:38:49 -08:00
Scott Erickson
52a6cdf09c
Added a route for getting user names by id.
2014-02-17 15:19:19 -08:00
Michael Schmatz
c5655074e3
Merge branch 'master' into redis
...
Conflicts:
server/queues/scoring.coffee
2014-02-17 14:41:35 -08:00
Michael Schmatz
75d8888c92
Refactored scoring
2014-02-17 14:39:21 -08:00
Nick Winter
82f0860b40
Merge pull request #384 from MartinDelille/translation
...
translate wizard settings
2014-02-17 13:40:19 -08:00
Martin Delille
d7edf84896
translate wizard settings
2014-02-17 22:34:02 +01:00
Nick Winter
3c08f8a5eb
Added wizard settings i18n tags.
2014-02-17 13:08:37 -08:00
Michael Schmatz
2be3286e06
Added sessionID and userID to session schema
2014-02-17 12:44:04 -08:00
Nick Winter
8c217ab621
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-17 12:42:09 -08:00
Nick Winter
cc4c0f0e85
Exported a few new en i18n tags to the other languages.
2014-02-17 12:42:04 -08:00
Nick Winter
9558745216
Saving some uncommented i18n tags.
2014-02-17 12:40:40 -08:00
Scott Erickson
1ebae24c03
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-17 12:40:34 -08:00
Scott Erickson
d97dec8b20
Merge remote-tracking branch 'origin/master'
2014-02-17 12:28:24 -08:00
Michael Schmatz
b4f75c6274
Added titles and descriptions for schema
2014-02-17 12:28:19 -08:00
Nick Winter
6d87b422f6
Merge pull request #372 from QelioX/patch-1
...
ru.cofee small changes
2014-02-17 12:26:19 -08:00
Nick Winter
58028259c4
Merge pull request #381 from alireza68/patch-1
...
Update fa.coffee
2014-02-17 12:25:32 -08:00
Nick Winter
a4f4016c73
Updating i18n tags for new contribute summaries.
2014-02-17 12:23:06 -08:00
Scott Erickson
1c49e475b9
Merge remote-tracking branch 'origin/master'
2014-02-17 12:00:39 -08:00
Nick Winter
dcb6f0d280
Merge branch 'master' of git://github.com/iamawong/codecombat into iamawong-master
2014-02-17 11:56:03 -08:00
Nick Winter
1f7ba083d8
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-17 11:54:30 -08:00
Nick Winter
af510c7cc7
60 FPS and support for independent world/surface frame rates.
2014-02-17 11:53:52 -08:00
Andrew Wong
b1aa65833a
Consolidated text on contribute and removed padding to make the
...
page not as spread out.
Text on the contribute page was a redundant copy of each class'
contribution page. The summary text was shortened and some vertical
padding was removed.
2014-02-17 10:24:29 -08:00
alireza68
88b4055af3
Update fa.coffee
...
I'll translate the rest soon
2014-02-17 21:17:56 +03:30