diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..459caf48db --- /dev/null +++ b/.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 diff --git a/.gitignore b/.gitignore index d9e86d64d1..a8d4e27eb6 100644 --- a/.gitignore +++ b/.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 diff --git a/Assets/Content/Addressables/Windows/addressables_content_state.bin b/Assets/Content/Addressables/Windows/addressables_content_state.bin deleted file mode 100644 index e051b4d276..0000000000 Binary files a/Assets/Content/Addressables/Windows/addressables_content_state.bin and /dev/null differ diff --git a/Assets/Content/Addressables/Windows/addressables_content_state.bin.meta b/Assets/Content/Addressables/Windows/addressables_content_state.bin.meta deleted file mode 100644 index 5998fa8d81..0000000000 --- a/Assets/Content/Addressables/Windows/addressables_content_state.bin.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e96a2ccb0136e5747accabb624dd5c9c -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Content/WorldObjects/Entities/Silicon/EngineeringBorg/EngineeringBorg.prefab b/Assets/Content/WorldObjects/Entities/Silicon/EngineeringBorg/EngineeringBorg.prefab index 381bc333aa..c5a7c96d66 100644 --- a/Assets/Content/WorldObjects/Entities/Silicon/EngineeringBorg/EngineeringBorg.prefab +++ b/Assets/Content/WorldObjects/Entities/Silicon/EngineeringBorg/EngineeringBorg.prefab @@ -1409,7 +1409,7 @@ MonoBehaviour: _initializeOrder: 0 _defaultDespawnType: 0 NetworkObserver: {fileID: 0} - k__BackingField: 66 + k__BackingField: 73 k__BackingField: 0 _scenePathHash: 0 k__BackingField: 0 diff --git a/Assets/Scripts/EditorTools/RuleSetManager.cs b/Assets/Scripts/EditorTools/RuleSetManager.cs index e0fbf6007d..711d579933 100644 --- a/Assets/Scripts/EditorTools/RuleSetManager.cs +++ b/Assets/Scripts/EditorTools/RuleSetManager.cs @@ -1,4 +1,4 @@ -#if UNITY_EDITOR +#if UNITY_EDITOR using EditorTools; using System.Collections; diff --git a/Assets/Scripts/External/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.sln.meta b/Assets/Scripts/External/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.sln.meta deleted file mode 100644 index aa8a077601..0000000000 --- a/Assets/Scripts/External/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.sln.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 246f31a0e00fea74a93125fec6d80da8 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/External/FishNet/Runtime/Transporting/Transports/Tugboat/LiteNetLib/LiteNetLib.csproj.meta b/Assets/Scripts/External/FishNet/Runtime/Transporting/Transports/Tugboat/LiteNetLib/LiteNetLib.csproj.meta deleted file mode 100644 index f9c48e96e4..0000000000 --- a/Assets/Scripts/External/FishNet/Runtime/Transporting/Transports/Tugboat/LiteNetLib/LiteNetLib.csproj.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 2ad85b0f43f25f1499c27a4dca23ddd8 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Builds/Game/BUILD THE GAME HERE.txt b/Builds/Game/BUILD_THE_GAME_HERE.txt similarity index 98% rename from Builds/Game/BUILD THE GAME HERE.txt rename to Builds/Game/BUILD_THE_GAME_HERE.txt index 387f2b74c3..630938b504 100644 --- a/Builds/Game/BUILD THE GAME HERE.txt +++ b/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. diff --git a/Builds/Game/Config/network.json b/Builds/Game/Config/network.json new file mode 100644 index 0000000000..013c8d551e --- /dev/null +++ b/Builds/Game/Config/network.json @@ -0,0 +1,8 @@ +{ + "_preload": true, + "_type": 2, + "NetworkType": 2, + "Ckey": "editorUser", + "ServerAddress": "127.0.0.1", + "ServerPort": 1151 +} diff --git a/Builds/README.txt b/Builds/README.txt index b47c1ed881..c6537be62b 100644 --- a/Builds/README.txt +++ b/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 \ No newline at end of file diff --git a/Builds/Start SS3D Client - GhostOfBeep.bat b/Builds/Start_SS3D_Client_GhostOfBeep.bat similarity index 100% rename from Builds/Start SS3D Client - GhostOfBeep.bat rename to Builds/Start_SS3D_Client_GhostOfBeep.bat diff --git a/Builds/Start SS3D Client - John.bat b/Builds/Start_SS3D_Client_John.bat similarity index 100% rename from Builds/Start SS3D Client - John.bat rename to Builds/Start_SS3D_Client_John.bat diff --git a/Builds/Start SS3D Host.bat b/Builds/Start_SS3D_Host.bat similarity index 100% rename from Builds/Start SS3D Host.bat rename to Builds/Start_SS3D_Host.bat