339 commits

Author	SHA1	Message	Date
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
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	97964f7853	More work on renaming. Cleaned out sprite_parser_test_view, and fixed the TeachersView.	2014-07-18 17:06:20 -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	3325332626	Fixes #1328.	2014-07-15 11:23:55 -07:00
Scott Erickson	fb83028d87	Added watchers to list of properties to skip in deltas/patches.	2014-07-15 11:23:35 -07:00
Scott Erickson	d8d40ab0f6	Fixes #1116	2014-07-14 17:46:12 -07:00
Scott Erickson	888ee6c0bb	Fixed deltas in the version history modal.	2014-07-14 16:37:10 -07:00
Nick Winter	f2f3817e10	Fixed Thang Editor scaling.	2014-07-14 14:10:46 -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
Jayant Jain	1e5edb5efd	Moves randomise modal template and view to editor/level/modal	2014-07-14 01:34:32 +05:30
Jayant Jain	a76a79bb9d	Fixes bug with placing addThang after randomise	2014-07-11 01:07:24 +05:30
Jayant Jain	dbe464df16	Removes console logs	2014-07-11 00:01:19 +05:30
Jayant Jain	38bed0ee93	Random thangs are now created and positioned in the thangs view	2014-07-11 00:01:19 +05:30
Jayant Jain	74205b31d2	Adds code for passing randomised thangs to thang view	2014-07-11 00:01:18 +05:30
Jayant Jain	efa2bee08c	Adds shortcuts for undo/redo for thangs tab view	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
Scott Erickson	b635c4cf16	Fixes #1220. Passing in the raw attributes to the component settings treema would edit the data before the component's set method would get a snapshot of the original data for whatever was the first change in the data.	2014-07-04 20:45:42 -07:00
Scott Erickson	eed521fb8c	Merged conflicts.	2014-07-04 17:54:30 -07:00
Scott Erickson	85a6b648a5	Merged conflicts.	2014-07-04 17:54:24 -07:00
Scott Erickson	ca8394621d	Fixes #1223	2014-07-04 11:46:33 -07:00
Ruben Vereecken	08030dc785	Cleaned up patch rendering logic	2014-07-04 20:18:26 +02:00
Ruben Vereecken	6e4170012f	Made sure applyDelta is called in all cases	2014-07-04 18:38:15 +02:00
Tery Lim	9090ce7714	Merge master into branch	2014-07-04 22:37:16 +08:00
Scott Erickson	2855d2a402	Made the deltas lib conflict identifying library able to handle many-to-many conflicts. ... Made conflict finding a bit more liberal, in that any messing with arrays (adding, removing or moving things inside) will conflict with any other such change.	2014-07-03 17:41:58 -07:00
Tery Lim	618ade4946	Clean up mixed quotes	2014-07-01 12:23:22 +08:00
Scott Erickson	9b873cfab4	Patch modal handles invalid patches.	2014-06-24 17:25:01 -04:00
Nick Winter	3862bd2376	Clearing backups of old models when saving new versions of versioned models.	2014-06-24 09:43:20 -07:00
Nick Winter	81f8334f37	Some fixes for CocoSprite alphas.	2014-06-21 22:31:10 -07:00
Nick Winter	59654da24b	Starting more work on integrating additional languages. Improved Component code editing performance with a trusty debounce.	2014-06-17 22:17:44 -07:00
Nick Winter	1502cdc64b	Merge branch 'jayant1992-master'	2014-06-13 08:17:12 -07:00
Scott Erickson	8ab69cf833	Merge pull request #1138 from rubenvereecken/search-endpoint ... Search endpoint is now without the /search prefix	2014-06-12 11:33:28 -07:00