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

10832 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Alexei Nikitin
d68ff5a899 Fix diplomat.jade building 2014-03-01 04:54:54 +04:00
Michael Schmatz
3b84917353 Merge pull request #444 from codecombat/master 
Master into production
 2014-02-28 16:09:28 -08:00
Alexei Nikitin
789b49e15f Update diplomat.jade 2014-03-01 03:37:11 +04:00
Alexei Nikitin
9c107f24f8 Finishing ru.coffee 2014-03-01 03:31:36 +04: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
99a6191849 Merge branch 'master' into production 2014-02-28 12:07:30 -08: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
Finn
5b5af5a55a Update names.coffee 
Added the name "Cid" under "Soldier M".
 2014-02-28 12:06:26 +01: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
Nick Winter
01845a0175 Some translations weren't done yet. 2014-02-27 16:52:58 -08:00
Scott Erickson
04a0337b92 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-27 16:44:54 -08:00
Scott Erickson
df196cc531 Modals now stop the level from starting until they close. 2014-02-27 16:44:11 -08:00
Nick Winter
de4c9cb60d Merge pull request #436 from M-r-A/master 
Fix link in legal.jade
 2014-02-27 16:40:56 -08:00
M-r-A
d3d5810acc Fix link in legal.jade 2014-02-27 16:34:58 -08:00
Scott Erickson
7c734d6bc9 Added an async name checker for the wizard settings modal. 2014-02-27 14:42:11 -08:00
Scott Erickson
b31527abef Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-27 14:08:04 -08:00