Merge branch 'Ancient-Egypt' of https://github.com/kmcurry/3Scape into Ancient-Egypt
Merge branch 'Ancient-Egypt' of https://github.com/kmcurry/3Scape into Ancient-Egypt
Merge branch 'mean' of github.com:Hyiero/3Scape into mean
Fixed New Scene and balloontiplabels. Both should be working properly.
Merge branch 'mean' of github.com:Hyiero/3Scape into mean
Save and load is implemented. You can save a scene by making one and pressing the = key. This will save a scene called 'Scene.xmp' to your downloads folder. From there you can reload 3Scape to get an empty scene. Go and click on the labels section. At the bottom is the load a file button. Load that 'Scene.xmp' and you will have the scene you previously created loaded
Updated so the load a scene button is easier to find
UI has been cleaned up and now you may find load under new scene
Made it so that the file dialog only looks to load .xmp files for the 'special' user
Fixed an issue that made it impossible to add models to a scene that had been serialized. Also when a serialized scene had been loaded and re-serialized it made 2 scenes appear. This issue has been resolved as well
Updated bridgeworks with the latest and greatest
Merge pull request #231 from Hyiero/SaveandLoad

Updated bridgeworks with the latest and greatest
Fixed scale rotation
Merge pull request #232 from Hyiero/SaveandLoad

Fixed scale rotation
Fixed issue with multiple objects being serialized
Fixed 2nd issue with serialization of multiple objects
Merge pull request #233 from kmcurry/SaveandLoad

Saveand load