codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-25 00:28:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
2892 commits 27 branches 0 tags 134 MiB
Commit graph

2892 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Erickson
aee90c72bb Most of the way there with the raster images. Just need to figure out loading with PreloadJS and the SuperModel. 2014-05-02 17:03:30 -07:00
Scott Erickson
eacbf571c6 Merge branch 'master' into feature/thangload 2014-05-02 10:32:05 -07:00
Scott Erickson
06bc96d7d0 Set up the level loader to get thangtype names first, then load the thang types themselves so the world can be generated in parallel with thang type loading and rendering. 2014-05-02 10:31:20 -07:00
Nick Winter
ef036b409b Merge pull request #930 from M-r-A/patch-1 
Update ru.coffee
 2014-05-02 09:58:55 -07:00
Nick Winter
3ac052a4a6 Merge branch 'benojan-patch-2' 2014-05-02 09:49:35 -07:00
Nick Winter
082a9d141a Keeping Wu English stub. 2014-05-02 09:49:02 -07:00
Nick Winter
302cb78095 Added zh-WUU-HANS stubs. 2014-05-02 09:48:40 -07:00
Nick Winter
f92fd122c6 Integrating Wu as zh-WUU-HANS and zh-WUU-HANT; hacking on a fork of i18next to do so. 2014-05-02 09:46:00 -07:00
Scott Erickson
2952d7702c Merge branch 'master' into feature/thangload 
Conflicts:
	app/lib/LevelLoader.coffee
	app/views/play/level_view.coffee
 2014-05-02 08:20:03 -07:00
Scott Erickson
92687b17de Merge branch 'master' into feature/thangload 
Conflicts:
	app/lib/LevelLoader.coffee
	app/views/play/level_view.coffee
 2014-05-02 08:19:47 -07:00
Nick Winter
178e40b679 Merge pull request #946 from benojan/patch-1 
Update zh.coffee
 2014-05-02 08:10:17 -07:00
Benojan
28a56c1c83 Create new language--the wuu-chinese 
Just for Wuu Chinese, including Shanghainese and such language in Zhejiang Province, China.
 2014-05-02 19:19:21 +08:00
Benojan
770345f84d Update zh.coffee 2014-05-02 16:09:13 +08:00
Nick Winter
ae31f90a25 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-01 17:41:10 -07:00
Nick Winter
9f18811701 Fixed logic for displaying runtime errors from last run based on code being the same as last cast. 2014-05-01 17:41:06 -07:00
Michael Schmatz
347292c985 Implemented save notes button 2014-05-01 17:36:49 -07:00
Michael Schmatz
9fb5826593 Scroll to candidate position while going back 2014-05-01 16:56:41 -07:00
Scott Erickson
26cafd2f19 Fixed #941. Actually it was no longer crashing probably because of the fix for #934, but there were still other bugs. Fixed it, and other bugs like it, particularly in the spectate view. Cleaned up a bit, too. 2014-05-01 16:38:27 -07:00
Scott Erickson
3bc0c1710e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-01 15:45:00 -07:00
Scott Erickson
31c5890288 Fixed #934 2014-05-01 15:44:50 -07:00
Nick Winter
0f33bae1f1 Hid level done button better. Avoiding building wizard sprite when not needed. 2014-05-01 14:36:26 -07:00
Nick Winter
5376a42f94 Fixed serialization of tracked property arrays. 2014-05-01 13:23:14 -07:00
Nick Winter
bebe5a0620 Improved hover debugger tokenization specificity to not extend past end of line. 2014-05-01 11:18:20 -07:00
Nick Winter
f7bdb7e840 Upgrades for teleportation imnterpolation performance, ACE search box styling. 2014-05-01 10:44:17 -07:00
Nick Winter
541a2756fd Simulate properly even if Simulator Supermodel starts fully loaded. 2014-04-29 16:54:57 -07:00
Nick Winter
2f174691c5 Fixed #939. 2014-04-29 16:44:38 -07:00
Nick Winter
04d74fb76f Fixed bug with scale not updating properly when paused. 2014-04-29 16:04:30 -07:00
Nick Winter
4ad7ebc95d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-29 15:31:23 -07:00
Nick Winter
bea0589fad Fixed #935. 2014-04-29 15:31:18 -07:00
Michael Schmatz
294570cb1b Made it so that modal doesn't show if you've signed the contract 2014-04-29 15:30:28 -07:00
Nick Winter
eca35ce371 Several minor bugfixes, and enabled API protection on all levels by default. 2014-04-29 15:25:59 -07:00
Nick Winter
8a6bec9d40 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-29 15:25:39 -07:00
Michael Schmatz
546bd26328 Fixed login flow and user profile issue 2014-04-29 15:12:50 -07:00
Nick Winter
d3a21f4959 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-29 09:43:08 -07:00
Nick Winter
cc8d1d4a07 Merge pull request #933 from gosnat/patch-2 
Update play_view.coffee
 2014-04-29 09:25:53 -07:00
gosnat
d0900870b2 Update play_view.coffee 
Fixed ID for harvest-time level (was pointing to find-the-spy)
 2014-04-29 10:53:55 -05:00
Nick Winter
9fb549a394 Fixed Guide tabs cursor. 2014-04-29 08:46:57 -07:00
Nick Winter
2d057fa81f Cursor: pointer on docs modal tabs. 2014-04-28 19:57:59 -07:00
Nick Winter
369ea8a00f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-28 19:09:04 -07:00
Nick Winter
aea49cc27f Fixed bobbing. 2014-04-28 18:36:46 -07:00
Scott Erickson
bcad939eae Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-28 18:31:04 -07:00
Glen De Cauwsemaecker
bc72afe758 fixed more errors related to recent pull request merges in the window dev scripts 2014-04-29 05:03:05 +02:00
Glen De Cauwsemaecker
d052390eec Clean up mistakes made by merging in windows directory 2014-04-29 04:38:15 +02:00
Scott Erickson
57beb94b5c Fixed a bug with the levelloader loading articles. 2014-04-28 18:30:47 -07:00
Nick Winter
cf6dcca432 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-28 17:59:07 -07:00
Nick Winter
40fbf336c2 Using new level loading sound. 2014-04-28 17:59:02 -07:00
Nick Winter
b954e70d85 Let's try 30 FPS. Fixed Surface destruction bug. 2014-04-28 17:06:43 -07:00
Nick Winter
0b947dbeee Let's try 30 FPS for a while now. 2014-04-28 16:41:18 -07:00
Nick Winter
bd3c059c2a Several performance improvements based on profiling. 2014-04-28 16:31:51 -07:00
Scott Erickson
e5e146c3c1 Got rid of an extraneous log. 2014-04-28 14:59:51 -07:00