Commit graph

22 commits

Author SHA1 Message Date
Scott Erickson
ffdf11133e Merge branch 'SetReadOnlyChanges' of https://github.com/dpen2000/codecombat into dpen2000-SetReadOnlyChanges 2014-05-06 11:19:11 -07:00
dpen2000
3165a2b654 Change all lines setting readonly from being admin only to being authenticated only 2014-04-28 02:03:08 -04:00
Scott Erickson
14cffc5875 Did some refactoring to simplify using SuperModel and registering models and collections. 2014-04-26 12:54:03 -07:00
Scott Erickson
d5bcec5ad0 Fixed the level editor with the new loading system. 2014-04-25 19:11:32 -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
Scott Erickson
c754f7b943 Merge branch 'master' into feature/loading-views 2014-04-21 11:53:18 -07:00
dpen2000
de69f740e4 Fix deltas referring to last system saved
If a system is added, it is added to treema at the end of the list of systems. Treema then raises it's changed event resulting in this order being set on the level. The next time a system is added, the first system is in it's correct position and so the delta shows it as moving. This changes ensures we save the correct order in the first instance.
2014-04-19 19:59:21 -04:00
Ting-Kuan
375aca2c0a Fix: Some level systems load forever. 2014-04-19 12:08:40 -04:00
Ting-Kuan
692693c181 Merge branch 'master' into feature/loading-views
Conflicts:
	app/locale/en.coffee
	app/views/editor/level/edit.coffee
	app/views/kinds/CocoView.coffee
	app/views/play/ladder/ladder_tab.coffee
	app/views/play/ladder_view.coffee
	app/views/play/level/level_loading_view.coffee
2014-04-19 01:15:04 -04:00
Scott Erickson
8859405e18 Reworked the nav bars in the level editor. 2014-04-17 11:02:00 -07:00
Scott Erickson
94c4179417 Fixed some things that were keeping brunch from working. 2014-04-16 08:03:41 -07:00
Ting-Kuan
52a73ceae3 Migrate view to fit new supermodel. 2014-04-16 02:28:59 -04:00
Aditya Raisinghani
6fb5b59a01 Refactored schemas to be in /app 2014-04-12 14:33:55 +05:30
Nick Winter
91c2f0fa33 Fixed #715, and some misc cleanup. 2014-04-11 17:36:15 -07:00
Nick Winter
c226835ff2 Fixed a couple bugs in custom TreemaNodes. 2014-04-08 17:13:05 -07:00
Shrihari
0160538b44 More migrations 2014-03-24 22:28:34 +05:30
Scott Erickson
74e068af0b Fixed some bugs from the migration from _.cloneDeep to $.extend 2014-03-18 13:47:51 -07:00
Scott Erickson
37a9b7f319 Switching from the slow _.cloneDeep to the fast $.extend 2014-03-18 13:08:26 -07:00
Ruben Vereecken
0aa8e7bb7d Added owner-based save enabling on Thang Types. NOTE server-sided doesn't work yet 2014-03-03 22:21:56 +01:00
Scott Erickson
9206dda3ba Systems now autosave too in the level editor. 2014-01-27 10:39:16 -08:00
Scott Erickson
26e9dc3b09 Fixed system order in the level view. 2014-01-26 15:37:32 -08:00
Nick Winter
6009df26de Ready for action, sir! 2014-01-03 10:32:13 -08:00