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

88 commits

Author SHA1 Message Date
Nick Winter
5f20e6f05e Thangs get inserted into hero levels without any Components for easy defaulting. Working on moving Hero Placeholder ThangType swapping from LevelLoader to Level, but it's not there yet. 2014-08-15 12:09:56 -07:00
Nick Winter
69c22db434 Moved Hero Placeholder replacement logic to Level's denormalizeThang. 2014-08-14 16:35:03 -07:00
Nick Winter
0f983bdcf1 Crude steps towards using your hero equipment in items levels. 2014-08-14 15:12:15 -07:00
Nick Winter
cf7e2042c9 Got bitten by another case of #1108. 2014-08-11 10:02:39 -07:00
Nick Winter
706ab7a251 Trying to get item ThangType nodes and inventory loading working. 2014-08-10 22:09:13 -07:00
Scott Erickson
94ca62f4c5 Fixed a bug I added in some minor final changes. 2014-08-07 18:48:30 -07:00
Scott Erickson
cc025942f8 Extended the LevelLoader to load thang types and components dynamically for hero levels. 2014-08-07 18:27:47 -07:00
Scott Erickson
0c5364eebb Removed editorMode. 2014-08-07 14:22:43 -07:00
Tery Lim
618ade4946 Clean up mixed quotes 2014-07-01 12:23:22 +08:00
Nick Winter
1a6fd75103 Trying to fix some Simulator loading errors. 2014-05-25 08:29:33 -07:00
Scott Erickson
4929f81fcc Fixed the level editor preview window not loading on repeated opens. 2014-05-21 14:28:52 -07:00
Scott Erickson
18f694b010 Fixed up the level loader to include session objects as world necessities. 2014-05-21 12:53:28 -07:00
Scott Erickson
3f884e71e5 Fixed the LevelLoader in headless settings. 2014-05-20 11:25:32 -07:00
Scott Erickson
93c6f72f07 Asynchronously building things again. 2014-05-20 10:49:19 -07:00
Scott Erickson
b410d91203 Cleaned up the LevelView, organizing it so that initialization code roughly runs in order, and set it up so that the ScriptManager is created earlier. 2014-05-19 17:10:41 -07:00
Scott Erickson
eebbae9b13 Added a global SPRITE_RESOLUTION_FACTOR property. 2014-05-15 17:09:35 -07:00
Nick Winter
b973b749c0 Merged. 2014-05-15 14:57:24 -07:00
Nick Winter
8909d218bc Moved random seed initialization to Existence System, where it can be configured. 2014-05-15 14:54:31 -07:00
Nick Winter
c1f9d51b37 Added times to runtime errors. Don't load ThangTypes for Thangs that don't exist on the first frame of the world. 2014-05-15 11:27:51 -07:00
Nick Winter
dbcafbb29b Working on level-specific coding languages, with non-writable code in JavaScript. 2014-05-14 21:54:36 -07:00
Scott Erickson
54af58baee SuperModel no longer emits progress going backward ever, and added a way to prevent it from getting to high in the middle of a chain of loading. 2014-05-14 09:24:52 -07:00
Scott Erickson
4b404ae124 Finished tuning the supermodel loading and progress. 2014-05-13 14:39:45 -07:00
Scott Erickson
b4ad34eb8f LevelLoader only builds and loads thang types in the world on the first frame, letting everything else happen lazily. 2014-05-13 10:51:55 -07:00
Nick Winter
1aa72541ff Merged master into feature/thangload. 2014-05-12 09:57:31 -07:00
Nick Winter
1e18f0b42f Merged God and Buddha, split out Angels, did a huge refactoring, fixed many bugs, and laid groundwork for preloading Worlds. 2014-05-10 18:24:50 -07:00
Nick Winter
589410ed8e Merged master into feature/thangload. 2014-05-09 12:56:58 -07:00
Scott Erickson
c037ce14f2 Fixed #958. LevelLoader wasn't handling cached session objects passed in with the supermodel. 2014-05-07 13:28:42 -07:00
Nick Winter
2e6bec5454 Some fixes for my accidental merge of #970. 2014-05-06 09:49:04 -07:00
Scott Erickson
db9a82d58a Merge branch 'feature/thangload' of https://github.com/codecombat/codecombat into feature/thangload 2014-05-02 17:03:53 -07:00
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
Nick Winter
d54149d0f3 Reworked LevelView loading priorities to try to get world simulating earlier. 2014-05-02 12:32:41 -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
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
Scott Erickson
31c5890288 Fixed #934 2014-05-01 15:44:50 -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
Scott Erickson
57beb94b5c Fixed a bug with the levelloader loading articles. 2014-04-28 18:30:47 -07:00
Scott Erickson
b9f4093b08 Set up the LevelLoader to load names instead of whole ThangTypes. 2014-04-28 14:58:58 -07:00
Scott Erickson
01f2a556f9 Set up the patches view with the new loading system, fixing a few things in the meanwhile. 2014-04-28 11:09:21 -07:00
Scott Erickson
d5bcec5ad0 Fixed the level editor with the new loading system. 2014-04-25 19:11:32 -07:00
Scott Erickson
14d62915f4 Got projection and backups set back up, partially fixed the level editor. 2014-04-25 16:14:05 -07:00
Scott Erickson
7640a6365b Removed some logs. 2014-04-25 14:59:17 -07:00
Scott Erickson
278d6752c3 Refactored SuperModel, CocoModel and LevelLoader. 
Removed the dynamic population of the Level, instead putting straightforward logic into LevelLoader.
Simplified SuperModel.
 2014-04-25 14:30:06 -07:00
Ting-Kuan
974e5e1b24 remove debugging msg. 2014-04-19 13:09:50 -04:00
Ting-Kuan
1c1cf2f189 Fix loading of Level. 2014-04-17 19:23:35 -04:00
Ting-Kuan
af399f4415 Merge branch 'master' into feature/loading-views 2014-04-15 13:34:20 -04:00
Nick Winter
89ec5c900b Trying synchronous spritesheet building during level loading for speed. 2014-04-14 14:50:25 -07:00
Ting-Kuan
a6235842b6 Change populate model to accept resource name. 2014-04-11 22:35:20 -04:00
Ting-Kuan
a5e6496a7c Make resources as static class to avoid loading multiple times. 
Clean debug message.
 2014-04-10 16:59:08 -04:00