Scott Erickson
c85971e5e6
Added i18n population action to the level editor.
2014-04-22 17:56:41 -07:00
Scott Erickson
bb0cbf1151
Removed some old code that didn't work out.
2014-04-22 10:43:08 -07:00
dpen2000
de69f740e4
Fix deltas referring to last system saved
...
If a system is added, it is added to treema at the end of the list of systems. Treema then raises it's changed event resulting in this order being set on the level. The next time a system is added, the first system is in it's correct position and so the delta shows it as moving. This changes ensures we save the correct order in the first instance.
2014-04-19 19:59:21 -04: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
Scott Erickson
21e8d7b26f
Fixed patches denormalization.
2014-04-17 15:44:19 -07: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
07afba01df
Merge branch 'master' into feature/jsondiffpatch
...
Conflicts:
app/views/editor/level/thangs_tab_view.coffee
2014-04-17 13:25:42 -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
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
Scott Erickson
9eff958dcb
Fixed the level and component watch buttons.
2014-04-17 11:35:09 -07:00
dpen2000
7bc9bb5328
Fix javascript error occuring when e is null/undefined
2014-04-17 14:32:35 -04:00
Scott Erickson
8f4535853b
Fixed the component history button.
2014-04-17 11:29:12 -07:00
Scott Erickson
8859405e18
Reworked the nav bars in the level editor.
2014-04-17 11:02:00 -07:00
Nick Winter
eec1888b22
gzipping when in production but not going through Cloudflare.
2014-04-17 10:12:23 -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
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
Nick Winter
a9725f2dc6
A bit of error handling.
2014-04-13 14:48:36 -07: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
Nick Winter
91c2f0fa33
Fixed #715 , and some misc cleanup.
2014-04-11 17:36:15 -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
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
