12 commits

Author	SHA1	Message	Date
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	254c6ff7ba	Fixed #1106 a bunch. Patches show up correctly, don't include skipped paths when patching, and skipped paths are now used in the patch modal too.	2014-05-30 13:40:38 -07:00
Scott Erickson	684e61532a	Fixed a bug with the deltas library identifying conflicts between patches.	2014-05-05 16:35:26 -07:00
Scott Erickson	c85971e5e6	Added i18n population action to the level editor.	2014-04-22 17:56:41 -07:00
dpen2000	75b759b1dc	Add system names into delta messages	2014-04-18 17:25:25 -04:00
Scott Erickson	dd36cdd092	Fixed #836	2014-04-14 11:14:09 -07:00
Scott Erickson	34bf484bf2	Added data merge conflict handling.	2014-04-11 21:11:52 -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
Scott Erickson	f2d21b960f	Added a delta subview for displaying deltas of schema'd data.	2014-04-09 16:09:35 -07:00