8 commits

Author	SHA1	Message	Date
Nick Winter	589410ed8e	Merged master into feature/thangload.	2014-05-09 12:56:58 -07:00
Scott Erickson	3d51969757	Fixed the patch view loading.	2014-05-08 14:54:47 -07:00
Scott Erickson	8f9aea1b9b	Fixed the patches view.	2014-05-05 15:19:35 -07:00
Nick Winter	d54149d0f3	Reworked LevelView loading priorities to try to get world simulating earlier.	2014-05-02 12:32:41 -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	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