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

64 commits

Author SHA1 Message Date
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
9bc8ae11da Fixed some indentation. 2014-04-21 11:42:21 -07: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
Ting-Kuan
64f986c286 Remove dependency management in supermodel. 2014-04-17 22:16:29 -04:00
Ting-Kuan
a5e2069d60 Move onLoaded logic from CocoView to ChildrenView. Prevent level_loading_view being unveiled before game starts. 2014-04-17 19:37:31 -04:00
Scott Erickson
b9a978dd13 Fixed the colors tab view. 2014-04-16 08:44:04 -07:00
Ting-Kuan
8e19d8b71f Change some resource loading logic to fit new SuperModel. 2014-04-13 13:29:43 -04:00
Ting-Kuan
573a4ae847 Merge branch 'feature/loading-views' into feature/revise-supermodel-based-on-#815 
Conflicts:
	app/models/SuperModel.coffee
	app/views/editor/thang/edit.coffee
 2014-04-13 10:37:35 -04:00
Ting-Kuan
4979344ee5 Remove schema loading code. 2014-04-13 10:36:09 -04:00
Ting-Kuan
77c4c586dd Merge branch 'feature/loading-views' into feature/revise-supermodel-based-on-#815 
Conflicts:
	app/locale/en.coffee
 2014-04-12 17:13:06 -04:00
Ting-Kuan
508b570fea Merge branch 'master' into feature/loading-views 
Conflicts:
	.gitignore
	app/locale/en.coffee
	app/models/SuperModel.coffee
	app/views/editor/thang/edit.coffee
	app/views/kinds/CocoView.coffee
 2014-04-12 17:07:30 -04:00
Ting-Kuan
7ae3bd5a60 Fix style and supermodel based on #815. 
Fix ladder_view and ladder_tab.
Change error handling functions in CocoView.
 2014-04-12 16:29:49 -04:00
Scott Erickson
30f785f7cf Moved the model schemas into a models folder. 2014-04-12 10:51:02 -07:00
Scott Erickson
5a794306fe Merge branch 'refactorSchemas' of https://github.com/adi2412/codecombat into adi2412-refactorSchemas 2014-04-12 08:53:24 -07:00
Scott Erickson
10b1660419 Fixed the level editor so you can save again. 2014-04-12 08:48:49 -07:00
Aditya Raisinghani
b932bf1e7c Deleted schemas from /server and modified files to point to /app/schemas 2014-04-12 14:45:59 +05:30
Aditya Raisinghani
6fb5b59a01 Refactored schemas to be in /app 2014-04-12 14:33:55 +05:30
Scott Erickson
bbb9fb7a64 Added a patches view. 2014-04-11 14:19:17 -07: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
Scott Erickson
3c832d3707 Added delta views to the other save modals. Fixed modified deltas in delta views. A few style tweaks. 2014-04-10 11:13:33 -07:00
Ting-Kuan
6729cfc292 First commit. 2014-04-08 12:03:03 -04:00
Nick Winter
670f94cc22 Fixed #418, no more print/save dialogues evaaarr. 2014-04-02 14:42:34 -07:00
Nick Winter
ae9769e3ce Added read only notification in editors. Fixed #374. 2014-04-01 13:15:30 -07:00
Nick Winter
54f4e8d1e9 Merge branch 'dev/error_message_for_editor' of git://github.com/gintau/codecombat into gintau-dev/error_message_for_editor 2014-03-29 17:38:14 -07:00
Laura Lebbah
5d894ea053 Migrate .on, .once - ThangTypeEditView 2014-03-27 21:33:59 +01:00
Ting-Kuan
6012a3ce9e Show error message when editor fails to initiate. 2014-03-27 14:35:20 -04:00
swapnesh
1118324b41 Migrate from .on, .once to .listenTo, .listenToOnce 2014-03-26 03:25:11 +05:30
Scott Erickson
37a9b7f319 Switching from the slow _.cloneDeep to the fast $.extend 2014-03-18 13:08:26 -07:00
Scott Erickson
853a80dd23 Fixed loading marks so they are positioned correctly when they load and the world is paused. 2014-03-12 12:43:51 -07:00
Nick Winter
0125c46dc2 Resolved merge conflict. 2014-03-12 08:29:42 -07:00
Ruben Vereecken
2a86daaa2a Added Version History to Thang Types 2014-03-12 15:22:15 +01:00
Ruben Vereecken
af73e5a594 Added a versions modal for every type 2014-03-10 23:29:34 +01:00
Nick Winter
b3964571e1 Fixed bug importing animations into existing ThangTypes that had only containers. 2014-03-08 15:04:11 -08:00
Scott Erickson
afbe2200a6 Fixed a bug with the new race condition fix. Moving the schemas to the application would be good. 2014-03-08 13:52:34 -08: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
1349a59084 Refactored destroy functions to have super be the last thing. 2014-02-14 10:57:47 -08:00
Nick Winter
9ac0939bb8 Fixed modal switchout and palette property interpolation. Refactored all use of .hide to .secret so we can use jQuery to show/hide things again. 2014-02-13 09:26:21 -08:00
Scott Erickson
f3489a6c2f Added a 'stop' button for viewing end animations on thang types. 2014-02-12 16:18:25 -08:00
Scott Erickson
2a19da5ba2 More memory fixes. 2014-02-11 14:58:45 -08:00
Scott Erickson
09bb669439 Fixed #300 2014-02-02 16:51:22 -08:00
Scott Erickson
3093b59588 Fixed #296 2014-01-30 16:25:06 -08:00
Scott Erickson
46d1d10abe Removed an unnecessary fat arrow. 2014-01-30 16:20:58 -08:00
Scott Erickson
c376ba6841 Fixed #303 2014-01-30 16:19:55 -08:00
Scott Erickson
1b75ab15db Added some error handlers for messed up thang type configs. 2014-01-30 16:17:41 -08:00
Scott Erickson
b4cd7bdec4 Fixed #281 2014-01-27 19:03:22 -08:00
Scott Erickson
9da955d1a2 Set up a backup system for the editor using localStorage. 2014-01-26 14:46:25 -08:00
Scott Erickson
2cf19a4781 Renamed canvases to spritesheets in the edit thang view. 2014-01-20 22:37:47 -08:00
Scott Erickson
7f4f268ff8 Improved the refresh rate for the color tab, and made it work with containers. 2014-01-20 12:57:29 -08:00
GlenDC
a7368fb51e Converted line endings to unix endings for 3 files 2014-01-16 00:35:17 +01:00
GlenDC
d5907059ed Resolved issue #30 2014-01-15 01:58:37 +01:00