Commit graph

649 commits

Author SHA1 Message Date
Nick Winter
a5b5bb1085 Ctrl/cmd+click a level in campign editor to open level editor in new tab. 2014-12-29 13:22:35 -08:00
Nick Winter
1440584633 Added tasks to campaign editor; fixed/added campaign editor level click/double-click handling; improved campaign editor level Treema status view formatting. 2014-12-29 12:47:53 -08:00
Nick Winter
c54fd5ab4b Moved editors from PUT to POST so that version saving behavior is preserved and admins can PUT without saving new versions. 2014-12-29 09:14:43 -08:00
Nick Winter
744d30737e Merged in campaign editor and campaign view. Destroyed WorldMapView, CampaignOptions, and LevelOptions. Lots of stuff is now stored in the database instead of code. Cleaned up a few unneeded old features. Fixed some problems with checking permissions on first rather than latest versions of documents. 2014-12-28 13:25:20 -08:00
Scott Erickson
96c8e035cf Added a CampaignLevelView stub that appears when you double click a level node or one of its children on the treema. 2014-12-23 09:42:24 -05:00
Scott Erickson
0bdec68cfc Set up a save button. 2014-12-22 16:21:57 -05:00
Scott Erickson
0dd2d9efbd Handled merge conflict. 2014-12-22 12:33:52 -05:00
Scott Erickson
0d45e4a889 Set up the CampaignEditorView to trigger the CampaignView to re-render when things change. 2014-12-22 12:06:17 -05:00
Scott Erickson
1db8284236 When you select a level on the CampaignView while in edit mode, it selects the level in the CampaignEditView. 2014-12-22 11:09:58 -05:00
Scott Erickson
a31b385a4d Moving levels and adjacent campaign links around in the CampaignView saves the new position to the CampaignEditorView. 2014-12-22 10:54:07 -05:00
Scott Erickson
efc83b88d0 Hooked up the CampaignView to show adjacent campaigns based on the data. 2014-12-22 10:29:29 -05:00
Nick Winter
e153a7ecce Added some more world rand shortcut functions. Fixed a bug with toggling collision in level editor. Updated CommunityView contributor class i18n linking. 2014-12-21 21:38:12 -08:00
Nick Winter
e8d185a860 Embedding level completion checklist inside the level editor. 2014-12-20 20:01:07 -08:00
Nick Winter
f26b43f8a5 Fixed floor y scaling. Fixed issues with client-side disabling of new model / fork / revert population actions without permissions. Ameliorated some ensure_comprehensions warnings. 2014-12-20 16:02:41 -08:00
Nick Winter
8528f5039b Linking to FAQ from contact page. Now showing all Components in level editor, not just ones that are present in the level. 2014-12-20 14:40:28 -08:00
Nick Winter
e4c6d07a4a Added keyboard shortcuts to move, resize, minor-rotate, and toggle collision for Thangs in the level editor. Fixed some issues with stretchy Thangs and collision shapes not updating. Fixed #1699. Fixed #57. Colored collision overlays according to collision categories. 2014-12-20 13:39:51 -08:00
Scott Erickson
0cd85d7aba Got the CampaignView mostly off the hardcoded data. 2014-12-19 16:46:01 -05:00
Scott Erickson
59318b2f78 Merge branch 'master' into feature/campaign-editor 2014-12-19 12:54:11 -05:00
Scott Erickson
b63b4d64da More work on the CampaignEditorView. Data gets saved to models now. 2014-12-17 22:53:04 -08:00
Scott Erickson
1cc6a97e43 Added basic campaign view, working on campaign handlers. 2014-12-16 17:46:24 -08:00
Nick Winter
68678a6057 Add upcoming desert levels to the world map. 2014-12-13 19:43:12 -08:00
Nick Winter
d51db43823 Added desert campaign. 2014-12-10 10:00:52 -08:00
Scott Erickson
46f7bbaaf5 Fixed client tests. Also updated mock-ajax to the latest version, carrying over my own tweaks. 2014-12-09 13:41:44 -08:00
Nick Winter
a8ce1bbfb2 Added unsubscribe button and subscription status on payments screen. 2014-12-03 16:11:46 -08:00
Nick Winter
1f2408a99f Can actually edit requiresSubscription on levels. 2014-12-03 15:50:34 -08:00
Scott Erickson
be809337c4 Refactored to make TreemaUtils generally available but TreemaNode only available for views that need it. 2014-11-29 17:51:40 -08:00
Scott Erickson
3a4eaa718f Did what I needed to do to get d3 to not be loaded during play: refactored the ladder views out of the play wad, and got the Router to handle viewClass being a string rather than a fully loaded module. 2014-11-29 16:46:51 -08:00
Scott Erickson
129e07e231 Refactored a bunch of editor stuff to be included in the wads. Fixed a bug with the I18NEditModelView. 2014-11-29 13:36:48 -08:00
Nick Winter
891b78eb44 Hiding some ThangTypes from view in level editor. 2014-11-29 10:34:04 -08:00
Nick Winter
dbbcfe3789 Fixed a couple requires needed for level editor. 2014-11-29 06:50:50 -08:00
Scott Erickson
31214e854e Wabam. Refactored a bunch of stuff into 'core' folders so that it's clearer which files are being loaded first thing, and which are not. Also reworked a bunch of the anymatch things in config.coffee, cause there were better ways. 2014-11-28 17:49:41 -08:00
Scott Erickson
b698745e05 Set up the site to load its logic and templates piecemeal rather than in one giant app.js file. 2014-11-28 16:38:56 -08:00
Nathan Rosquist
da4116ee2e Add tree_stand thangs to Generate Terrain modal in level editor. Use as border for grassy terrain. 2014-11-26 12:18:57 -08:00
Nick Winter
55eaed0cd2 Updated AI/Vision pathfinding/line-of-sight default terrain updates. 2014-11-26 10:51:30 -08:00
Nick Winter
904d605e42 Getting ready to add new levels. 2014-11-21 20:36:56 -08:00
Scott Erickson
025780a575 Added loadingTip property to levels, set them up on the LevelLoadingView, and got them prepped for i18n-ing. 2014-11-12 15:00:24 -08:00
Scott Erickson
913dda65aa Created the VectorIconSetupModal, a quick way to get portraits aligned to a container. 2014-11-12 14:14:07 -08:00
Nick Winter
ea349cfa29 Intermediate query state for heroes while still transitioning from Unit to Hero. 2014-10-29 15:54:51 -07:00
Nick Winter
98fe639010 Added heroClass and gem fields to the ThangTypes, and a new Hero kind. Fixed adding new ThangType properties in the Thang Editor. 2014-10-29 15:34:04 -07:00
Scott Erickson
dcb7aaf9a4 Removed a TODO. 2014-10-28 14:23:39 -07:00
Scott Erickson
e6c0d53d50 ThangType editor now deletes properties properly. 2014-10-28 14:22:29 -07:00
Scott Erickson
67684b89d5 Fixed #1687, forcing reloads when populating i18n in documents. 2014-10-28 14:21:22 -07:00
Scott Erickson
895645ef6d Levels and Components with i18nCoverage update that coverage from the level editor now. 2014-10-28 13:48:17 -07:00
Scott Erickson
9e6fd119a0 Achievements populate i18n whenever they're edited now. 2014-10-28 13:09:07 -07:00
Scott Erickson
cea04d27ad Built diplomat-specific views for editing levels, components, achievements and thang types. 2014-10-27 17:16:22 -07:00
Nick Winter
4c33b98e27 Fixed building Thangs with new Components that no other Thang uses. Fixed THangs with id 0 in the level editor. 2014-10-23 18:11:12 -07:00
Scott Erickson
1f7d098b2e Added rotation buttons in the context menu and shortcuts to the level editor. 2014-10-22 07:53:49 -07:00
Scott Erickson
7f4ac3e5d6 Fixed point and region choosers in the level editor. 2014-10-21 10:59:05 -07:00
Nick Winter
bc15ccd240 Fixed panel vs. total counts on other achievements. 2014-10-20 16:13:56 -07:00
Nick Winter
1fb48f2b85 Fixed a few bugs. Removed Olark; disabled LinkedIn. Added ladder submission to HeroVictoryModal. 2014-10-19 17:38:10 -07:00
Nick Winter
440e1700b1 Using aiSource now for enemy AIs in multiplayer, separate from sample code source. 2014-10-19 12:44:58 -07:00
Nick Winter
56a80e3615 Started getting hero-ladder level type working. 2014-10-18 14:51:49 -07:00
Nick Winter
ff467d1f31 Don't play a selection sound when adding a Thang. 2014-10-07 12:04:55 -07:00
Nick Winter
5261a7d4d9 Snap to integer meters in the level editor when holding shift. 2014-10-07 10:41:16 -07:00
Scott Erickson
f00fd66bed Fixed displaying raster image thangs in the thang editor. 2014-10-06 16:22:21 -07:00
Scott Erickson
3da0ea9d72 Fixed labels and marks not properly updating in the level editor. 2014-10-03 12:00:08 -07:00
Scott Erickson
e504932e5e Added yet another fine tuning of camera movement in the level editor. 2014-10-03 11:54:06 -07:00
Scott Erickson
cc04626a5a Fixed walls not updating when you edit them in the ThangsTabView. 2014-10-03 11:21:05 -07:00
Scott Erickson
3305a3d7db Added a way to set titles for RootViews. In development, titles show what RootView class you're looking at. 2014-10-03 10:45:01 -07:00
Scott Erickson
d65ade7a97 Couple teardown fixes. 2014-10-03 10:44:02 -07:00
Scott Erickson
ca84721921 Added a play button to the thang type edit view, made the canvas taller, and now have selected nodes show bounds for the display object being displayed. 2014-10-02 16:54:58 -07:00
Scott Erickson
e1e8945f9e Made sure all dots are invisible by default. 2014-10-02 10:50:05 -07:00
Scott Erickson
b1f4dc996d Fixed a handful of bugs with the thang editor and sprite animation. 2014-10-02 10:42:21 -07:00
Scott Erickson
1b1bc4e95a Fixed adding thangs in the level editor, and moving them around. 2014-10-01 15:02:14 -07:00
Scott Erickson
e9222f34bd Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-01 13:26:45 -07:00
Scott Erickson
3205821ee9 Got the level editor mostly working again. 2014-10-01 13:26:38 -07:00
Nick Winter
8d37309de1 Several fixes for achievement recalculation. 2014-09-30 19:32:11 -07:00
Scott Erickson
b3ae258bed Fixed some issues with the thang editor. 2014-09-30 13:34:44 -07:00
Scott Erickson
f081d9ed4b Refactored CocoSprite -> Lank, lank.imageObject -> lank.sprite, SpriteBoss -> LankBoss, spriteLayers -> layerAdapters, sprite -> lank in general. Also got the ThangTypeEditView working again. 2014-09-28 14:00:48 -07:00
Nick Winter
98fed4a277 Extended Achievements to support earning heroes, items, levels, and gems. Fixed a few Achievement bugs. 2014-09-26 02:29:04 -07:00
Nick Winter
f4cee11ebe ThangsTabView letting you position spike walls on top of walls. 2014-09-24 12:02:45 -07:00
Nick Winter
019f634d9f Respecting coordinates setting. 2014-09-23 18:39:52 -07:00
Nick Winter
de85d8c170 Split cast button into Run and Submit. Slighted adjusted victory modal for new hero levels. Real-time playbck is now required to beat hero levels. Worked around an error in the delta expansion. 2014-09-22 14:05:13 -07:00
Nick Winter
8042f27ba7 Added the rest of the custom TreemaNodes to the SystemsTabView as well. 2014-09-18 15:26:06 -07:00
Nick Winter
d96d0d65f3 Thang config edits are saved while the edit view is up. Dead Thangs don't display their names. Enter now finalizes Thang name/type edits. 2014-09-16 21:43:03 -07:00
Nick Winter
1f71a1eaf9 Fixes for loading level previews early, creating new Components, and showing names of ShowsNames Thangs. 2014-09-16 20:19:52 -07:00
Nick Winter
54f56162e9 Place Electrowalls over other walls. 2014-09-16 10:30:27 -07:00
Nick Winter
89aa930803 Fixed WorldSelectModal scale; added an easy way to restrict flexible regions to a fixed ratio. 2014-09-15 15:38:07 -07:00
Nick Winter
9acb3670c1 Fixed error when deleting in level editor with nothing selected. 2014-09-15 15:24:11 -07:00
Nick Winter
6176a8f6cb Wall dragging no longer conflicts with wall clicking. 2014-09-15 15:23:09 -07:00
Nick Winter
8acaea3d6a Drag walls to place them continuously. 2014-09-15 14:54:21 -07:00
Nick Winter
6ac56030e8 Fixed bug with systems not being addable. 2014-09-15 12:45:10 -07:00
Nick Winter
d3245948e2 Sorting addable Thangs in a sensible order. 2014-09-11 13:34:15 -07:00
Nick Winter
d5542ffbbc Fixed issues with sprite dragging, and made camera drag panning respect whether sidebars are open. 2014-09-11 11:24:06 -07:00
Nick Winter
dd2cdf3ef9 Fixed bugs with forking ThangTypes. 2014-09-08 16:03:29 -07:00
Scott Erickson
6c12384fe9 Reenabling on surface mouse moved. 2014-09-08 14:13:19 -07:00
Nick Winter
6ed89a2d79 Temporarily worked around issue with doubled sprite dragging logic in ThangsTabView. 2014-09-08 12:29:49 -07:00
Scott Erickson
fca9a92167 Flattened the queries the NewAchievementModal creates. 2014-09-04 11:17:07 -07:00
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