Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix annoying false or useless changes in github desktop #1265

Merged
merged 19 commits into from
Oct 7, 2023
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -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
15 changes: 12 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand Down Expand Up @@ -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/
Expand All @@ -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
Binary file not shown.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion Assets/Scripts/EditorTools/RuleSetManager.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
using EditorTools;


#if UNITY_EDITOR

using EditorTools;
using System.Collections;
using System.Collections.Generic;
using System.IO;
Expand Down Expand Up @@ -106,3 +110,5 @@ private void buttonRemoveClicked()
AssetDatabase.Refresh();
}
}

#endif
Original file line number Diff line number Diff line change
@@ -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.
8 changes: 8 additions & 0 deletions Builds/Game/Config/network.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"_preload": true,
"_type": 2,
"NetworkType": 2,
"Ckey": "editorUser",
"ServerAddress": "127.0.0.1",
"ServerPort": 2158
cosmiccoincidence marked this conversation as resolved.
Show resolved Hide resolved
}
4 changes: 1 addition & 3 deletions Builds/README.txt
Original file line number Diff line number Diff line change
@@ -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
File renamed without changes.
File renamed without changes.
Loading