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

207 commits

Author SHA1 Message Date
Scott Erickson
b7cb4696f0 Merge branch 'RefactorCocoCollection' of https://github.com/edtrist/codecombat into edtrist-RefactorCocoCollection 2014-04-24 13:31:29 -07:00
Scott Erickson
472f8899dd Merge branch 'master' of https://github.com/tmrdja/codecombat into tmrdja-master 
Conflicts:
	app/views/editor/level/edit.coffee
 2014-04-24 13:17:43 -07:00
Scott Erickson
8ab50205aa Fixed more buttons in treema. 2014-04-24 11:50:49 -07:00
tmrdja
14ebc957de Changed responsive view for LevelEditor 2014-04-24 11:51:16 +02:00
Scott Erickson
c85971e5e6 Added i18n population action to the level editor. 2014-04-22 17:56:41 -07:00
edtrist
3962d37681 #889 - moved CocoCollection.coffee to app/collections and updated references 2014-04-22 20:42:26 +01:00
Scott Erickson
bb0cbf1151 Removed some old code that didn't work out. 2014-04-22 10:43:08 -07:00
tmrdja
826a5f56db Added responsive view for LevelEditor 2014-04-21 21:15:22 +02: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
Scott Erickson
044556e5a4 Fixed a bug with the level editor that prevented selecting thangs to add. 2014-04-19 10:27:14 -07:00
Ting-Kuan
974e5e1b24 remove debugging msg. 2014-04-19 13:09:50 -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
Ting-Kuan
69fe4428e4 Before merge to master. 2014-04-17 19:52:09 -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
21e8d7b26f Fixed patches denormalization. 2014-04-17 15:44:19 -07:00
Scott Erickson
cdaf2ebfaf Set up the tabs and views in the level editor to reload so that when patches are applied, their changes are visible. 2014-04-17 14:23:33 -07:00
Scott Erickson
781a8ec913 Fixed the play and save buttons. 2014-04-17 13:37:08 -07:00
Scott Erickson
07afba01df Merge branch 'master' into feature/jsondiffpatch 
Conflicts:
	app/views/editor/level/thangs_tab_view.coffee
 2014-04-17 13:25:42 -07:00
Scott Erickson
b5406b0149 Set up the rest of the component/system buttons and nav bars. 2014-04-17 13:24:17 -07:00
Nick Winter
2230b32829 Merge pull request #863 from dpen2000/FixTypeError 
Fix javascript error occuring when e is null/undefined
 2014-04-17 11:37:51 -07:00
Scott Erickson
9eff958dcb Fixed the level and component watch buttons. 2014-04-17 11:35:09 -07:00
dpen2000
7bc9bb5328 Fix javascript error occuring when e is null/undefined 2014-04-17 14:32:35 -04:00
Scott Erickson
8f4535853b Fixed the component history button. 2014-04-17 11:29:12 -07:00
Scott Erickson
8859405e18 Reworked the nav bars in the level editor. 2014-04-17 11:02:00 -07:00
Nick Winter
eec1888b22 gzipping when in production but not going through Cloudflare. 2014-04-17 10:12:23 -07:00
Ting-Kuan
360e594f3d Merge branch 'feature/loading-views' of https://github.com/codecombat/codecombat into feature/loading-views 
Conflicts:
	server/commons/Handler.coffee
 2014-04-17 12:58:29 -04:00
Scott Erickson
02a7381fa9 Fixed the watch buttons for levels and components. 2014-04-16 11:02:40 -07:00
Scott Erickson
f88e0ac0ab Set up patches for components. 2014-04-16 10:42:32 -07:00
Ting-Kuan
2e50d7b15d Merge branch 'feature/Change-view-to-fit-new-supermodel' into feature/loading-views 
Conflicts:
	app/views/play/ladder/ladder_tab.coffee
	app/views/play/ladder_view.coffee
 2014-04-16 11:38:05 -04:00
