Fix annoying false or useless changes in github desktop (#1265)

* Adding git attribute for correct line endings

* commit all normalized line endings

* commit engi borg

* move stuff to Editor file so it stops complaining

* commit link file

* don't ignore builds, but ignore builds/game

* readd bat script starting

* readd config files and don't ignore them

* build the game here rename

* ignore more stuff

* commit all

* commit again

* readd fishnet json

* remove things out of Editor and use conditionnal compilation

* added defaultprefabobject.meta

* Push

* push

---------

Co-authored-by: CosmicCoincidence <cosmiccoincidence1991@gmail.com>

.gitattributes

@@ -0,0 +1,30 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.cs text
+*.prefab text
+*.meta text
+*.asset text
+*.unity text
+*.physicMaterial .text
+*.mat text
+*.mixer text
+*.anim text
+*.txt text
+
+# Declare files that will always have CRLF line endings on checkout.
+*.sln text eol=crlf
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary
+*.ogg binary
+*.mp3 binary
+*.blend binary
+*.fbx binary
+*.shader binary
+*.ttf binary
+*.otf binary
+*tss binary

.gitignore

@@ -2,11 +2,14 @@
 #
 # Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore
 #
-/[Ll]ibrary/
+/[Ll]ibrary/*
+!/Library/FishNet.Runtime.Editor.PrefabObjects.Generation.Settings.json
 /[Tt]emp/
 /[Oo]bj/
 /[Bb]uild/
-/[Bb]uilds/
+/[Bb]uilds/Game/*
+!/[Bb]uilds/Game/Config/
+!/[Bb]uilds/Game/BUILD_THE_GAME_HERE.txt
 /[Ll]ogs/
 /[Uu]ser[Ss]ettings/
 
@@ -69,7 +72,7 @@ sysinfo.txt
 crashlytics-build.properties
 
 # Packed Addressables
-/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
+/[aA]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
 
 # Unity3D generated Addressables
 /[Uu]nity[Ee]ngine.[Cc]ontent.[Aa]ddressables.[Bb]uild[Pp]ath/
@@ -89,4 +92,10 @@ crashlytics-build.properties
 # Autogenerated Maya files
 /.[Mm]aya[Ss]watches/
 /.[Vv]ray[Tt]humbs/
+
+#Some annoying generated files by the project
 Assets/Content/Data/DefaultPrefabObjects.asset
+Assets/Content/Addressables/Windows/addressables_content_state.bin
+Assets/Content/Addressables/Windows/addressables_content_state.bin.meta
+Assets/Content/Addressables/link.xml
+Assets/Content/Addressables/link.xml.meta

Assets/Content/WorldObjects/Entities/Silicon/EngineeringBorg/EngineeringBorg.prefab

@@ -1409,7 +1409,7 @@ MonoBehaviour:
   _initializeOrder: 0
   _defaultDespawnType: 0
   NetworkObserver: {fileID: 0}
-  <PrefabId>k__BackingField: 66
+  <PrefabId>k__BackingField: 73
   <SpawnableCollectionId>k__BackingField: 0
   _scenePathHash: 0
   <SceneId>k__BackingField: 0

Assets/Scripts/EditorTools/RuleSetManager.cs

@@ -1,4 +1,4 @@
-#if UNITY_EDITOR
+#if UNITY_EDITOR
 
 using EditorTools;
 using System.Collections;

Builds/Game/BUILD THE GAME HERE.txt → Builds/Game/BUILD_THE_GAME_HERE.txt

@@ -1 +1 @@
-You should build your game in the folder where this file is.
+You should build your game in the folder where this file is.

Builds/Game/Config/network.json

@@ -0,0 +1,8 @@
+{
+    "_preload": true,
+    "_type": 2,
+    "NetworkType": 2,
+    "Ckey": "editorUser",
+    "ServerAddress": "127.0.0.1",
+    "ServerPort": 1151
+}

Builds/README.txt

@@ -1,5 +1,3 @@
 SS3D: How the hell do I run this thing?
 
-You can find all important info at: https://ss3d.gitbook.io/programming/guides/running
-
-
+You can find all important info at: https://ss3d.gitbook.io/programming/guides/running