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 |
|
Nick Winter
|
2b487eeed8
|
Using /db/thang.type instead of /db/thang_type in URLs, for consistency.
|
2014-03-11 18:30:25 -07:00 |
|
Ruben Vereecken
|
af73e5a594
|
Added a versions modal for every type
|
2014-03-10 23:29:34 +01:00 |
|
Ruben Vereecken
|
8e989ec08f
|
Got the level history view set up as before, but better
|
2014-03-10 23:17:19 +01:00 |
|
Nick Winter
|
c4a3b71786
|
Merge branch 'versions_modal' of git://github.com/rubenvereecken/codecombat into rubenvereecken-versions_modal
|
2014-03-10 13:57:51 -07:00 |
|
Ruben Vereecken
|
68b10d9023
|
History now shows a loading bar upon opening
|
2014-03-10 20:06:36 +01:00 |
|
Nick Winter
|
77f7276759
|
Merge branch 'versions_modal' of git://github.com/rubenvereecken/codecombat into rubenvereecken-versions_modal
|
2014-03-10 11:29:47 -07:00 |
|
Ruben Vereecken
|
06ae06fa34
|
Used mix-ins to combine Modal and VersionView
|
2014-03-10 19:08:53 +01:00 |
|
Ruben Vereecken
|
f6ece2d63e
|
Created a modal version of Version History
|
2014-03-10 12:16:08 +01:00 |
|
Scott Erickson
|
17231bce06
|
Added showsGuide and type properties to level.
|
2014-03-07 13:13:58 -08:00 |
|
Scott Erickson
|
a6c4fe8d02
|
Merge branch 'master' of https://github.com/rubenvereecken/codecombat into rubenvereecken-master
|
2014-03-05 20:04:14 -08:00 |
|
Ruben Vereecken
|
d43ff5d217
|
Added an anonymous check on the Fork button
|
2014-03-04 11:24:38 +01: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 |
|
Ruben Vereecken
|
ee920afea9
|
Disabled buttons for non-owners in Article Editor
|
2014-03-03 21:13:02 +01:00 |
|
Ruben Vereecken
|
942b69ea9f
|
Created hasWriteAccess on Cocomodel, used it for level access
|
2014-03-03 20:41:35 +01:00 |
|
Nick Winter
|
a8ef87c9ea
|
Fixed a few bugs; re-enabled protectAPI for Brawlwood.
|
2014-03-02 16:06:22 -08:00 |
|
Nick Winter
|
6c48660922
|
No save button when there's nothing to save. Messing with AudioPlayer playSound API a bit.
|
2014-03-01 16:57:29 -08: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 |
|
Nick Winter
|
e3824d7698
|
Many improvements to the spell palette.
|
2014-02-16 15:30:00 -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
|
2f48925e86
|
Added a list of goals as a property to levels for when they won't be added by scripts. Set up the editor to be able to edit these values.
|
2014-02-12 12:27:02 -08:00 |
|
Scott Erickson
|
2a19da5ba2
|
More memory fixes.
|
2014-02-11 14:58:45 -08:00 |
|
Scott Erickson
|
332ea0df2c
|
Fixed the level editor save view knowing if the level has changes to save.
|
2014-02-06 10:30:49 -08:00 |
|
Scott Erickson
|
81912d25d1
|
Added a handler for when components or systems go rogue, so they don't take down the level editor quite so hard.
|
2014-02-03 14:01:20 -08:00 |
|
Nick Winter
|
6303d28554
|
Refactored bobbing.
|
2014-01-31 10:21:32 -08:00 |
|
Nick Winter
|
6e40fa09a6
|
Updated some Bootstrap event names.
|
2014-01-30 16:36:36 -08:00 |
|
Scott Erickson
|
5429e8ad2a
|
Cleaning up editors in the systems and components tabs.
|
2014-01-30 12:19:25 -08:00 |
|
Scott Erickson
|
827b5a3756
|
Fixed the world select modal.
|
2014-01-30 11:55:46 -08:00 |
|
Scott Erickson
|
ed1b5c6560
|
Fixed slowness to editing settings for large levels.
|
2014-01-30 11:40:24 -08:00 |
|
Scott Erickson
|
bac4fbcd7d
|
Fixed naming.
Improved tome updating of programmable spell thangs.
|
2014-01-29 10:14:12 -08:00 |
|
Scott Erickson
|
00872f80f9
|
Fixed the bug where opening a modal or switching a tab while having a thang to add selected would create a thang.
|
2014-01-28 11:54:16 -08:00 |
|
Scott Erickson
|
e2db421d1c
|
Fixed cloning.
|
2014-01-28 09:22:23 -08:00 |
|
Scott Erickson
|
a82a6a4188
|
Systems part of #266.
|
2014-01-27 21:25:01 -08:00 |
|
Scott Erickson
|
ca026610b1
|
Component part of #266.
|
2014-01-27 21:06:27 -08:00 |
|
Scott Erickson
|
9206dda3ba
|
Systems now autosave too in the level editor.
|
2014-01-27 10:39:16 -08:00 |
|
Scott Erickson
|
692b24dde0
|
#267
|
2014-01-26 15:59:33 -08:00 |
|
Scott Erickson
|
26e9dc3b09
|
Fixed system order in the level view.
|
2014-01-26 15:37:32 -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
|
00a7de12c9
|
Fixed a selection bug.
|
2014-01-21 10:54:59 -08:00 |
|
Scott Erickson
|
01a43bb3d7
|
Added filters to the extant thangs column.
|
2014-01-21 10:42:09 -08:00 |
|
GlenDC
|
c12e232ec1
|
Merge https://github.com/codecombat/codecombat
|
2014-01-21 18:01:58 +01:00 |
|
Scott Erickson
|
e61d31f48c
|
Level editor displays thangs in a more orderly fashion.
|
2014-01-20 23:02:23 -08:00 |
|
Scott Erickson
|
514adb2159
|
Improved the speed of placing down thangs in levels with lots of extant thangs.
|
2014-01-20 21:19:54 -08:00 |
|
Scott Erickson
|
222fa6100b
|
Set up the level editor to lazily load thang types.
|
2014-01-20 17:20:04 -08:00 |
|
Philipp Hansch
|
2c6c60307b
|
Disable body scrolling in Thang List
This overwrites the native scrolling behavior for the
thangs-list div by manually setting the value of
@scrollTop
|
2014-01-20 12:15:20 +01:00 |
|
GlenDC
|
d5907059ed
|
Resolved issue #30
|
2014-01-15 01:58:37 +01:00 |
|
GlenDC
|
92416dc4f2
|
Created view versions for components, systems and thangs (fix #30)
|
2014-01-15 01:33:24 +01:00 |
|
GlenDC
|
4633ced78d
|
Created superclass & common templates for article & level (fix for #30)
|
2014-01-15 01:12:21 +01:00 |
|
Scott Erickson
|
83e7a98869
|
Fixed the versions pages.
|
2014-01-14 12:53:06 -08:00 |
|
GlenDC
|
683b72f67a
|
First big fix for issue #23. The issue is as good as fixed besides some details I think.
|
2014-01-11 17:25:04 +01:00 |
|
GlenDC
|
100a296951
|
Fixed Issue #26
|
2014-01-10 22:31:26 +01:00 |
|
Nick Winter
|
70cd16cee4
|
Fixing bug with application require for now. Shoutout for Firebase.
|
2014-01-06 23:45:33 -08:00 |
|
Scott Erickson
|
94cb6ea4e1
|
Fixed up the search optimization and installed thang portraits into the level editor.
|
2014-01-06 17:11:57 -08:00 |
|
Nick Winter
|
f53f20a6ad
|
Fixed #86.
|
2014-01-06 14:53:21 -08:00 |
|
Nick Winter
|
6009df26de
|
Ready for action, sir!
|
2014-01-03 10:32:13 -08:00 |
|