Skip to content

Upgrade to 2022.3.60f1 LTS #2733

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

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
d735b97
Upgrade to latest recommended .gitignore
Z-Machine Mar 19, 2025
1ba83c4
Upgrade com.unity.postprocessing and move to registry
Z-Machine Mar 19, 2025
8512b5d
Upgrade packages
Z-Machine Mar 19, 2025
1a2111d
Upgrade to 2022.3.60f1 LTS
Z-Machine Mar 19, 2025
fb8b8c1
Missing asterisk
Z-Machine Mar 19, 2025
e2ef6a9
Add package NuGetForUnity
Z-Machine Mar 20, 2025
24d0253
Add package csprojmodifier
Z-Machine Mar 20, 2025
6429087
Enable nullable types and upgrade LangVersion to 11
Z-Machine Mar 20, 2025
3c0703a
Fix LangVersion.props path
Z-Machine Mar 20, 2025
8cf224e
Add NuGet package Microsoft.CodeAnalysis.CSharp
Z-Machine Mar 20, 2025
c06ddf4
Initial compiler replacement
Z-Machine Mar 20, 2025
d26eadb
Forgot to update ModManager to new method
Z-Machine Mar 20, 2025
392b658
Remove unneeded import
Z-Machine Mar 20, 2025
5c72979
Check if the texture can be compressed
Z-Machine Mar 21, 2025
d2b4647
Check if the texture can be compressed
Z-Machine Mar 21, 2025
0314753
Rip out execute console command
Z-Machine Mar 21, 2025
7c61395
Build pdb at runtime for debugging
Z-Machine Mar 23, 2025
0aa44a4
Add pdb support to precompiled mods
Z-Machine Mar 23, 2025
0552a29
load pdb for precompiled if they exist
Z-Machine Mar 23, 2025
e47b1db
remove rest of old compiler and references
Z-Machine Mar 23, 2025
1005cb1
Switch to Roslyn
Z-Machine Mar 24, 2025
33710ff
Fixes runtime crash for multiple mods
Z-Machine Mar 28, 2025
261f6e8
Revert to old default behavior for physical key mapping
Z-Machine Mar 29, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
62 changes: 51 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,32 @@
# Get latest from https://github.com/github/gitignore/blob/main/Unity.gitignore

