Commit graph

8675 commits

Author SHA1 Message Date
Karthig
b04d63d5bf - create sass file to center 404 image on page 2014-03-03 11:42:07 -05:00
Nick Winter
9a40eb623c Added translation by @rdxiang of server_config.js to server_config.coffee 2014-03-03 08:21:15 -08:00
Nick Winter
967d6cd889 Let's try this without the request timeout middleware, to see if we still need that. 2014-03-03 08:13:53 -08:00
Nick Winter
f2f8c00c6b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-03 08:10:57 -08:00
Nick Winter
a5adf5a1bf Tweaked status colors for production logging; applying it only when in production. 2014-03-03 08:10:36 -08:00
Karthig
357ef45cb0 - insert random error image into 404 page 2014-03-03 10:58:33 -05:00
Nick Winter
ab16c0f8e0 Merge branch 'master' of git://github.com/adi2412/codecombat into adi2412-master 2014-03-03 07:45:35 -08:00
Nick Winter
20fb9ba5b4 Merge pull request #461 from rubenvereecken/master
Localization centred patches and additions
2014-03-03 07:37:46 -08:00
Nick Winter
980a3b6f21 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-03 07:29:07 -08:00
Nick Winter
f0fdb24600 Merge branch 'mnmtanish-thanish-move-wizard' 2014-03-03 07:28:56 -08:00
Nick Winter
86fd098159 Localized WizardSprite movement hey handling to WizardSprite file. 2014-03-03 07:28:40 -08:00
Nick Winter
f2f0a993af Merge branch 'thanish-move-wizard' of git://github.com/mnmtanish/codecombat 2014-03-03 07:22:44 -08:00
Nick Winter
a665aca039 Merge pull request #443 from M-r-A/master
Finalized Russian translations
2014-03-03 07:21:49 -08:00
Nick Winter
c858fb5e24 Merge pull request #440 from FinnDS/patch-1
Update names.coffee
2014-03-03 07:20:55 -08:00
Glen De Cauwsemaecker
d57b6cd168 Merge https://github.com/codecombat/codecombat 2014-03-03 13:11:59 +01:00
Ruben Vereecken
b8b22bb739 Localized 'Create New ..' and 'Search .. Here' 2014-03-03 12:45:04 +01:00
Michael Schmatz
239ca83a84 Perhaps buggy fix to scheduling 2014-03-02 19:11:42 -08:00
Michael Schmatz
81466675ec Scheduling fixes 2014-03-02 18:55:10 -08:00
George Saines
94b98a2d46 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-02 18:21:46 -08:00
George Saines
4b6ebd6532 styled the victory modal a bit 2014-03-02 18:21:42 -08:00
Nick Winter
82b250b9a3 protectAPI off again for Brawlwood, too slow for now. 2014-03-02 17:51:57 -08:00
Nick Winter
ca274f9787 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-02 16:06:31 -08:00
Nick Winter
a8ef87c9ea Fixed a few bugs; re-enabled protectAPI for Brawlwood. 2014-03-02 16:06:22 -08:00
Ruben Vereecken
c2d247e686 Editor tables now load i18n correctly after search. 2014-03-03 00:31:49 +01:00
Ruben Vereecken
c3c699df49 Fixed wrong i18n name 'account_settings.autosave'. Added missing i18n name 'account_settings.email_notifications' 2014-03-02 23:28:16 +01:00
Ruben Vereecken
bea002a8d4 Fixed some wrong translations 2014-03-02 22:59:15 +01:00
Scott Erickson
956e2b3c40 Set up the my matches tab in the new ladder view. 2014-03-02 13:24:41 -08:00
Scott Erickson
d0f416f668 Rearranging the ladder view. 2014-03-02 12:43:21 -08:00
Nick Winter
de40405871 Merge pull request #457 from rubenvereecken/master
Patched up Dutch (NL) Locale
2014-03-02 11:47:47 -08:00
Ruben Vereecken
e4bf752e20 Changed Dutch (NL) ambassador_summary to match the English version 2014-03-02 20:30:18 +01:00
Ruben Vereecken
60f79e261d Patched up tonnes of minor language mistakes (Dutch-Nederlands) 2014-03-02 20:24:14 +01:00
Ruben Vereecken
fb57e634a5 Patched up some grammar mistakes (Dutch-Nederlands). 2014-03-02 18:44:47 +01:00
Muhammed Thanish
da2ebf857a Increase delay 2014-03-02 14:02:30 +05:30
Nick Winter
6c48660922 No save button when there's nothing to save. Messing with AudioPlayer playSound API a bit. 2014-03-01 16:57:29 -08:00
Michael Schmatz
488be26fd3 Tweaked ratio calculation 2014-03-01 16:56:04 -08:00
Michael Schmatz
e69e23115f Improvements to game scheduling, removed cap 2014-03-01 16:52:19 -08:00
Nick Winter
56658a0f89 Merge pull request #450 from yfdyh000/patch-1
Update zh-HANS.coffee
2014-03-01 16:26:02 -08:00
YF
2db9fa708b Update zh-HANS.coffee 2014-03-02 07:27:15 +08:00
Muhammed Thanish
d7e031fd00 Use key.isPressed() to get movement direction 2014-03-02 03:27:06 +05:30
Michael Schmatz
0db74c6da5 Merge pull request #449 from codecombat/master
Master into production
2014-03-01 13:08:38 -08:00
Muhammed Thanish
a092557973 Add camera zoomTo(pos) 2014-03-02 02:13:37 +05:30
Aditya Raisinghani
a5f633961f Added log setting for production. 2014-03-02 01:48:21 +05:30
Muhammed Thanish
7ea9260322 Use WizardSprite 2014-03-02 01:45:49 +05:30
Nick Winter
c2f82690b4 Put Archmage and Artisan avatars in GitHub README. 2014-03-01 11:21:24 -08:00
Nick Winter
2f130da090 HUD supports more hudProperties. Palette looks at programmableObjectProperties. Fixed bug with level editor frames advancing. 2014-03-01 11:06:44 -08:00
Nick Winter
bb53942c2c Merge branch 'thanish-move-wizard' of git://github.com/mnmtanish/codecombat into mnmtanish-thanish-move-wizard 2014-03-01 08:57:02 -08:00
Nick Winter
13c29b57ad Merge pull request #446 from yangshun/editor-breadcrumbs
Added breadcrumbs for Editor Search Results, Thang Editor and Article Editor pages.
2014-03-01 08:53:29 -08:00
Muhammed Thanish
8cc8103288 Add keyboard shortcuts to move the wizard 2014-03-01 19:58:15 +05:30
Tay Yang Shun
47b37426d0 Added Level Editor page breadcrumbs. 2014-03-01 14:52:51 +08:00
Tay Yang Shun
f43dd2f3ff Added breadcrumbs for Editor Search Results, Thang Editor and Article Editor pages. 2014-03-01 14:47:31 +08:00