Scott Erickson
|
2a17ec5cb9
|
Refactored out displayObject from CocoSprites.
|
2014-05-14 17:05:13 -07:00 |
|
Scott Erickson
|
31c5890288
|
Fixed #934
|
2014-05-01 15:44:50 -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
|
d5bcec5ad0
|
Fixed the level editor with the new loading system.
|
2014-04-25 19:11:32 -07:00 |
|
Scott Erickson
|
3dc3f62473
|
Merge branch 'master' into feature/loading-views
Conflicts:
app/views/editor/components/main.coffee
|
2014-04-25 14:31:58 -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
|
b7cb4696f0
|
Merge branch 'RefactorCocoCollection' of https://github.com/edtrist/codecombat into edtrist-RefactorCocoCollection
|
2014-04-24 13:31:29 -07:00 |
|
tmrdja
|
14ebc957de
|
Changed responsive view for LevelEditor
|
2014-04-24 11:51:16 +02:00 |
|
edtrist
|
3962d37681
|
#889 - moved CocoCollection.coffee to app/collections and updated references
|
2014-04-22 20:42:26 +01: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 |
|
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
|
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 |
|
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 |
|
dpen2000
|
7bc9bb5328
|
Fix javascript error occuring when e is null/undefined
|
2014-04-17 14:32:35 -04:00 |
|
Nick Winter
|
eec1888b22
|
gzipping when in production but not going through Cloudflare.
|
2014-04-17 10:12:23 -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
|
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 |
|
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 |
|
Aditya Raisinghani
|
6fb5b59a01
|
Refactored schemas to be in /app
|
2014-04-12 14:33:55 +05:30 |
|
Ting-Kuan
|
a6235842b6
|
Change populate model to accept resource name.
|
2014-04-11 22:35:20 -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
|
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 |
|
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 |
|
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
|
2b487eeed8
|
Using /db/thang.type instead of /db/thang_type in URLs, for consistency.
|
2014-03-11 18:30:25 -07:00 |
|
Nick Winter
|
71ebe7a0aa
|
Lowered Surface framerate in the level editor, since ain't nobody got CPU time for 'dat.
|
2014-02-28 17:12:23 -08:00 |
|
Scott Erickson
|
242342315f
|
Can now drag the mouse to move around the map.
|
2014-02-24 19:49:05 -08:00 |
|
Nick Winter
|
91412ccd69
|
Playback and level editor shortcut tweaks.
|
2014-02-24 09:58:12 -08: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
|
2a19da5ba2
|
More memory fixes.
|
2014-02-11 14:58:45 -08:00 |
|