.utmp/
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/[Bb]in/
/Assets/AssetStoreTools*
/[Ll]ogs/*
/[Uu]ser[Ss]ettings/

# MemoryCaptures can get excessive in size.
# They also could contain extremely sensitive data
/[Mm]emoryCaptures/

# Recordings can get excessive in size
/[Rr]ecordings/

# Uncomment this line if you wish to ignore the asset store tools plugin
/[Aa]ssets/AssetStoreTools*

# Autogenerated Jetbrains Rider plugin
/[Aa]ssets/Plugins/Editor/JetBrains*

# Visual Studio cache directory
.vs/

# Gradle cache directory
.gradle/

# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
Expand All @@ -19,29 +41,47 @@ ExportedObj/
*.pidb
*.booproj
*.svd
*.pdb
*.mdb
*.opendb
*.VC.db
.vs/

# Autogenerated project files from Rider
.idea/

# Unity3D generated meta files
*.pidb.meta
*.pdb.meta
*.mdb.meta

# Unity3D Generated File On Crash Reports
# Unity3D generated file on crash reports
sysinfo.txt

# Builds
*.apk
*.aab
*.unitypackage
*.unitypackage.meta
*.app

# Crashlytics generated file
crashlytics-build.properties

# Packed Addressables
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*

# Daggerfall Unity Below
!/[Ll]ogs/Packages-Update.log
/[Bb]in/

# Temporary auto-generated Android Assets
/[Aa]ssets/[Ss]treamingAssets/aa.meta
/[Aa]ssets/[Ss]treamingAssets/aa/*

# DaggerfallUnity logs
/Assets/DFTFU_Environment.log
/Assets/DFTFU_Environment.log.meta
/[Aa]ssets/DFTFU_Environment.log
/[Aa]ssets/DFTFU_Environment.log.meta

# DaggerfallUnity Editor settings
/Assets/Editor/Settings.meta
/Assets/Editor/Settings/
/[Aa]ssets/Editor/Settings.meta
/[Aa]ssets/Editor/Settings/

# Autogenerated from macOS
.DS_Store
30 changes: 17 additions & 13 deletions Assets/AddressableAssetsData/AddressableAssetSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ MonoBehaviour:
m_Name: AddressableAssetSettings
m_EditorClassIdentifier:
m_DefaultGroup: fa06e64cd45885541a4565d8fafeb221
m_currentHash:
serializedVersion: 2
Hash: d698f58027dcb2e623edade2aae9bf0a
m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 0
m_BundleLocalCatalog: 0
Expand Down Expand Up @@ -41,12 +44,13 @@ MonoBehaviour:
m_BuildAddressablesWithPlayerBuild: 2
m_overridePlayerVersion:
m_GroupAssets:
- {fileID: 11400000, guid: 9d7a66f484ab697478029bd0b16459e7, type: 2}
- {fileID: 11400000, guid: 57504176d154dfe4693bb65ced7f7bc8, type: 2}
- {fileID: 11400000, guid: ab1a76e7bdd8ac54ca04fced4170576b, type: 2}
- {fileID: 11400000, guid: 8bfc9f38a8398f049ae42c8deb016430, type: 2}
- {fileID: 11400000, guid: 29968a3cafa16383388712ca9c29b308, type: 2}
- {fileID: 11400000, guid: 7c10cf8c390428b4abba0720596818b9, type: 2}
- {fileID: 11400000, guid: c2813de1fb5d2f943b65ac0dc572f5e9, type: 2}
- {fileID: 11400000, guid: 9d7a66f484ab697478029bd0b16459e7, type: 2}
- {fileID: 11400000, guid: 8bfc9f38a8398f049ae42c8deb016430, type: 2}
- {fileID: 11400000, guid: ab1a76e7bdd8ac54ca04fced4170576b, type: 2}
m_BuildSettings:
m_CompileScriptsInVirtualMode: 0
m_CleanupStreamingAssetsAfterBuilds: 1
Expand All @@ -58,29 +62,29 @@ MonoBehaviour:
m_Id: 183dee86d7825d74381a2cfb6aa381c9
m_ProfileName: Default
m_Values:
- m_Id: 277a30672f4ba1e428b55598f2c93802
m_Value: '[UnityEditor.EditorUserBuildSettings.activeBuildTarget]'
- m_Id: a2d1b8521e4b4c54ba5b899fd483b843
m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]'
- m_Id: 1997ce672f7ff6a46a91400d8767f972
m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]'
- m_Id: 277a30672f4ba1e428b55598f2c93802
m_Value: '[UnityEditor.EditorUserBuildSettings.activeBuildTarget]'
- m_Id: 29f21ecf01d9d1f4b943296256d99c33
m_Value: ServerData/[BuildTarget]
- m_Id: a2d1b8521e4b4c54ba5b899fd483b843
m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]'
- m_Id: d73a17fb75615904980fb30b9f05d3d3
m_Value: http://localhost/[BuildTarget]
m_ProfileEntryNames:
- m_Id: 277a30672f4ba1e428b55598f2c93802
m_Name: BuildTarget
m_InlineUsage: 0
- m_Id: a2d1b8521e4b4c54ba5b899fd483b843
m_Name: LocalBuildPath
m_InlineUsage: 0
- m_Id: 1997ce672f7ff6a46a91400d8767f972
m_Name: LocalLoadPath
m_InlineUsage: 0
- m_Id: 277a30672f4ba1e428b55598f2c93802
m_Name: BuildTarget
m_InlineUsage: 0
- m_Id: 29f21ecf01d9d1f4b943296256d99c33
m_Name: RemoteBuildPath
m_InlineUsage: 0
- m_Id: a2d1b8521e4b4c54ba5b899fd483b843
m_Name: LocalBuildPath
m_InlineUsage: 0
- m_Id: d73a17fb75615904980fb30b9f05d3d3
m_Name: RemoteLoadPath
m_InlineUsage: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,36 @@ MonoBehaviour:
m_SerializeEntries:
- m_GUID: 3bc310f2421c1a740ae0f7372d787911
m_Address: Internal_Strings Shared Data
m_ReadOnly: 0
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: a53022878bfb3504595f69334a1cd2a2
m_Address: Internal_RSC Shared Data
m_ReadOnly: 0
- m_GUID: 59a31cda23f9abc4cb619f502133bbec
m_Address: Assets/Localization/StringTables/Internal_Factions Shared Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 5e11afb33a5de7543b2b1594675da1aa
m_Address: Assets/Localization/StringTables/Internal_Locations Shared Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 6170d504a469fec46b1a7762508ddcf2
m_Address: Assets/Localization/StringTables/Internal_Flats Shared Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 70b313a955a9d7247a7bcb5c4227f006
m_Address: Assets/Localization/StringTables/Internal_Items Shared Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 763a0745323097949bd6f8be9f62a0de
m_Address: Assets/Localization/StringTables/Internal_Quests Shared Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 5e11afb33a5de7543b2b1594675da1aa
m_Address: Assets/Localization/StringTables/Internal_Locations Shared Data.asset
- m_GUID: a53022878bfb3504595f69334a1cd2a2
m_Address: Internal_RSC Shared Data
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
Expand All @@ -52,24 +62,14 @@ MonoBehaviour:
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 70b313a955a9d7247a7bcb5c4227f006
m_Address: Assets/Localization/StringTables/Internal_Items Shared Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: dcef666101ad36e41a53996c93807302
m_Address: Assets/Localization/StringTables/Internal_MagicItems Shared Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 59a31cda23f9abc4cb619f502133bbec
m_Address: Assets/Localization/StringTables/Internal_Factions Shared Data.asset
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: d18e8e9fddb22f341a7e4df0a26a67e2, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: d8d6dfabdd3773440b207714b537ad72, type: 2}
- {fileID: 11400000, guid: a6cb97f7660516b4f918ae195a3f8326, type: 2}
- {fileID: 11400000, guid: d8d6dfabdd3773440b207714b537ad72, type: 2}
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,14 @@ MonoBehaviour:
m_GUID: 807d8709a6932f14cb6475413bf3e04a
m_SerializeEntries:
- m_GUID: 6198c0b12813e4f43b6063ad38ec4a20
m_Address: English (en)
m_Address: English
m_ReadOnly: 1
m_SerializedLabels:
- Locale
m_mainAssetType: UnityEngine.Localization.Locale, Unity.Localization, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
m_MainAsset: {fileID: 0}
m_TargetAsset: {fileID: 0}
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: d18e8e9fddb22f341a7e4df0a26a67e2, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: 5608dfb4c9cda394893c9adde5ef9f89, type: 2}
- {fileID: 11400000, guid: f59280a9c5a44fc4691c299088f8a8dd, type: 2}
- {fileID: 11400000, guid: 5608dfb4c9cda394893c9adde5ef9f89, type: 2}
Original file line number Diff line number Diff line change
Expand Up @@ -16,56 +16,7 @@ MonoBehaviour:
m_Data:
m_SerializedData: []
m_GUID: 34f132804662c444fb381d77458210e1
m_SerializeEntries:
- m_GUID: 2073d367f5107aa43b0558116e4af3af
m_Address: Internal_Flats_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
- Preload
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 3271e089f79ce4f418dcc46d2bbf17f3
m_Address: Internal_Quests_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 78311872af2509a4fbe824adf6323f64
m_Address: Internal_Locations_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 370845e8f09a49047b19bb35ace82148
m_Address: Internal_Settings_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 4c34c3fc483eec543b6d4b1c00ba4d14
m_Address: Internal_Spells_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 524dc306a656baf4f8f2659fff946a7e
m_Address: Internal_Items_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 5bf75379373c11b48a5eec8eb18ef3bb
m_Address: Internal_MagicItems_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 342c389699bc9a74da46f47afb5ed51c
m_Address: Internal_Factions_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
m_SerializeEntries: []
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: d18e8e9fddb22f341a7e4df0a26a67e2, type: 2}
m_SchemaSet:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
m_Name: Localization-String-Tables-English
m_EditorClassIdentifier:
m_GroupName: Localization-String-Tables-English
m_Data:
m_SerializedData: []
m_GUID: 37b9dfbb01e5cefbcacbd87234b756dd
m_SerializeEntries:
- m_GUID: 01ee95e96643d4444ab5d1917fd122f2
m_Address: Internal_Strings_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 2073d367f5107aa43b0558116e4af3af
m_Address: Internal_Flats_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
- Preload
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 3271e089f79ce4f418dcc46d2bbf17f3
m_Address: Internal_Quests_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 342c389699bc9a74da46f47afb5ed51c
m_Address: Internal_Factions_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 370845e8f09a49047b19bb35ace82148
m_Address: Internal_Settings_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 4c34c3fc483eec543b6d4b1c00ba4d14
m_Address: Internal_Spells_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 524dc306a656baf4f8f2659fff946a7e
m_Address: Internal_Items_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 5bf75379373c11b48a5eec8eb18ef3bb
m_Address: Internal_MagicItems_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 78311872af2509a4fbe824adf6323f64
m_Address: Internal_Locations_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 891546bc4f66d9243b35152bd1ac06a7
m_Address: Internal_RSC_en
m_ReadOnly: 1
m_SerializedLabels:
- Locale-en
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: d18e8e9fddb22f341a7e4df0a26a67e2, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: 96a6d1202f75100e69541d0d85639322, type: 2}
- {fileID: 11400000, guid: 735610d8093590d59b28d98f27ed200a, type: 2}
Loading