Scott Erickson
|
f519df6189
|
Wrapping up work on the folderized thangs treema in the level editor.
|
2014-09-03 16:51:09 -07:00 |
|
Scott Erickson
|
9439f0d47d
|
Some tweaks and fixes to the folderized thangs in the level editor.
|
2014-09-03 15:38:57 -07:00 |
|
Scott Erickson
|
0cc593e3ac
|
Thangs tab now maintains the order of thangs independently of how thangs are reorganized into folders.
|
2014-09-03 15:38:57 -07:00 |
|
Scott Erickson
|
e1abf115f7
|
Folderizing thang types in the level editor.
|
2014-09-03 12:30:08 -07:00 |
|
Scott Erickson
|
975c6ad2a6
|
Optimized level serialization a bit more to make placing and moving thangs around in the level editor more fluid.
|
2014-09-03 09:33:21 -07:00 |
|
Scott Erickson
|
1888e9ea92
|
Removed a log.
|
2014-09-03 08:44:46 -07:00 |
|
Scott Erickson
|
a494d1f2c4
|
Fixed the walls not updating when they are randomly generated.
|
2014-09-02 19:47:43 -07:00 |
|
Scott Erickson
|
9af460cf42
|
Fixed #330
|
2014-09-02 18:43:24 -07:00 |
|
Nick Winter
|
6eb23349d0
|
Center camera when level loaded in level editor.
|
2014-09-02 18:08:41 -07:00 |
|
Scott Erickson
|
621c684c74
|
Tweaked the randomize buttons and modal (also changing it to "generate terrain" and refactoring related files accordingly).
|
2014-09-02 17:53:39 -07:00 |
|
Nick Winter
|
23516175d4
|
Adding default IDs to new goals.
|
2014-09-02 17:28:45 -07:00 |
|
Scott Erickson
|
3fd9cb89ef
|
Refactored LevelSystem/ComponentEditViews' files, and fixed their configSchema treemas not to edit raw model data directly.
|
2014-09-02 17:26:02 -07:00 |
|
Scott Erickson
|
6394482c34
|
Unjanking getCurrentView.
|
2014-09-02 17:07:28 -07:00 |
|
Scott Erickson
|
daca7b54f3
|
Refactored SystemTabView names, hid the add button in the systems tab.
|
2014-09-02 16:50:54 -07:00 |
|
Nick Winter
|
fa0f904fbb
|
Fixed a couple bugs with Achievements not getting schema defaults.
|
2014-09-02 16:48:16 -07:00 |
|
Nick Winter
|
b20b819a1f
|
Tweaked a few styles on the ThangsTabView.
|
2014-09-02 16:43:17 -07:00 |
|
Nick Winter
|
7f9ac5e573
|
Fixed a few bugs where default hero level type wasn't getting pulled.
|
2014-09-02 16:02:30 -07:00 |
|
Scott Erickson
|
55bac798ee
|
Cleared out the thangs tab view mobile handling and just made the left and right columns toggleable all the time. The surface now fills the whole width.
|
2014-09-02 15:33:23 -07:00 |
|
Nick Winter
|
d8ef2f8596
|
Made new related achievements open in a new tab in the level editor.
|
2014-09-02 15:00:14 -07:00 |
|
Nick Winter
|
ba53cb06fe
|
Tagged Levels and ThangTypes by terrains. Terrains now control default pathfinding in AI System.
|
2014-09-02 14:16:41 -07:00 |
|
Scott Erickson
|
1edf3de651
|
Fixed double clicking sometimes firing when you're just dragging units around in the level editor.
|
2014-09-02 14:06:37 -07:00 |
|
Scott Erickson
|
7e627277e1
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-09-02 12:33:50 -07:00 |
|
Scott Erickson
|
b521aee322
|
Optimized level serialization a little so that level editing is a bit less painful.
|
2014-09-02 12:33:34 -07:00 |
|
Scott Erickson
|
13b066f6aa
|
Fixed not being able to drag thangs around every other attempt.
|
2014-09-02 11:53:03 -07:00 |
|
Nick Winter
|
4b9bf22e22
|
Thang editor now sets some default Components when you change the kind of a ThangType.
|
2014-09-02 11:29:33 -07:00 |
|
Nick Winter
|
af42bafb15
|
Added default goals. Don't show System versions in the Systems list if they're 0.
|
2014-09-01 21:58:22 -07:00 |
|
Nick Winter
|
9094c0ce19
|
Add hero placeholder to terrain generator on hero levels.
|
2014-09-01 20:22:46 -07:00 |
|
Nick Winter
|
b7d9e7a095
|
Fixed some click/add behavior in level editor. Fixed level editor canvas resizing. Fixed some dungeon terrain generation issues. Certain Thangs can be placed on top of other Thangs.
|
2014-09-01 20:07:50 -07:00 |
|
Nick Winter
|
72eb59b7c3
|
Fixed a few bugs.
|
2014-09-01 16:14:50 -07:00 |
|
Nick Winter
|
6df5ca00b2
|
Fixed #69.
|
2014-09-01 13:51:30 -07:00 |
|
Nick Winter
|
ef9a983e30
|
Made ItemView more general. Upgraded Bootstrap from 3.1 to 3.2. Fixed a few bugs.
|
2014-08-31 12:21:25 -07:00 |
|
Nick Winter
|
5f132e55ba
|
Fixed #1414. Also started lazily loading certain level editor tabs.
|
2014-08-30 23:04:45 -07:00 |
|
Nick Winter
|
a284c8eb37
|
Fixed #1428.
|
2014-08-30 21:16:01 -07:00 |
|
Nick Winter
|
a8644d030e
|
Fixed #1355.
|
2014-08-30 14:30:53 -07:00 |
|
Scott Erickson
|
6f2de166c0
|
Removed destroying scripts, since they don't have ace editors, and it was causing a bug.
|
2014-08-30 09:42:13 -07:00 |
|
Nick Winter
|
40aa95ba16
|
Fixed #1297.
|
2014-08-29 18:07:32 -07:00 |
|
Scott Erickson
|
7a9c53e424
|
All ace editors must die. I found that certain editor modes will leave a mess in memory, so when editors are destroyed, I also set their modes to '' which seems to take care of most of the issue. They still leave memory behind just a little bit, though.
|
2014-08-29 18:04:50 -07:00 |
|
Scott Erickson
|
21e0889a86
|
All ace editors must die. I found that certain editor modes will leave a mess in memory, so when editors are destroyed, I also set their modes to '' which seems to take care of most of the issue. They still leave memory behind just a little bit, though.
|
2014-08-29 18:02:29 -07:00 |
|
Nick Winter
|
cb14149816
|
Fixed #1286. Sort of.
|
2014-08-29 17:52:47 -07:00 |
|
Scott Erickson
|
434a0c071b
|
Few more bugs fixed for defaults.
|
2014-08-29 12:29:42 -07:00 |
|
Scott Erickson
|
f93ef2005e
|
Level editor only folds in ThangType components into Thang component configs if the level is type 'hero'.
|
2014-08-29 11:34:32 -07:00 |
|
Scott Erickson
|
570380c2a4
|
Merge branch 'master' into feature/defaults
|
2014-08-29 08:14:43 -07:00 |
|
Nick Winter
|
a4b2333fd3
|
Added Systems documentation. Fixed #1115.
|
2014-08-28 22:32:55 -07:00 |
|
Nick Winter
|
124f999bc8
|
Fixed #1105. Also send HipChat notifications whenever anyone changes anything; let's see if it's too much.
|
2014-08-28 19:39:46 -07:00 |
|
Scott Erickson
|
74ca7fe0cc
|
Migrated to Treema's use of 'schema' as the raw schema property, and 'workingSchema' as the flattened, dereferenced schema.
|
2014-08-28 17:05:46 -07:00 |
|
Scott Erickson
|
2dde77f8b0
|
Merge branch 'master' into feature/defaults
|
2014-08-28 15:26:04 -07:00 |
|
Nick Winter
|
f79a2848fd
|
Fixed #1038. Focus should now remain on code editor when after clicking on Surface.
|
2014-08-28 14:00:54 -07:00 |
|
Scott Erickson
|
8b056cfb8f
|
Refactored the item equips view to limit items by slot and also moved the item name loading to the node class itself.
|
2014-08-28 11:24:45 -07:00 |
|
Nick Winter
|
54207f0f7d
|
Fixed #1000.
|
2014-08-28 10:50:20 -07:00 |
|
Scott Erickson
|
94065a0c4c
|
Merged conflicts.
|
2014-08-28 09:59:07 -07:00 |
|
Scott Erickson
|
8b943d1c2c
|
Merged conflicts.
|
2014-08-28 09:59:03 -07:00 |
|
Nick Winter
|
02255044e3
|
Fixed #847. Fixed some subscription schemas.
|
2014-08-27 18:43:17 -07:00 |
|
Scott Erickson
|
7bdfcb4313
|
Fixed pasting component configs into the thang component config treema.
|
2014-08-27 17:29:28 -07:00 |
|
Nick Winter
|
ee9e453896
|
Fixed #828. Added many other minor refactorings.
|
2014-08-27 12:24:11 -07:00 |
|
Nick Winter
|
871cd4b3c9
|
Fixed #784.
|
2014-08-26 17:34:00 -07:00 |
|
Scott Erickson
|
5d804c6d9a
|
Fixed merge conflict.
|
2014-08-26 15:41:59 -07:00 |
|
Scott Erickson
|
162aa7633e
|
Fixed the component and system settings treema, clearing out defaults for properties not being edited.
|
2014-08-26 15:40:51 -07:00 |
|
Nick Winter
|
50ad453345
|
Fixed #169.
|
2014-08-26 14:34:23 -07:00 |
|
Scott Erickson
|
5b5bceda3a
|
Components tab now incorporates components inherited from thang types.
|
2014-08-26 13:08:56 -07:00 |
|
Scott Erickson
|
fb06e58201
|
Fixed a bug where CocoModel wouldn't unset properties on revert because saveBackup is now debounced and would reintroduce those properties.
|
2014-08-26 10:14:36 -07:00 |
|
Scott Erickson
|
f92a665b8b
|
Merge conflicts.
|
2014-08-26 09:53:04 -07:00 |
|
Scott Erickson
|
6091eaea6f
|
Bunch of fixes to the thang component edit view.
|
2014-08-26 09:48:33 -07:00 |
|
Scott Erickson
|
1406a970ea
|
Bunch of fixes to get the level editor working again.
|
2014-08-25 20:34:46 -07:00 |
|
Nick Winter
|
e48b218533
|
Projected models can now update their projections and re-fetch. Hero ThangTypes now do this.
|
2014-08-25 15:39:47 -07:00 |
|
Scott Erickson
|
1c5db3f2b7
|
First round of getting the site to use the new defaults system, in particular the job profile view.
|
2014-08-23 11:07:52 -07:00 |
|
Scott Erickson
|
e200889f0b
|
Initial refactoring to use the new version of Treema.
|
2014-08-22 11:11:05 -07:00 |
|
Scott Erickson
|
9a116d81be
|
Fixed a few forms around the site to properly handle pressing enter.
|
2014-08-21 12:49:06 -07:00 |
|
Scott Erickson
|
f8d4e42c67
|
Set up thang types to now have a raster portrait icon if we want to give them custom ones not based on vector artwork.
|
2014-08-18 15:25:45 -07:00 |
|
Ruben Vereecken
|
48a79ad48c
|
New achievement modal fills in level.original query bit
|
2014-08-18 14:35:57 +02:00 |
|
Nick Winter
|
5f20e6f05e
|
Thangs get inserted into hero levels without any Components for easy defaulting. Working on moving Hero Placeholder ThangType swapping from LevelLoader to Level, but it's not there yet.
|
2014-08-15 12:09:56 -07:00 |
|
Nick Winter
|
ba1e7005ca
|
Worked around issue with docs tab polluting supermodel for components to save. Another instance of #1108. Actually, same one, but the fix eralier got undone.
|
2014-08-15 10:50:05 -07:00 |
|
Nick Winter
|
f1a9848366
|
Fixed a couple errors.
|
2014-08-15 10:27:36 -07:00 |
|
Nick Winter
|
4a133f6998
|
Added popovers to community social link logos.
|
2014-08-15 09:43:55 -07:00 |
|
Nick Winter
|
0f983bdcf1
|
Crude steps towards using your hero equipment in items levels.
|
2014-08-14 15:12:15 -07:00 |
|
Nick Winter
|
7286d069a0
|
Working to get undo/redo working again when manipulating ThangsTabView not using the Treema.
|
2014-08-14 10:28:50 -07:00 |
|
Nick Winter
|
652d47fb81
|
Merge pull request #1432 from jayant1992/undo-redo
Undo redo descriptions
|
2014-08-14 09:58:28 -07:00 |
|
Nick Winter
|
7844a2b987
|
Some fixes for new user views breaking on bad data or certain configurations.
|
2014-08-13 19:17:26 -07:00 |
|
Scott Erickson
|
31e3e7f98e
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-08-13 14:06:03 -07:00 |
|
Scott Erickson
|
f9e8bfad9f
|
Made some minor changes.
|
2014-08-13 13:45:24 -07:00 |
|
Nick Winter
|
b7d5428d5f
|
Made Forking more abstract to apply to ThangTypes, too.
|
2014-08-13 11:36:00 -07:00 |
|
Ruben Vereecken
|
3fd396974d
|
Merge branch 'master' into achievements
Conflicts:
app/views/DemoView.coffee
app/views/docs/ComponentDocumentationView.coffee
app/views/editor/level/LevelEditView.coffee
server/users/User.coffee
|
2014-08-13 10:43:42 +02:00 |
|
Jayant Jain
|
76c784b1de
|
Adds default scripts whenever a new level is created
|
2014-08-13 12:11:37 +05:30 |
|
Jayant Jain
|
1e52f237b7
|
Reworks undo-redo and undo-redo descriptions
|
2014-08-13 06:56:03 +05:30 |
|
Jayant Jain
|
094f26fc63
|
Removes undo-redo description methods from treema subclasses
|
2014-08-13 05:28:23 +05:30 |
|
Jayant Jain
|
67ed28e034
|
Undo redo descriptions for settings tab view
|
2014-08-13 02:55:36 +05:30 |
|
Jayant Jain
|
d713c35db7
|
Refactors auto insert ids and adds undo-redo descriptions for ScriptsTabView
|
2014-08-13 02:55:36 +05:30 |
|
Jayant Jain
|
9c235fa797
|
Minor refactoring and bug fixes for undo and undo descriptions
|
2014-08-13 02:55:36 +05:30 |
|
Jayant Jain
|
c6caef6219
|
Undo redo descriptions for ThangsTabView
|
2014-08-13 02:55:36 +05:30 |
|
Jayant Jain
|
eece235337
|
Adds preset images
|
2014-08-12 20:42:42 +05:30 |
|
Jayant Jain
|
b6e53d87c7
|
More decorations! (for dungeon preset)
|
2014-08-12 10:35:09 +05:30 |
|
Jayant Jain
|
5d8264e887
|
Takes care of overlapping walls for rooms
|
2014-08-12 10:35:09 +05:30 |
|
Jayant Jain
|
9d001524c6
|
Adds initial indoor preset for terrain generator
|
2014-08-12 10:35:09 +05:30 |
|
Nick Winter
|
4cc79e985e
|
A few fixes for adding items to inventories in ThangTypes.
|
2014-08-11 17:09:44 -07:00 |
|
Jayant Jain
|
4beb85a3e7
|
Fixes bug with enter press on thangs tab
|
2014-08-12 04:16:17 +05:30 |
|
Scott Erickson
|
b3572dfad9
|
Fixed some bugs with the ThangComponentsEditView, added AddThangComponentsModal.
|
2014-08-11 15:41:08 -07:00 |
|
Nick Winter
|
706ab7a251
|
Trying to get item ThangType nodes and inventory loading working.
|
2014-08-10 22:09:13 -07:00 |
|
Nick Winter
|
d1e26b40c2
|
I retook the Nick name.
|
2014-08-10 17:47:18 -07:00 |
|
Scott Erickson
|
6cac2371c1
|
Refactored and improved the ThangComponentsEditView and ThangComponentConfigView. Still some things to do.
|
2014-08-10 13:03:53 -07:00 |
|
Ruben Vereecken
|
47f00f9b5e
|
Added achievement deleting and automatic achievement filling
|
2014-08-08 17:20:07 +02:00 |
|
Jayant Jain
|
164e049202
|
Hides randomize button overlay, resolves #1409
|
2014-08-08 18:02:20 +05:30 |
|
Scott Erickson
|
0c5364eebb
|
Removed editorMode.
|
2014-08-07 14:22:43 -07:00 |
|
Nick Winter
|
4d4e321265
|
Fixed #1062. Added Item kind to level editor Thang filters.
|
2014-08-06 08:24:50 -07:00 |
|
Nick Winter
|
852dabc17a
|
Fixes for item equipping, Component saving, and terrain randomization wall snapping/overlap avoidance.
|
2014-08-06 07:43:56 -07:00 |
|
Scott Erickson
|
d5a8d8dc72
|
Fixed ComponentDocsView's components collection overwriting data for other level editor data. Related to #1108.
|
2014-08-05 14:56:11 -07:00 |
|
Scott Erickson
|
c5d496c063
|
Removed a bit for debugging.
|
2014-08-05 13:40:36 -07:00 |
|
Scott Erickson
|
30998ecbec
|
Fixed components w/out changes sometimes showing up in the save level modal.
|
2014-08-05 13:21:45 -07:00 |
|
Ruben Vereecken
|
7d7d5300c0
|
Refactored New Model Modal (from SearchView originally)
|
2014-08-05 14:33:33 +02:00 |
|
Ruben Vereecken
|
5d66560673
|
Merge remote-tracking branch 'upstream/master' into achievements_progress
Conflicts:
app/views/editor/level/LevelEditView.coffee
server/levels/sessions/LevelSession.coffee
|
2014-08-05 11:55:46 +02:00 |
|
Ruben Vereecken
|
3266e3b46b
|
intermediate
|
2014-08-04 22:21:43 +02:00 |
|
Nick Winter
|
85011d1ed4
|
No need to explicitly track subviews for determining what the current view is.
|
2014-08-04 13:21:42 -07:00 |
|
Darredevil
|
a11649b12b
|
Typo fix
|
2014-08-04 23:15:01 +03:00 |
|
Jayant Jain
|
2690ef9a59
|
Reorders script ids upon deletion
|
2014-07-30 01:05:04 +05:30 |
|
Jayant Jain
|
f0940308ea
|
Newly inserted scripts are automatically assigned id
|
2014-07-30 00:52:59 +05:30 |
|
Jayant Jain
|
632d9a666e
|
Shows all autocomplete values on click instead of having to type initially
|
2014-07-30 00:52:59 +05:30 |
|
Jayant Jain
|
0555c2ec14
|
Initial autocomplete for event checks in scripts tab
|
2014-07-30 00:52:59 +05:30 |
|
Michael Schmatz
|
d7cb76d10c
|
Merge branch 'pr/1387'
Conflicts:
app/views/editor/level/LevelEditView.coffee
|
2014-07-25 19:17:16 -07:00 |
|
Jayant Jain
|
69713f5603
|
Adds randomize button in case of level with no thangs
|
2014-07-26 01:55:28 +05:30 |
|
Darredevil
|
3b704330d6
|
Documentation tab for Level Editor
|
2014-07-25 23:06:04 +03:00 |
|
Darredevil
|
b77b796cef
|
Merge branch 'codecombat-master'
Conflicts:
app/views/docs/ComponentDocumentationView.coffee
app/views/editor/level/LevelEditView.coffee
|
2014-07-25 22:48:13 +03:00 |
|
Jayant Jain
|
3e9dbe0d0b
|
Fixes bug in undo/redo on SystemsTabView
|
2014-07-25 18:07:09 +05:30 |
|
Jayant Jain
|
d3962c19bd
|
Ensures randomised thang clusters do not overlap each other
|
2014-07-25 18:07:01 +05:30 |
|
Jayant Jain
|
f700ddea0c
|
Adds temporary hack for infinite loops in randomise
|
2014-07-25 18:06:54 +05:30 |
|
Jayant Jain
|
1790215fea
|
Adds rooms and doors to dungeon preset
|
2014-07-25 18:06:44 +05:30 |
|
Jayant Jain
|
dc66218c00
|
Adds undo and redo buttons in editor topbar
|
2014-07-25 18:06:34 +05:30 |
|
Jayant Jain
|
9a24341fa5
|
Prevents overlapping of randomly generated thangs
|
2014-07-25 18:06:25 +05:30 |
|
Jayant Jain
|
3df2de8bec
|
Number of decorations scales appropriately with preset size
|
2014-07-25 18:06:13 +05:30 |
|
Jayant Jain
|
dce6254d4a
|
Fix for flickering thangs due to exact same coordinates
|
2014-07-25 18:06:03 +05:30 |
|
Jayant Jain
|
598e727500
|
Adds an initial dungeon preset, refactors border code to properly create dungeon walls
|
2014-07-25 18:05:49 +05:30 |
|
Jayant Jain
|
c33491b04d
|
Presets in terrain_generate_modal shown from a list instead of hardcoded
Conflicts:
app/templates/editor/level/modal/terrain_randomize.jade
|
2014-07-25 17:51:48 +05:30 |
|
Jayant Jain
|
af23c09799
|
Refactors some code for presets in terrain generator
|
2014-07-25 17:50:21 +05:30 |
|
Scott Erickson
|
1c3404d03e
|
Refactored views. View file names now match view class names. Router lists routes explicitly rather than routing automagically. Hacking my way to renaming problem, spell.
|
2014-07-23 07:02:45 -07:00 |
|
Darredevil
|
61ebc4d15b
|
Docs tab
|
2014-07-21 03:52:34 +03:00 |
|
Nick Winter
|
1537754a16
|
A few bugfixes, plus gigantic child window convenience for me editing levels.
|
2014-07-19 20:26:13 -07:00 |
|
Scott Erickson
|
e7a70bbd0b
|
Merge conflict handling.
|
2014-07-18 17:09:41 -07:00 |
|
Scott Erickson
|
574e9e7804
|
Removed the deprecated ErrorView.
|
2014-07-18 16:56:08 -07:00 |
|
Scott Erickson
|
9ad166048d
|
Some work the job profile page. Added a demo view, mainly added a modal view for viewing raw player code.
|
2014-07-18 16:12:28 -07:00 |
|
Scott Erickson
|
59b723b890
|
Refactoring View to ModalView.
|
2014-07-17 17:22:26 -07:00 |
|
Scott Erickson
|
e18b4de583
|
Refactoring View to CocoView.
|
2014-07-17 17:20:11 -07:00 |
|
Scott Erickson
|
0e042ee61c
|
Refactoring View to RootView. Refactoring some RootViews to be routed manually.
|
2014-07-17 17:16:32 -07:00 |
|
Nick Winter
|
6b028513fd
|
Fixed issues with level previews and localStorage model loading. Disabled break animations on code error for now. Stopped multiple ThangType load on multiple missiles. Stopped trying to connect to Redis on local production setup.
|
2014-07-17 15:50:29 -07:00 |
|
Nick Winter
|
03cc2d1af0
|
Fixed Grass01-Grass05 scaling issues.
|
2014-07-15 18:08:00 -07:00 |
|
Jayant Jain
|
fa595fcb32
|
Better positioned level border trees
|
2014-07-16 05:03:18 +05:30 |
|
Jayant Jain
|
741956b251
|
Borders and floors are placed inside positive axes
|
2014-07-16 05:03:18 +05:30 |
|
Scott Erickson
|
fb83028d87
|
Added watchers to list of properties to skip in deltas/patches.
|
2014-07-15 11:23:35 -07:00 |
|
Nick Winter
|
f1c8983de2
|
Don't ask for team again if we already have a child window.
|
2014-07-14 08:40:36 -07:00 |
|
Jayant Jain
|
c13c7db4ed
|
Less geometric random borders for the terrain generator
|
2014-07-14 08:11:33 +05:30 |
|
Nick Winter
|
1d9afbabd2
|
Fixes for duplicate Thang IDs and reverting randomized Thangs.
|
2014-07-13 18:38:24 -07:00 |
|
Jayant Jain
|
493ebd07e6
|
Changes randomise to randomize
|
2014-07-14 06:01:09 +05:30 |
|
Jayant Jain
|
deecd7d2ff
|
Deletes previously randomised thangs when generating again
|
2014-07-14 01:34:32 +05:30 |
|
Jayant Jain
|
b934d22cbd
|
Batches insertion of thangs to treema to speed up terrain generation
|
2014-07-14 01:34:32 +05:30 |
|