Scott Erickson
94c4179417 Fixed some things that were keeping brunch from working. 2014-04-16 08:03:41 -07:00
Ting-Kuan
c53eb562a3 Remove debug msg. 2014-04-16 02:31:18 -04:00
Ting-Kuan
52a73ceae3 Migrate view to fit new supermodel. 2014-04-16 02:28:59 -04:00
Scott Erickson
c395a3414e Merge branch 'master' into feature/jsondiffpatch 2014-04-15 15:18:57 -07:00
Scott Erickson
58b1019934 Switched listen to watch (would have been confusing with eye-con, and listenTo function in Backbone). Added watch button and patch badge to level editor. 2014-04-15 15:09:36 -07:00
Scott Erickson
e06c3dbb0b Fixed the thangs tab view preventing the new patches view from handling clicks correctly. 2014-04-15 13:21:33 -07:00
Scott Erickson
1efabc3738 Fixed the fix. 2014-04-15 12:31:35 -07:00
Scott Erickson
b238ccaf27 Fixed the context-menu preventer in the level editor. 2014-04-15 12:27:35 -07:00
Scott Erickson
bb53e963b6 Removed a hack no longer needed. 2014-04-15 12:27:11 -07:00
Ting-Kuan
af399f4415 Merge branch 'master' into feature/loading-views 2014-04-15 13:34:20 -04:00
Nick Winter
a9725f2dc6 A bit of error handling. 2014-04-13 14:48:36 -07:00
Ting-Kuan
8e19d8b71f Change some resource loading logic to fit new SuperModel. 2014-04-13 13:29:43 -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
5a794306fe Merge branch 'refactorSchemas' of https://github.com/adi2412/codecombat into adi2412-refactorSchemas 2014-04-12 08:53:24 -07:00
Scott Erickson
6eab5003f8 Merge branch 'feature/jsondiffpatch' 2014-04-12 08:52:35 -07:00
Scott Erickson
10b1660419 Fixed the level editor so you can save again. 2014-04-12 08:48:49 -07:00
Aditya Raisinghani
6fb5b59a01 Refactored schemas to be in /app 2014-04-12 14:33:55 +05:30
Scott Erickson
35fe47bbac Merge branch 'feature/jsondiffpatch' 2014-04-11 22:52:58 -07:00
Nick Winter
99ead5d193 #223 is done, since goals aren't in scripts, and I just removed some goals-of-scripts stuff. 2014-04-11 19:51:20 -07:00
Ting-Kuan
a6235842b6 Change populate model to accept resource name. 2014-04-11 22:35:20 -04:00
Nick Winter
91c2f0fa33 Fixed #715, and some misc cleanup. 2014-04-11 17:36:15 -07:00
Scott Erickson
e3a1f170cf Merge branch 'master' into gintau-feature/change-supermodel-to-general-resource-loader 
Conflicts:
	app/views/kinds/CocoView.coffee
	app/views/play/level/level_loading_view.coffee
 2014-04-11 11:19:16 -07:00
Scott Erickson
97a7bc7614 Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch 
Conflicts:
	app/initialize.coffee
	bower.json
 2014-04-11 10:32:19 -07:00
Nick Winter
8d5e129c2c Merged the jobs in. Look out for Treema bugs from the last four months. 2014-04-11 10:20:12 -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
a3951b0fa7 Extended the save version modal to allow submitting patches. 2014-04-10 13:09:44 -07: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
Scott Erickson
66d455285e Integrated the delta view into the save view for levels. 2014-04-09 19:07:44 -07:00
Nick Winter
c226835ff2 Fixed a couple bugs in custom TreemaNodes. 2014-04-08 17:13:05 -07:00
Nick Winter
5c8c7fff1d Starting work on simple recruitment listings. Moved Treema and the JS parts of Bootstrap to bower. 2014-04-05 17:05:03 -07:00
Nick Winter
ae9769e3ce Added read only notification in editors. Fixed #374. 2014-04-01 13:15:30 -07:00
Nick Winter
b316a3e078 Merge branch 'dev/Warn_when_a_depended-on_System_is_missing' of git://github.com/gintau/codecombat into gintau-dev/Warn_when_a_depended-on_System_is_missing 2014-04-01 09:44:06 -07:00
Nick Winter
785cb342a2 Merge branch 'master' of git://github.com/tmrdja/codecombat into tmrdja-master 2014-04-01 09:12:48 -07:00
Ting-Kuan
085d181ed3 Use Noty to produce warning message while adding component with not added system. 2014-04-01 00:47:50 -04:00
tmrdja
dfe6bce351 Added contextmenu 
Added contextmenu
 2014-03-31 18:33:14 +02:00
