Matt Lott
|
fcf5346aa3
|
Add completion rates to levels in campaign editor
|
2014-12-31 11:49:29 -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 |
|
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
|
efc83b88d0
|
Hooked up the CampaignView to show adjacent campaigns based on the data.
|
2014-12-22 10:29:29 -05: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 |
|
Scott Erickson
|
59318b2f78
|
Merge branch 'master' into feature/campaign-editor
|
2014-12-19 12:54:11 -05:00 |
|
Scott Erickson
|
1cc6a97e43
|
Added basic campaign view, working on campaign handlers.
|
2014-12-16 17:46:24 -08:00 |
|
Imperadeiro98
|
9c911ce149
|
Update thang-type-edit-view.jade
|
2014-12-12 22:32:19 +00:00 |
|
Imperadeiro98
|
e609ea7c5c
|
Update edit.jade
|
2014-12-12 22:25:17 +00:00 |
|
Imperadeiro98
|
3ab5ee22c9
|
Update versions-modal.jade
|
2014-12-12 22:15:10 +00:00 |
|
Imperadeiro98
|
72485eb5a9
|
Update patches.jade
Couldn't figure out how to handle "Pending", "Accepted", etc.
|
2014-12-12 22:04:21 +00:00 |
|
Imperadeiro98
|
237b022147
|
Update edit.jade
|
2014-12-12 21:43:20 +00:00 |
|
Nick Winter
|
c226856204
|
Fixed typo in previous rewadding.
|
2014-11-29 14:42:46 -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 |
|
Scott Erickson
|
1c33842125
|
Refactored core templates into a core folder.
|
2014-11-29 11:39:37 -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
|
913dda65aa
|
Created the VectorIconSetupModal, a quick way to get portraits aligned to a container.
|
2014-11-12 14:14:07 -08: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 |
|
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
|
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
|
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 |
|
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 |
|
Imperadeiro98
|
c6f6282ae1
|
Update edit.jade
Fixed some errors
|
2014-09-06 17:32:01 +01:00 |
|
Scott Erickson
|
7fb89a9e7e
|
Making the thangs column in the level editor hidden by default again.
|
2014-09-03 17:27:19 -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
|
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 |
|
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
|
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 |
|
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
|
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 |
|
Nick Winter
|
e5cf6c340b
|
Fixed #1140. I just put it on the home page for now, but later we can put it somewhere where it makes sense.
|
2014-08-29 23:09:38 -07:00 |
|
Nick Winter
|
63f2c5db4f
|
Fixed #1268.
|
2014-08-29 17:33:25 -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 |
|
Scott Erickson
|
2dde77f8b0
|
Merge branch 'master' into feature/defaults
|
2014-08-28 15:26:04 -07:00 |
|
Nick Winter
|
54207f0f7d
|
Fixed #1000.
|
2014-08-28 10:50:20 -07:00 |
|
Scott Erickson
|
8b943d1c2c
|
Merged conflicts.
|
2014-08-28 09:59:03 -07:00 |
|
Nick Winter
|
2ef7bff2c5
|
Fixed #886.
|
2014-08-27 17:54:16 -07:00 |
|
Scott Erickson
|
5d804c6d9a
|
Fixed merge conflict.
|
2014-08-26 15:41:59 -07:00 |
|
Nick Winter
|
50ad453345
|
Fixed #169.
|
2014-08-26 14:34:23 -07:00 |
|
Scott Erickson
|
1406a970ea
|
Bunch of fixes to get the level editor working again.
|
2014-08-25 20:34:46 -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 |
|
Nick Winter
|
bdb3e14189
|
Added missing ForkModal.
|
2014-08-13 14:26:56 -07:00 |
|
Scott Erickson
|
31e3e7f98e
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-08-13 14:06:03 -07:00 |
|
Nick Winter
|
b7d5428d5f
|
Made Forking more abstract to apply to ThangTypes, too.
|
2014-08-13 11:36:00 -07:00 |
|
Scott Erickson
|
e3088ad813
|
Merge branch 'achievements' of https://github.com/rubenvereecken/codecombat into rubenvereecken-achievements
|
2014-08-13 10:49:10 -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 |
|
Nick Winter
|
2ab83328f3
|
Added item editor level preview window.
|
2014-08-12 12:50:41 -07:00 |
|
Ruben Vereecken
|
d6f5b7512d
|
i18n for all new pages
|
2014-08-12 14:05:01 +02:00 |
|
Ruben Vereecken
|
857d3ca02c
|
Added some simple animations to achievement popups
|
2014-08-12 12:04:08 +02:00 |
|
Scott Erickson
|
b3572dfad9
|
Fixed some bugs with the ThangComponentsEditView, added AddThangComponentsModal.
|
2014-08-11 15:41:08 -07:00 |
|
Ruben Vereecken
|
672b0f54f6
|
Worked away our NotifyJS dependency - horrible lib
|
2014-08-11 14:11:26 +02: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 |
|
Nick Winter
|
4d4e321265
|
Fixed #1062. Added Item kind to level editor Thang filters.
|
2014-08-06 08:24:50 -07:00 |
|
Ruben Vereecken
|
d42922871e
|
Added related achievements tab to level editor
|
2014-08-05 15:15:53 +02:00 |
|
Ruben Vereecken
|
7d7d5300c0
|
Refactored New Model Modal (from SearchView originally)
|
2014-08-05 14:33:33 +02:00 |
|
Ruben Vereecken
|
3266e3b46b
|
intermediate
|
2014-08-04 22:21:43 +02:00 |
|
Ruben Vereecken
|
30a6cf1cca
|
Merged in name changes from master
|
2014-07-29 17:28:13 +02:00 |
|
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 |
|
Jayant Jain
|
df554360fe
|
Updates glyphicons for undo-redo, adds placeholder text for add thangs search
|
2014-07-26 01:55:15 +05:30 |
|
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
|
dc66218c00
|
Adds undo and redo buttons in editor topbar
|
2014-07-25 18:06:34 +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
|
80da704d19
|
Background image paths automated, adds preset image files
|
2014-07-25 17:54:10 +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
|
86cf344f28
|
Adds preset images to preview the generated terrain
|
2014-07-25 17:50:02 +05:30 |
|
Darredevil
|
f78c48c893
|
Docs tab v2
|
2014-07-25 01:26:34 +03:00 |
|
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 |
|
Ruben Vereecken
|
0288786098
|
Merge branch 'master' into achievements
|
2014-07-15 16:16:46 +02:00 |
|
Scott Erickson
|
b113e126a3
|
Fixes #1316 and #1318
|
2014-07-14 17:18:48 -07:00 |
|
Ruben Vereecken
|
a60451368e
|
Merged in master
|
2014-07-14 18:58:25 +02: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
|
493ebd07e6
|
Changes randomise to randomize
|
2014-07-14 06:01:09 +05:30 |
|
Jayant Jain
|
1e5edb5efd
|
Moves randomise modal template and view to editor/level/modal
|
2014-07-14 01:34:32 +05:30 |
|
Ruben Vereecken
|
9c0353a2f0
|
Merged in master
|
2014-07-13 21:18:32 +02:00 |
|
Nick Winter
|
868a6ed43b
|
Fixed a couple i18n issues. Fixed #1302.
|
2014-07-13 09:31:56 -07:00 |
|
Jayant Jain
|
813ecaa59c
|
Adds randomise option to dropdown on editor page
|
2014-07-11 00:01:18 +05:30 |
|
Scott Erickson
|
d74a778f67
|
Made creating components open to everyone!
|
2014-07-09 12:21:32 -07:00 |
|
Scott Erickson
|
2a309c149c
|
Enabled submitting patches for thangs and articles.
|
2014-07-07 15:19:22 -07:00 |
|
Scott Erickson
|
94a6e3961b
|
Added a button in the level editor to choose which team to play when editing a ladder level.
|
2014-07-05 13:54:41 -07:00 |
|
Ruben Vereecken
|
39fb2cb1b4
|
Added achievement preview, exp test, stuff
|
2014-07-04 19:27:37 +02:00 |
|
Scott Erickson
|
9b873cfab4
|
Patch modal handles invalid patches.
|
2014-06-24 17:25:01 -04:00 |
|
Ruben Vereecken
|
2a5c2020ca
|
Added recalculation button to the achievement editor
|
2014-06-12 19:41:07 +02:00 |
|
Ruben Vereecken
|
ed44ab5f7d
|
Improved logging (winston) and admin-only'd the achievement editor
|
2014-06-02 21:07:23 +02:00 |
|
Ruben Vereecken
|
1b2a251c58
|
Achievement editor in place and looking mighty fine
|
2014-06-02 20:31:09 +02:00 |
|
Ruben Vereecken
|
c2d2f2a2b8
|
Refactorings performed necessary to have searchable for more uses
|
2014-06-02 20:31:09 +02:00 |
|
Scott Erickson
|
29011fab2a
|
Reworked validation error handling a little, putting better debugging logs in and making level save modal show when there are some.
|
2014-05-30 17:26:49 -07:00 |
|
Jayant Jain
|
241adafad8
|
Adds nanoscroll for other tabs in editor
|
2014-05-24 12:02:26 +05:30 |
|
Jayant Jain
|
f17c5cfb51
|
Adds nanoscroll to thang tab in level editor
|
2014-05-24 12:02:26 +05:30 |
|
Scott Erickson
|
f1de2ca8d9
|
Brought the canvas size down again because it halves the FPS in Firefox at least.
|
2014-05-09 16:35:10 -07:00 |
|
Scott Erickson
|
e9fc3df7c1
|
Set up the versions modal to display changes between versions when you select two of them.
|
2014-05-08 10:54:39 -07:00 |
|
Scott Erickson
|
ed222338e7
|
Fixed #892 by having the components tab reload whenever it's opened.
|
2014-05-07 16:24:13 -07:00 |
|
dpen2000
|
69b3fe4b8c
|
Hide Create New System/Create New Component links in menus from non-admins
|
2014-04-24 19:24:08 -04: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 |
|
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 |
|
tmrdja
|
826a5f56db
|
Added responsive view for LevelEditor
|
2014-04-21 21:15:22 +02: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
|
b5406b0149
|
Set up the rest of the component/system buttons and nav bars.
|
2014-04-17 13:24:17 -07:00 |
|
Scott Erickson
|
9eff958dcb
|
Fixed the level and component watch buttons.
|
2014-04-17 11:35:09 -07:00 |
|
Scott Erickson
|
8f4535853b
|
Fixed the component history button.
|
2014-04-17 11:29:12 -07:00 |
|
Scott Erickson
|
6057bd94b9
|
Refactored how the editor sets up its special nav through base.jade.
|
2014-04-17 11:27:20 -07:00 |
|
Scott Erickson
|
8859405e18
|
Reworked the nav bars in the level editor.
|
2014-04-17 11:02:00 -07: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 |
|
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
|
10b1660419
|
Fixed the level editor so you can save again.
|
2014-04-12 08:48:49 -07:00 |
|
Scott Erickson
|
53579b2632
|
Merge branch 'master' into feature/jsondiffpatch
Conflicts:
app/templates/editor/level/save.jade
app/templates/editor/thang/edit.jade
|
2014-04-11 22:52:05 -07:00 |
|
Scott Erickson
|
308adec7c7
|
Merge branch 'master' into feature/jsondiffpatch
Conflicts:
app/templates/editor/level/save.jade
app/templates/editor/thang/edit.jade
|
2014-04-11 22:52:00 -07:00 |
|
Scott Erickson
|
0eb74ab287
|
Added buttons for performing actions on patches.
|
2014-04-11 22:33:09 -07:00 |
|
Scott Erickson
|
34bf484bf2
|
Added data merge conflict handling.
|
2014-04-11 21:11:52 -07:00 |
|
Scott Erickson
|
bbb9fb7a64
|
Added a patches view.
|
2014-04-11 14:19:17 -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
|
5629284c76
|
Added text diff library to delta view.
|
2014-04-10 10:24:14 -07:00 |
|
Scott Erickson
|
66d455285e
|
Integrated the delta view into the save view for levels.
|
2014-04-09 19:07:44 -07:00 |
|
Scott Erickson
|
f2d21b960f
|
Added a delta subview for displaying deltas of schema'd data.
|
2014-04-09 16:09:35 -07:00 |
|
Alexei Nikitin
|
e87c0c4b91
|
Work on thang tab
|
2014-04-08 02:49:27 +04:00 |
|
Alexei Nikitin
|
5f062ad25c
|
Work on revert, save modal
|
2014-04-08 01:38:46 +04:00 |
|
Alexei Nikitin
|
d64690e8d9
|
Work on fork modal
|
2014-04-08 00:29:40 +04:00 |
|
Nick Winter
|
785cb342a2
|
Merge branch 'master' of git://github.com/tmrdja/codecombat into tmrdja-master
|
2014-04-01 09:12:48 -07:00 |
|
tmrdja
|
470a79e6b0
|
Added contextmenu
|
2014-03-30 19:33:21 +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 |
|
Ting-Kuan
|
6012a3ce9e
|
Show error message when editor fails to initiate.
|
2014-03-27 14:35:20 -04: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
|
baf8adcc74
|
added nothing
|
2014-03-22 20:50:50 +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
|
a6523719e4
|
Merge branch 'master' of https://github.com/codecombat/codecombat into editor_tweaks
Conflicts:
app/locale/ru.coffee
|
2014-03-20 09:07:11 +04:00 |
|
Nick Winter
|
b7e8f2ecb5
|
Merge pull request #605 from kvasnyk/master
Fix for #272 bug.
|
2014-03-19 18:31:20 -07:00 |
|
Mikhail Koltsov
|
c9a08a0b25
|
thang editor: added i18n binding to 'Save' button
|
2014-03-19 01:43:27 +04: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
|
36a90de7f9
|
Last bits of #546.
|
2014-03-17 04:44:00 -07: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 |
|