Commit graph

85 commits

Author SHA1 Message Date
phoenixeliot
939265a119 Fix supermodel.trackModel 2016-03-01 10:33:45 -08:00
Imperadeiro98
42f84de394 Merge master branch 2016-02-24 19:40:21 +00:00
Imperadeiro98
9c12f6c957 Revert changes to LevelLoader and SuperModel 2016-02-24 19:32:28 +00:00
Scott Erickson
becad06750 Refactor ArticleEditView and PatchesView to use model endpoint functions 2016-02-22 16:03:21 -08:00
Imperadeiro98
92dc72cce1 Remove name from loadModel 2016-02-18 16:44:40 +00:00
Scott Erickson
4ef5f40fa1 Network error handling fixes
* Make work there are multiple network requests and only one fails
* Test for i18n attributes instead of English translations so Travis works
* Various PR changes
2016-01-27 10:42:12 -08:00
Scott Erickson
29350bf1de Make network error handling more generic 2016-01-27 10:41:56 -08:00
Nick Winter
95c703a7df Simulate games in background while playing levels if we think there's extra compute power 2015-11-29 12:30:19 -08:00
Nick Winter
f1a4249f18 More reductions in memory usage for iPad. 2014-11-18 11:21:29 -08:00
Matt Lott
f56d01419f Update sync pvp teams and real-time playback
-Non-creator will switch teams upon joining a sync pvp game, if creator
is on same team
-Team swapping should only affect level session
-Real-time multiplayer submit now reloads PlayLevelView to ease loading
both player’s latest level sessions, and then automatically starts
real-time playback.
2014-11-17 15:07:10 -08:00
Nick Winter
08d9e39764 LevelLoader and Simulator fixes for simulating hero-ladder matches. Commented out some logging that hasn't been very useful. Fixed some tests. 2014-10-19 21:56:26 -07:00
Nick Winter
2872de71ce Fixed a bug with hero placeholder loading. Improved game menu modal close button usability. 2014-09-21 13:26:56 -07:00
Nick Winter
2f07c3e8d3 Adding communication with iPad app. 2014-09-06 19:50:31 -07:00
Nick Winter
681cc4656f Fixed a bug with revertAttributes getting set during SuperModel duplicate model merging. 2014-09-02 18:28:02 -07:00
Nick Winter
051f1a77ae Fixed #1152. 2014-08-30 09:19:41 -07:00
Scott Erickson
607a2a133f Made the SuperModel a little bit more clever about handling duplicate loaded models, hopefully fixed #1108. 2014-08-26 16:46:23 -07:00
Scott Erickson
98752159ca Made the SuperModel a little bit more clever about handling duplicate loaded models. 2014-08-26 16:31:53 -07:00
Scott Erickson
ab669739a6 Fixed a bug with the thang component edit view: labels of new components not showing up. 2014-08-26 14:15:21 -07:00
Scott Erickson
3b6de071f7 Getting rid of a debug line. 2014-08-26 09:55:59 -07:00
Ruben Vereecken
3fd396974d Merge branch 'master' into achievements
Conflicts:
	app/views/DemoView.coffee
	app/views/docs/ComponentDocumentationView.coffee
	app/views/editor/level/LevelEditView.coffee
	server/users/User.coffee
2014-08-13 10:43:42 +02: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
29770bd220 Added a function for denormalizing levels, extending level thang components and configs with ones from thang types. 2014-08-06 15:18:22 -07:00
Ruben Vereecken
871149b2bc Rechecked and added cool stuff for achievements 2014-07-30 22:23:43 +02:00
Ruben Vereecken
411bb87985 Added contributor categories to user profile page 2014-07-22 12:50:56 +02:00
Ruben Vereecken
ea3d1fee74 Starting on achievement overview style 2014-07-07 15:03:28 +02:00
Ruben Vereecken
9055612b24 Fixtures set up, demo start 2014-07-07 12:47:32 +02:00
Ruben Vereecken
ec78f95da1 Prepared things for Scott 2014-07-06 23:16:00 +02:00
Ruben Vereecken
1b9c8b0066 Got users and achievements to load in a neat way 2014-07-06 22:48:33 +02:00
Tery Lim
618ade4946 Clean up mixed quotes 2014-07-01 12:23:22 +08:00
Scott Erickson
dde43d5df3 Fixed a case where the supermodel was overriding what a previous supermodel had set for saveBackups. 2014-06-23 16:57:54 -04:00
Nick Winter
a481af08d3 Fixed a couple typos with failed resource loading handling. 2014-05-26 20:51:05 -07:00
Scott Erickson
4b88296265 Set up the supermodel to clear out jqxhrs once they're done, since they take a lot of memory. 2014-05-22 11:47:38 -07:00
Nick Winter
4fc1341a64 Added a way to remove SuperModel resources to fix ladder tab refreshing. 2014-05-21 15:33:28 -07:00
Scott Erickson
037dbe97c6 Some remaining work to get the delayed show guide script set up. 2014-05-21 14:50:27 -07:00
Nick Winter
a04130f26a Fixed a bug with ladder tab not reloading. 2014-05-20 10:40:15 -07:00
Scott Erickson
09fbfdb360 Fixed a bug with the simulator due to the changes made to the supermodel. 2014-05-14 11:13: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
1d88b6eefe Most of the way there getting it to work with loading thang types dynamically throughout the play view. 2014-05-13 10:26:33 -07:00
Nick Winter
589410ed8e Merged master into feature/thangload. 2014-05-09 12:56:58 -07:00
Scott Erickson
1e938910ed Couple bug fixes. 2014-05-08 11:10:22 -07:00
Scott Erickson
e9fc3df7c1 Set up the versions modal to display changes between versions when you select two of them. 2014-05-08 10:54:39 -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
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
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
Scott Erickson
b9f4093b08 Set up the LevelLoader to load names instead of whole ThangTypes. 2014-04-28 14:58:58 -07:00
Scott Erickson
02a74ae40c Migrated and fixed the rest of the views using the new loading system. 2014-04-28 11:52:04 -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
14cffc5875 Did some refactoring to simplify using SuperModel and registering models and collections. 2014-04-26 12:54:03 -07:00