FlaShG / GitMerge-for-Unity

Unity plugin for merging sceneand prefabs files when using git.
GNU General Public License v2.0
197 stars 26 forks source link

Add MergeAction for GameObject properties, like GameObject.name #10

Open FlaShG opened 9 years ago

FlaShG commented 9 years ago

Also:

FlaShG commented 9 years ago

The GameObject itself is now analyzed as a SerializedObject as of 5e86456. This leads to pretty ugly serialization (layer is an int, tag is an unconstrained string, etc.). Static, Navmeshlayer and Prefab connection have not been tested yet.