From d3a4a098ae0c0c088a57955a499681e770c42cc6 Mon Sep 17 00:00:00 2001 From: stilnat Date: Sat, 7 Oct 2023 21:42:00 +0200 Subject: [PATCH] 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 --- .gitattributes | 30 ++++++++++++++++++ .gitignore | 15 +++++++-- .../Windows/addressables_content_state.bin | Bin 2916 -> 0 bytes .../addressables_content_state.bin.meta | 7 ---- .../EngineeringBorg/EngineeringBorg.prefab | 2 +- Assets/Scripts/EditorTools/RuleSetManager.cs | 2 +- .../cecil-0.11.4/Mono.Cecil.sln.meta | 7 ---- .../Tugboat/LiteNetLib/LiteNetLib.csproj.meta | 7 ---- ... GAME HERE.txt => BUILD_THE_GAME_HERE.txt} | 2 +- Builds/Game/Config/network.json | 8 +++++ Builds/README.txt | 4 +-- ....bat => Start_SS3D_Client_GhostOfBeep.bat} | 0 ... - John.bat => Start_SS3D_Client_John.bat} | 0 ...tart SS3D Host.bat => Start_SS3D_Host.bat} | 0 14 files changed, 54 insertions(+), 30 deletions(-) create mode 100644 .gitattributes delete mode 100644 Assets/Content/Addressables/Windows/addressables_content_state.bin delete mode 100644 Assets/Content/Addressables/Windows/addressables_content_state.bin.meta delete mode 100644 Assets/Scripts/External/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.sln.meta delete mode 100644 Assets/Scripts/External/FishNet/Runtime/Transporting/Transports/Tugboat/LiteNetLib/LiteNetLib.csproj.meta rename Builds/Game/{BUILD THE GAME HERE.txt => BUILD_THE_GAME_HERE.txt} (98%) create mode 100644 Builds/Game/Config/network.json rename Builds/{Start SS3D Client - GhostOfBeep.bat => Start_SS3D_Client_GhostOfBeep.bat} (100%) rename Builds/{Start SS3D Client - John.bat => Start_SS3D_Client_John.bat} (100%) rename Builds/{Start SS3D Host.bat => Start_SS3D_Host.bat} (100%) 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 e051b4d2769dc492e49a9bd0cbabcfa7fba02c67..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2916 zcmb_eZExH}5I&d7B}WoUDW&B_aG)X(RMy&FuWivHrGbb*+D2(YktjOt%Q$DnX9vF& zLIwSR#LIs`@KZp1MB*C~2nm6N1mE}xz>M#bT=6tr)Vs#@+svUd5m;%aDsuW85Rg+YCajEwv6lIcUSD4-WF7+1cw5kiZl0jV+GQHGW ztyP-nH(+Ny--7H)R;TF{slVK49qF0Wy-=1=mG;#-NzLT@axu>;$f}!_tY8Wi%x|Z1 z2Z}L*d1w%gN3&Y$0hr}1&dYNJ4D$*WWhK*mb0wE%RaS%f(Tb~eX3!tYYFlk_6hw=S z;s#`crTv}zP@Hv{>)9-{9p82xn{(`U+Bh+b6OQfS``GD{>zxjY zR(Bf3G>u!k=hfy%2eR)2A($p*jULk7_K&V-!XZ-BogvXBaX*P!5_2TxQOrGnVx>`T zuR)pDg@$V~lbdktWFmXVhdZa53|LB1ST=2gNn)L9PUJMI{nWZUibJ-UWMGdo@IY4D zYjsv7L!g}c@HQT6W-!e%xRqokf3Fn$wt-k;QKY$+>1L7F+kM%jcweSz-*bdEEEI7J zkq&*&@gw1CKXP2=Mce^<1h4xbqOmBbir6jE16JBiM-ax$FUXyrQ|xKg^BJ4#9nD?@Nx#f&Mw3+-WoMw!__JBOXSCveh9 z1;YbyjH82Cx!}fbAYxy7TxcP<4kAYg6$ZO-9w9hXBMqGM*!k!L;2@9UscjxWq*x?f z5D^}nG>%Y_l1fBO8P|A5NU@9P0wJP;Z4f<*oqH#MNabc{TNc#;NKE=@TyZy$Uch5l z;laf^X4=(}z-riq^caGeqB?kevL+9b$Ph1xJziNY@;eD-tld!Eh^N-z-5Sd3#x~_o zNipvX`>)AzFg5Hi7P>p^uVXdmb#(^EgF4#+vtG!ojG;I^?62W1Q-H2kl3`NK(YPvh z7IUNk9E=QHmqWmnjY+y}uH^>yCT}Jmz=dIdqXe|IlozAhWVEq7-%M=WTEmGIVvF(n zi-;rzS=^`wFy1k~=E_?G$jAto(G6hHb_LMEQ>T9!p^=W!Ih!>B6w zHv1aajXof#?L2{^heUzZsA6zM?D^6$%=bd3Tn1PRp(mz($M22*36`9nz9Z8b`u)}n zL8j-g@5e#GR3-03`tqIVdB{qfD#Wn4Gm%2PPt$6-tBH*}9&By}$>?IR)zY7jk* zo!()@Wj_1+I%#OW&ZzA?gQCZSz(5#jDL5z@xIVIs@k0Qqv9g7*ewnbIe7tX+7^ks* zk<=WLGbmBdx6hQ$R+27Mk__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