Collaborative work with ORK

omeegaa

In our project we are 3 ORK users on the project and we sometime push on git/fork right after each other I need some advice to handle this the best possible.
I have a lot of conflict with the dataeditor and projecteditor asset.It sqeems that without theses file the data don't know where to go.
What they do exactly and wich one can be skip in a git push without corrupting the data?
I again had the case this morning of some corrupted data because the user pulled the data and didn't open ork and save(like we update the ork version) before starting to work.
Any guidance regarding this?

gamingislove

Change the Data Format in Game > Game Settings to XML String for it to work better with git and other collab platforms.
Generally, each entry in the list sections (e.g. items, combatants, etc.) are individual assets, so try not to work on the same one if you run into conflicts.

Also, the EditorData asset can be completely ignored and doesn't hold any project data, just editor data (e.g. last opened section, foldout states/colors, etc.).

omeegaa

Ok thanks, I will try this.
There is something I don't understand in that case.It seems that mostly everything goes fine when people pushes their data changes with dataeditor.asset and project.asset when they got one but if worker1 forgot to send it and worker 2 push data at the same place(for example both worked on items but not the same day nor at the same time) with theses files issues with data occur like mentionned above.
So regarding to the dataeditor.asset I get but what about the project.asset? Do this file memorize something and what data?Is it mandatory to keep consistency?
Im at a point where I wonder if unity version we use is causing theses issues(sometime happen when we merge branches randomly) or if this human related(wrong input or method)^^
We are using unity 6.1.18f with ORK 3.19.

omeegaa

Still regarding to handle theses data, that mean aswell that someone that worked on lets say equipment must push his changes and for another person that want to work on it must pull and save(otherwise in lot of case just pulling doesn't update ORK data right away) before modifying any data in the same subpart?
I think its yes since that feels like commonsense to me but I rather asking^^

omeegaa

And last one : that mean that worker1 can work on items, worker2 on the equipments and worker3 on the combatant at the same time withtout causing issue or is it more safe to say one people per main tab(combattants,game,ui,schematic etc)?

gamingislove

The Project asset is the most important one - it has all non-list settings as well as references to certain list assets that have to be directly referenced for the project to allow loading from save games (e.g. combatants or items). Also, your game starter references this asset to initialize ORK.

If you pull an update, close the editor, pull and open it again. If you pull while the editor is open, the new data will not be reflected usually.

All workes can work in the same section or even sub-section, just working on the same thing is probably not a good idea :)

omeegaa

Ok in that case what about if 2 workers push datas the same day(but different sub section) + their own project asset? For example for 2 workers starting from the same pull and after starting from the same version of the data base, worker1 push data on combatant(new combatants) with reference of it elsewhere like in a brand new schematic and then worker2 push datas on equipment (new entries)aswell referenced in another schematic or in a combatant start equipment for example.
In that case I believe the project asset will conflict when worker2 will try to push and merge.
If worker 2 choose its project file over the one of worker1, will this break all references of the work of the worker1?
If yes is there any method to avoid this in this specific scenario where there are multiple project asset in the pushes?

gamingislove

I've got no idea - this is basically up to the version control's voodoo and how it'll handle all this stuff. Beside the settings data either being stored as byte arrays (not really VC friendly) or XML strings, the assets are referenced as lists of Unity assets.

As somewhat of a safeguard, the editor will add data assets that are stored in the data folder to their respective lists if they're not part of it. So even if an asset wasn't directly referenced by the project due to some merger issue, it should be referenced again when opening the editor (and saving). Also, the individual use of those data assets somewhere else (e.g. a combatant selected in a schematic or an item added to a combatant's start inventory) via the dropdown selections still reference the actual asset, so it doesn't matter if it's referenced in the project asset for this to still be there. It'd only become an issue when loading a save game and some data asset isn't referenced (e.g. an item missing from the project references and the player inventory containing this item).