branchbefore/main/ZoneResourcescancel

101 Commits over 91 Days - 0.05cph!

9 Years Ago
-hopefully fixed vs
9 Years Ago
-merge with main again -resourceseditor won't create a view if not all view art is present.
9 Years Ago
-merge from main
9 Years Ago
-merged with main for resharper settings
9 Years Ago
Editor refactors
9 Years Ago
Missed a thing
9 Years Ago
Merge from main, again.
9 Years Ago
-little helper class for the editor -a very generic attempt at making an harvesting action. It's possibly not the right way, but at least that way people can point, laugh, and explain :D -readded biome to greebox -possibly hopefully fixed my VS going mad all the time.
9 Years Ago
-merged with main -fixed Resource view creation -created 3 new Pine views with the new system.
9 Years Ago
-cleanup of branch -added new test resource made with editor
9 Years Ago
-tweaking and prettification
9 Years Ago
-cleanup
9 Years Ago
-Resources have a nice editor window for views now, with views being selectable per ResourceStates.
9 Years Ago
-cleanup in LoadGameFromSubscene -added possibility to view, add and remove Incentives in the resource creator in editor.
9 Years Ago
-committing skeleton of Resource building tab before Unity eats it.
9 Years Ago
-merged with main -fixed greenbox map not working(stuck on loading screen) 'cause no biome was assigned to it
9 Years Ago
-minor fixes onto the view prefabs again
9 Years Ago
-tagged the controller as Tree, and Layered the whole thing to Trees rather than Buildings. Wondered about moving the resourceaffector onto the model, but maybe that's not the right thing to do.
9 Years Ago
-and promptly forgot to add them
9 Years Ago
-made more view prefabs for the tree different pine types, in the meantime
9 Years Ago
-added a temporary pine mesh on the pine model, so you can still place (and see) pines in editor. Gets destroyed at runtime. Temp solution I guess! -made a script to swap in all the old treeprefab for new Resource trees. (Could/should be extended for resources to know its treetype, and respect the old one I guess, after discussion)
9 Years Ago
-readding in the resources that were moved and not added in the last commit -_- -fixed spawning of the resourcePine being offset compared to its parent.
9 Years Ago
-First pass at resources understanding MVC, having their own settings asset, skins, etc.
9 Years Ago
-removed MediumShelter that was not yet defined and broke the building system.
9 Years Ago
-renamed BuildingAsset to BuildingSettings, to be in line with everything else
9 Years Ago
-merged with Main
9 Years Ago
-Added an IResourceView interface we could eventually use for plant-life having its view controlled by the resource -Merged in ptrefall's A Murder of Enums
9 Years Ago
-missing semicolon
9 Years Ago
-First pass at making SOs understand Resources.
9 Years Ago
-merged from SOv3 so we're not all working on the same branch
9 Years Ago
merged with main
9 Years Ago
simple name change for ZoneResources to ResourcesManager, in Before and GSD
9 Years Ago
ActivityManager now saves properly, with GameManager and the whole game.
9 Years Ago
ActivityManager saves and loads, tho it doesn't do so when saving/loading the whole game. But it is added as an Extension to GameManager, which was also adapted to save/load with it.
9 Years Ago
Fixed oddness with 0s becoming -1s when save/loading
9 Years Ago
Renamed ActivityLogger to ActivityManager, and some work on saving that.
9 Years Ago
I managed to do so, and it works!
9 Years Ago
some cleanup, and an attempt to save GroupActivity (not sure how to spawn me a group to test tho :D )
9 Years Ago
cleanup
9 Years Ago
Added ignore for a debug folder where I can stuff dirty test scripts, without Plastic harassing me with gusto.
9 Years Ago
added a custom editor for tester to save/load
9 Years Ago
got WorldActivity to save and load
9 Years Ago
Cleaning up a bit, or breaking shit...
9 Years Ago
Adding Activity variants to persistence, need second opinion
9 Years Ago
Finally, a single base Activity can be written to file, and then read again.
9 Years Ago
Got building all the dlls for persistence working.
9 Years Ago
Trying to get activities to be persistent
9 Years Ago
little cheats to start up faster.
9 Years Ago
updated prefabs, and adding files I forgot to add.
9 Years Ago
Harvesting 'works', and resources regenerate, and stuff that should be called, is generally called