search

BoundingBoxSoftware / Materialize

Materialize is a program for converting images to materials for use in video games and whatnot
GNU General Public License v3.0
1.49k stars 203 forks source link

Binary .asset files are git-unfriendly #2

Open Houkime opened 6 years ago

Houkime commented 6 years ago

Is there an option in Unity to not store things in .asset format and use text and image formats instead? (Image files are not more friendly then .asset but at least they have more reusability)

The thing with binaries is that git merges cannot work with them and thus any change of the same file by 2 branches will inevitably result in conflict.

Files affected now:

./Materialize/ProjectSettings/QualitySettings.asset
./Materialize/ProjectSettings/DynamicsManager.asset
./Materialize/ProjectSettings/TimeManager.asset
./Materialize/ProjectSettings/ProjectSettings.asset
./Materialize/ProjectSettings/NavMeshAreas.asset
./Materialize/ProjectSettings/InputManager.asset
./Materialize/ProjectSettings/EditorSettings.asset
./Materialize/ProjectSettings/TagManager.asset
./Materialize/ProjectSettings/GraphicsSettings.asset
./Materialize/ProjectSettings/AudioManager.asset
./Materialize/ProjectSettings/Physics2DSettings.asset
./Materialize/ProjectSettings/NetworkManager.asset
./Materialize/ProjectSettings/NavMeshLayers.asset
./Materialize/ProjectSettings/EditorBuildSettings.asset
./Materialize/ProjectSettings/UnityConnectSettings.asset
./Materialize/ProjectSettings/ClusterInputManager.asset
./Materialize/Assets/MainScene/LightingData.asset
nukeandbeans commented 6 years ago

Simply changing the editor project settings to save assets as text should be satisfactory in fixing this issue.