tmrdja
f8de6162d1 Added contextmenu 
Added contextmenu with Delete and Duplicate button
 2014-03-30 19:38:54 +02: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
Nick Winter
ff7e2d5d47 Fixed #728. 2014-03-28 11:02:23 -07:00
Nick Winter
62867534a7 Fixed #727. 2014-03-28 09:52:07 -07:00
Ting-Kuan
6012a3ce9e Show error message when editor fails to initiate. 2014-03-27 14:35:20 -04:00
Shrihari
093cc66fa0 Reverted few wrong migrations 2014-03-24 22:56:32 +05:30
Shrihari
0160538b44 More migrations 2014-03-24 22:28:34 +05:30
Nick Winter
7ba959045a A slight enhancement to #650, plus fixing CocoModels thinking they're modified when schema defaults have been added. 2014-03-23 10:00:16 -07:00
Nick Winter
fd2d9b6833 Merge pull request #658 from ItsLastDay/editor_tweaks 
Added tooltip in level-editor (issue #174)
 2014-03-22 17:30:52 -07:00
Mikhail Koltsov
2316773cb1 removed Label requierment 2014-03-22 23:25:18 +04:00
Mikhail Koltsov
36cfdfda46 Added labels above selected thangs in level-editor (issue #174) 2014-03-22 23:17:15 +04:00
Nick Winter
a3dadd6a40 Merge branch 'editor_tweaks' of git://github.com/ItsLastDay/codecombat into ItsLastDay-editor_tweaks 2014-03-21 07:25:33 -07:00
Mikhail Koltsov
45b87ed38e finally got it right 2014-03-21 13:45:56 +04:00
Mikhail Koltsov
0ece400a18 Level editor: selecting a thang now moves the scroll in existant-thang list 2014-03-21 11:54:55 +04:00
Scott Erickson
dbbf9ce8b3 Merge branch 'master' of https://github.com/jayant1992/codecombat into jayant1992-master 
Conflicts:
	app/styles/editor/level/thangs_tab.sass
	app/templates/editor/level/thangs_tab.jade
	app/views/editor/level/thangs_tab_view.coffee
 2014-03-20 11:22:23 -07:00
Nick Winter
b7e8f2ecb5 Merge pull request #605 from kvasnyk/master 
Fix for #272 bug.
 2014-03-19 18:31:20 -07:00
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
Jayant Jain
80f53d2c6b Adds search bar for adding thangs in level editor 2014-03-19 00:41:03 +05:30
kvasnyk
5216432bf9 Fix for #272 bug. 2014-03-18 05:47:53 +01:00
Nick Winter
aa4f1baf73 Moved to 1848 x 1178 pixel canvases, since it's 2x the old size. Added a conversion factor to script camera zooms to account for scripts using the old numbers. Fixed bug where IndieSprites wouldn't update actions. 2014-03-16 13:23:01 -07:00
Jayant Jain
91515b1cea Clicking a thang in the left list automatically pans to the sprite on the editor map 2014-03-16 03:11:40 +05:30
Nick Winter
ca75cc4a1a Fixed #405 with a sledgehammer--just loading all Components before loading level editor. 2014-03-15 12:31:39 -07:00
Nick Winter
7b1f8d1114 Merge pull request #547 from jayant1992/master 
Improved panning and zooming for editor
 2014-03-15 08:05:02 -07:00
Scott Erickson
af8008596a Made editing thangs in the level editor not so slow by avoiding calling level.serialize. 2014-03-14 11:58:29 -07:00
Jayant Jain
ece932595c Enables drag-panning for editor and region chooser 2014-03-14 23:57:00 +05:30
Jayant Jain
c24469e86b Minor UI updates to level editor's thang tab 2014-03-13 12:19:51 +05:30
Nick Winter
da762fbc4f Merge branch 'rubenvereecken-versions_modal' 2014-03-12 08:30:02 -07:00
Nick Winter
0125c46dc2 Resolved merge conflict. 2014-03-12 08:29:42 -07:00
Ruben Vereecken
4b72ee1d04 Clean up 2014-03-12 15:43:49 +01:00
Ruben Vereecken
ddae5d0763 Added Version History to Level Components 2014-03-12 15:32:55 +01:00
Ruben Vereecken
2a86daaa2a Added Version History to Thang Types 2014-03-12 15:22:15 +01:00