Commit graph

1227 commits

Author SHA1 Message Date
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
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
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
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
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
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
Nick Winter
7855ca02d8 Hit a really bad victory modal image. 2014-02-28 21:29:14 -08:00
George Saines
58f2aa6123 adding victory and 404 images 2014-02-28 18:58:40 -08:00
Nick Winter
71ebe7a0aa Lowered Surface framerate in the level editor, since ain't nobody got CPU time for 'dat. 2014-02-28 17:12:23 -08:00
Nick Winter
9a9bc20c68 Merge pull request #442 from Rahazan/patch-1
Finalized Dutch translations
2014-02-28 16:57:22 -08:00
Rahazan
ef6acfe157 Fixed small typos. 2014-02-28 23:33:10 +01:00
Rahazan
22c7f9f690 Fixed line indentation, removed some double entries 2014-02-28 23:09:47 +01:00
Scott Erickson
4de425bd58 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-28 13:59:33 -08:00
Scott Erickson
10795df7d9 Renamed hardcoded project-dotas to brawlwoods. 2014-02-28 13:59:02 -08:00
Michael Schmatz
24b25b2d27 Replaced project-dota with level id and major version 2014-02-28 13:50:48 -08:00
Nick Winter
ee2a60d246 Updated README to point to GSoC and ChallengePost. 2014-02-28 13:22:19 -08:00
Nick Winter
b5ff264ad0 Merge pull request #441 from yangshun/level-editor-freeze
Redirect to level editor only after modal hidden event is triggered. Fixes #438 and #439.
2014-02-28 12:48:56 -08:00
Nick Winter
52903cc0de Using String and Array docs when appropriate now. 2014-02-28 12:43:31 -08:00
Rahazan
d58909a39a Finalized Dutch translations 2014-02-28 21:22:10 +01:00
Nick Winter
6db8051122 Only show action timeline when 'action' is in the hudProperties. 2014-02-28 11:38:41 -08:00
Scott Erickson
2894d4f39c Set up session-repeating scripts. 2014-02-28 11:28:23 -08:00
Nick Winter
9b8eb6a296 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-28 11:27:36 -08:00
Nick Winter
3cee341887 Big performance improvements for scrubbing between frames; look out for bugs. 2014-02-28 11:27:32 -08:00
Scott Erickson
ef9c0a610f Fixed a bug with the casting screen. 2014-02-28 11:10:56 -08:00
Scott Erickson
d12b923eaf Made a casting progress bar on the canvas to test vs having it shown in the cast button. 2014-02-28 11:05:41 -08:00
Tay Yang Shun
8af62d53cd Redirect to level editor only after modal hidden event is triggered. Fixes #438. 2014-03-01 01:55:30 +08:00
Nick Winter
e20e9d68cf Construct sprite sheets as ThangTypes load. 2014-02-27 22:15:13 -08:00
Nick Winter
97197bd89d Got rid of potentially unnecessary (and definitely slow) SpriteSheetBuilder _.cloneDeep. Watch out. 2014-02-27 20:54:29 -08:00
Nick Winter
aef1bc63ba Smarter infinite loop detection vs. web-worker-is-still-loading detection. 2014-02-27 20:01:27 -08:00
Nick Winter
ad30130814 Merge pull request #437 from M-r-A/master
Fix indents
2014-02-27 17:10:48 -08:00
M-r-A
873cd55cf3 Update ambassador.jade 2014-02-27 17:00:04 -08:00
M-r-A
a1bb322e7c Update archmage.jade 2014-02-27 16:56:02 -08:00
M-r-A
0d7eb52fb8 Update ambassador.jade 2014-02-27 16:55:24 -08:00
M-r-A
095b14e41a Update adventurer.jade 2014-02-27 16:54:59 -08:00
M-r-A
772c0b1ab7 Update artisan.jade 2014-02-27 16:54:22 -08:00
Nick Winter
e64796bba6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-27 16:53:05 -08:00