From 88b1a5e55bcd6a94997da811329f5f884d9348ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elfi=20K=C3=BChndorf?= Date: Wed, 27 Mar 2024 14:47:56 +0100 Subject: [PATCH 1/4] updated packages especially IDE and removed ai navigation package from client driven --- Basic/2DSpaceShooter/Packages/manifest.json | 4 ++-- Basic/2DSpaceShooter/Packages/packages-lock.json | 4 ++-- Basic/ClientDriven/Packages/manifest.json | 7 +++---- Basic/ClientDriven/Packages/packages-lock.json | 15 +++------------ .../Packages/manifest.json | 6 +++--- .../Packages/packages-lock.json | 10 +++++----- Basic/Invaders/Packages/manifest.json | 4 ++-- Basic/Invaders/Packages/packages-lock.json | 4 ++-- 8 files changed, 22 insertions(+), 32 deletions(-) diff --git a/Basic/2DSpaceShooter/Packages/manifest.json b/Basic/2DSpaceShooter/Packages/manifest.json index acb568c29..4fb58cb56 100644 --- a/Basic/2DSpaceShooter/Packages/manifest.json +++ b/Basic/2DSpaceShooter/Packages/manifest.json @@ -3,7 +3,7 @@ "com.unity.2d.sprite": "1.0.0", "com.unity.ai.navigation": "1.1.5", "com.unity.collab-proxy": "2.2.0", - "com.unity.ide.rider": "3.0.26", + "com.unity.ide.rider": "3.0.28", "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", "com.unity.multiplayer.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.4.0", @@ -11,7 +11,7 @@ "com.unity.postprocessing": "3.2.2", "com.unity.render-pipelines.universal": "14.0.9", "com.unity.test-framework": "1.1.33", - "com.unity.textmeshpro": "3.0.6", + "com.unity.textmeshpro": "3.0.8", "com.unity.timeline": "1.7.6", "com.unity.ugui": "1.0.0", "com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync#bb3d5067e49e403d8b8ba15c036d313b4dd2c696", diff --git a/Basic/2DSpaceShooter/Packages/packages-lock.json b/Basic/2DSpaceShooter/Packages/packages-lock.json index 09caa8fac..c1c551fc7 100644 --- a/Basic/2DSpaceShooter/Packages/packages-lock.json +++ b/Basic/2DSpaceShooter/Packages/packages-lock.json @@ -56,7 +56,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.26", + "version": "3.0.28", "depth": 0, "source": "registry", "dependencies": { @@ -282,7 +282,7 @@ "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "3.0.6", + "version": "3.0.8", "depth": 0, "source": "registry", "dependencies": { diff --git a/Basic/ClientDriven/Packages/manifest.json b/Basic/ClientDriven/Packages/manifest.json index 73440ec1c..7df18f28a 100644 --- a/Basic/ClientDriven/Packages/manifest.json +++ b/Basic/ClientDriven/Packages/manifest.json @@ -1,9 +1,8 @@ { "dependencies": { - "com.unity.ai.navigation": "1.1.5", - "com.unity.cinemachine": "2.9.5", + "com.unity.cinemachine": "2.9.7", "com.unity.collab-proxy": "2.2.0", - "com.unity.ide.rider": "3.0.26", + "com.unity.ide.rider": "3.0.28", "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", "com.unity.inputsystem": "1.7.0", @@ -11,7 +10,7 @@ "com.unity.netcode.gameobjects": "1.7.1", "com.unity.render-pipelines.universal": "14.0.9", "com.unity.test-framework": "1.1.33", - "com.unity.textmeshpro": "3.0.6", + "com.unity.textmeshpro": "3.0.8", "com.unity.timeline": "1.7.6", "com.unity.ugui": "1.0.0", "com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync#bb3d5067e49e403d8b8ba15c036d313b4dd2c696", diff --git a/Basic/ClientDriven/Packages/packages-lock.json b/Basic/ClientDriven/Packages/packages-lock.json index 0a2eee701..b1c1355c6 100644 --- a/Basic/ClientDriven/Packages/packages-lock.json +++ b/Basic/ClientDriven/Packages/packages-lock.json @@ -1,14 +1,5 @@ { "dependencies": { - "com.unity.ai.navigation": { - "version": "1.1.5", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.modules.ai": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.burst": { "version": "1.8.10", "depth": 1, @@ -19,7 +10,7 @@ "url": "https://packages.unity.com" }, "com.unity.cinemachine": { - "version": "2.9.5", + "version": "2.9.7", "depth": 0, "source": "registry", "dependencies": { @@ -59,7 +50,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.26", + "version": "3.0.28", "depth": 0, "source": "registry", "dependencies": { @@ -285,7 +276,7 @@ "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "3.0.6", + "version": "3.0.8", "depth": 0, "source": "registry", "dependencies": { diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Packages/manifest.json b/Basic/DynamicAddressablesNetworkPrefabs/Packages/manifest.json index f7f252a2f..dd1fbc608 100644 --- a/Basic/DynamicAddressablesNetworkPrefabs/Packages/manifest.json +++ b/Basic/DynamicAddressablesNetworkPrefabs/Packages/manifest.json @@ -1,13 +1,13 @@ { "dependencies": { - "com.unity.addressables": "1.21.19", + "com.unity.addressables": "1.21.20", "com.unity.ai.navigation": "1.1.5", - "com.unity.ide.rider": "3.0.26", + "com.unity.ide.rider": "3.0.28", "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", "com.unity.multiplayer.tools": "1.1.1", "com.unity.netcode.gameobjects": "1.7.1", - "com.unity.textmeshpro": "3.0.6", + "com.unity.textmeshpro": "3.0.8", "com.unity.ugui": "1.0.0", "com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync" } diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Packages/packages-lock.json b/Basic/DynamicAddressablesNetworkPrefabs/Packages/packages-lock.json index ca625803b..4b1b7f476 100644 --- a/Basic/DynamicAddressablesNetworkPrefabs/Packages/packages-lock.json +++ b/Basic/DynamicAddressablesNetworkPrefabs/Packages/packages-lock.json @@ -1,11 +1,11 @@ { "dependencies": { "com.unity.addressables": { - "version": "1.21.19", + "version": "1.21.20", "depth": 0, "source": "registry", "dependencies": { - "com.unity.scriptablebuildpipeline": "1.21.21", + "com.unity.scriptablebuildpipeline": "1.21.22", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", @@ -50,7 +50,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.26", + "version": "3.0.28", "depth": 0, "source": "registry", "dependencies": { @@ -126,7 +126,7 @@ "url": "https://packages.unity.com" }, "com.unity.scriptablebuildpipeline": { - "version": "1.21.21", + "version": "1.21.22", "depth": 1, "source": "registry", "dependencies": {}, @@ -144,7 +144,7 @@ "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "3.0.6", + "version": "3.0.8", "depth": 0, "source": "registry", "dependencies": { diff --git a/Basic/Invaders/Packages/manifest.json b/Basic/Invaders/Packages/manifest.json index 94f24ee81..c26d8cc98 100644 --- a/Basic/Invaders/Packages/manifest.json +++ b/Basic/Invaders/Packages/manifest.json @@ -2,14 +2,14 @@ "dependencies": { "com.unity.2d.sprite": "1.0.0", "com.unity.ai.navigation": "1.1.5", - "com.unity.ide.rider": "3.0.26", + "com.unity.ide.rider": "3.0.28", "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", "com.unity.multiplayer.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.4.0", "com.unity.multiplayer.tools": "1.1.1", "com.unity.netcode.gameobjects": "1.7.1", "com.unity.render-pipelines.universal": "14.0.9", - "com.unity.textmeshpro": "3.0.6", + "com.unity.textmeshpro": "3.0.8", "com.unity.timeline": "1.7.6", "com.unity.ugui": "1.0.0", "com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync#bb3d5067e49e403d8b8ba15c036d313b4dd2c696", diff --git a/Basic/Invaders/Packages/packages-lock.json b/Basic/Invaders/Packages/packages-lock.json index e73e9fa01..c655640f4 100644 --- a/Basic/Invaders/Packages/packages-lock.json +++ b/Basic/Invaders/Packages/packages-lock.json @@ -49,7 +49,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.26", + "version": "3.0.28", "depth": 0, "source": "registry", "dependencies": { @@ -266,7 +266,7 @@ "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "3.0.6", + "version": "3.0.8", "depth": 0, "source": "registry", "dependencies": { From d9c2a42989ac0d161ccf1f1318e118a897cd26dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elfi=20K=C3=BChndorf?= Date: Mon, 22 Apr 2024 11:20:19 +0200 Subject: [PATCH 2/4] re-adding ai navigation --- Basic/ClientDriven/Packages/manifest.json | 1 + Basic/ClientDriven/Packages/packages-lock.json | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/Basic/ClientDriven/Packages/manifest.json b/Basic/ClientDriven/Packages/manifest.json index 7df18f28a..a36573640 100644 --- a/Basic/ClientDriven/Packages/manifest.json +++ b/Basic/ClientDriven/Packages/manifest.json @@ -1,5 +1,6 @@ { "dependencies": { + "com.unity.ai.navigation": "1.1.5", "com.unity.cinemachine": "2.9.7", "com.unity.collab-proxy": "2.2.0", "com.unity.ide.rider": "3.0.28", diff --git a/Basic/ClientDriven/Packages/packages-lock.json b/Basic/ClientDriven/Packages/packages-lock.json index b1c1355c6..7fcd46bb8 100644 --- a/Basic/ClientDriven/Packages/packages-lock.json +++ b/Basic/ClientDriven/Packages/packages-lock.json @@ -1,5 +1,14 @@ { "dependencies": { + "com.unity.ai.navigation": { + "version": "1.1.5", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.ai": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.burst": { "version": "1.8.10", "depth": 1, From d3d4279e239a1a8f5feae42703d101cdca7c81ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elfi=20K=C3=BChndorf?= Date: Mon, 22 Apr 2024 11:40:17 +0200 Subject: [PATCH 3/4] Update CHANGELOG.md --- CHANGELOG.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81663c49c..2fd722b76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,16 +7,32 @@ #### Cleanup - Formatted .cs files inside the Bitesize Samples repository to adhere to coding standards (#156) Internal testing job definition files were added in order for internal processes to execute. +### 2D Space Shooter + +#### Changed +- Upgraded to IDE Rider v3.0.28 and TextMeshPro v3.0.8 (#166) + ### Client Driven #### Changed - Upgraded to Netcode for GameObjects v1.8.1 (#164) - Upgraded to the newer API for Rpcs, Universal Rpcs - The place of execution for a client's position was moved to ClientNetworkTransform child class, ClientDrivenNetworkTransform. This ensures no race condition issues on a client's first position sync. Server code now modifies a NetworkVariable that client-owned instances of ClientDrivenNetworkTransform use on OnNetworkSpawn to initially move a player +- Upgraded to IDE Rider v3.0.28, TextMeshPro v3.0.8 and Cinemachine 2.9.7 (#166) #### Fixed - Added Spawner with event executed on Server Start to fix inconsistent ghost ingredients issue (#157) +### Dynamic Addressables Network Prefabs + +#### Changed +- Upgraded to IDE Rider v3.0.28, TextMeshPro v3.0.8 and Addressables v1.21.20 (#166) + +### Invaders + +#### Changed +- Upgraded to IDE Rider v3.0.28 and TextMeshPro v3.0.8 (#166) + ## [1.5.0] 2023-12-15 ### Bitesize Samples Repository From 918b275aebf4d79074174e5fcfd37513f01d3758 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elfi=20K=C3=BChndorf?= Date: Mon, 22 Apr 2024 14:34:15 +0200 Subject: [PATCH 4/4] reverting additional package changes and adjusting changelog --- Basic/2DSpaceShooter/Packages/manifest.json | 2 +- Basic/2DSpaceShooter/Packages/packages-lock.json | 2 +- Basic/ClientDriven/Packages/manifest.json | 4 ++-- Basic/ClientDriven/Packages/packages-lock.json | 4 ++-- .../Packages/manifest.json | 4 ++-- .../Packages/packages-lock.json | 8 ++++---- Basic/Invaders/Packages/manifest.json | 2 +- Basic/Invaders/Packages/packages-lock.json | 2 +- CHANGELOG.md | 8 ++++---- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Basic/2DSpaceShooter/Packages/manifest.json b/Basic/2DSpaceShooter/Packages/manifest.json index 4fb58cb56..bde354535 100644 --- a/Basic/2DSpaceShooter/Packages/manifest.json +++ b/Basic/2DSpaceShooter/Packages/manifest.json @@ -11,7 +11,7 @@ "com.unity.postprocessing": "3.2.2", "com.unity.render-pipelines.universal": "14.0.9", "com.unity.test-framework": "1.1.33", - "com.unity.textmeshpro": "3.0.8", + "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.7.6", "com.unity.ugui": "1.0.0", "com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync#bb3d5067e49e403d8b8ba15c036d313b4dd2c696", diff --git a/Basic/2DSpaceShooter/Packages/packages-lock.json b/Basic/2DSpaceShooter/Packages/packages-lock.json index c1c551fc7..d184065ee 100644 --- a/Basic/2DSpaceShooter/Packages/packages-lock.json +++ b/Basic/2DSpaceShooter/Packages/packages-lock.json @@ -282,7 +282,7 @@ "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "3.0.8", + "version": "3.0.6", "depth": 0, "source": "registry", "dependencies": { diff --git a/Basic/ClientDriven/Packages/manifest.json b/Basic/ClientDriven/Packages/manifest.json index 919ecdc0a..ac89602ef 100644 --- a/Basic/ClientDriven/Packages/manifest.json +++ b/Basic/ClientDriven/Packages/manifest.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.ai.navigation": "1.1.5", - "com.unity.cinemachine": "2.9.7", + "com.unity.cinemachine": "2.9.5", "com.unity.collab-proxy": "2.2.0", "com.unity.ide.rider": "3.0.28", "com.unity.ide.visualstudio": "2.0.22", @@ -11,7 +11,7 @@ "com.unity.netcode.gameobjects": "1.8.1", "com.unity.render-pipelines.universal": "14.0.9", "com.unity.test-framework": "1.1.33", - "com.unity.textmeshpro": "3.0.8", + "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.7.6", "com.unity.ugui": "1.0.0", "com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync#bb3d5067e49e403d8b8ba15c036d313b4dd2c696", diff --git a/Basic/ClientDriven/Packages/packages-lock.json b/Basic/ClientDriven/Packages/packages-lock.json index 5132e2663..6b124807e 100644 --- a/Basic/ClientDriven/Packages/packages-lock.json +++ b/Basic/ClientDriven/Packages/packages-lock.json @@ -19,7 +19,7 @@ "url": "https://packages.unity.com" }, "com.unity.cinemachine": { - "version": "2.9.7", + "version": "2.9.5", "depth": 0, "source": "registry", "dependencies": { @@ -285,7 +285,7 @@ "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "3.0.8", + "version": "3.0.6", "depth": 0, "source": "registry", "dependencies": { diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Packages/manifest.json b/Basic/DynamicAddressablesNetworkPrefabs/Packages/manifest.json index dd1fbc608..1c9482110 100644 --- a/Basic/DynamicAddressablesNetworkPrefabs/Packages/manifest.json +++ b/Basic/DynamicAddressablesNetworkPrefabs/Packages/manifest.json @@ -1,13 +1,13 @@ { "dependencies": { - "com.unity.addressables": "1.21.20", + "com.unity.addressables": "1.21.19", "com.unity.ai.navigation": "1.1.5", "com.unity.ide.rider": "3.0.28", "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", "com.unity.multiplayer.tools": "1.1.1", "com.unity.netcode.gameobjects": "1.7.1", - "com.unity.textmeshpro": "3.0.8", + "com.unity.textmeshpro": "3.0.6", "com.unity.ugui": "1.0.0", "com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync" } diff --git a/Basic/DynamicAddressablesNetworkPrefabs/Packages/packages-lock.json b/Basic/DynamicAddressablesNetworkPrefabs/Packages/packages-lock.json index 4b1b7f476..d10d88949 100644 --- a/Basic/DynamicAddressablesNetworkPrefabs/Packages/packages-lock.json +++ b/Basic/DynamicAddressablesNetworkPrefabs/Packages/packages-lock.json @@ -1,11 +1,11 @@ { "dependencies": { "com.unity.addressables": { - "version": "1.21.20", + "version": "1.21.19", "depth": 0, "source": "registry", "dependencies": { - "com.unity.scriptablebuildpipeline": "1.21.22", + "com.unity.scriptablebuildpipeline": "1.21.21", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", @@ -126,7 +126,7 @@ "url": "https://packages.unity.com" }, "com.unity.scriptablebuildpipeline": { - "version": "1.21.22", + "version": "1.21.21", "depth": 1, "source": "registry", "dependencies": {}, @@ -144,7 +144,7 @@ "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "3.0.8", + "version": "3.0.6", "depth": 0, "source": "registry", "dependencies": { diff --git a/Basic/Invaders/Packages/manifest.json b/Basic/Invaders/Packages/manifest.json index c26d8cc98..d3a440cce 100644 --- a/Basic/Invaders/Packages/manifest.json +++ b/Basic/Invaders/Packages/manifest.json @@ -9,7 +9,7 @@ "com.unity.multiplayer.tools": "1.1.1", "com.unity.netcode.gameobjects": "1.7.1", "com.unity.render-pipelines.universal": "14.0.9", - "com.unity.textmeshpro": "3.0.8", + "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.7.6", "com.unity.ugui": "1.0.0", "com.veriorpies.parrelsync": "https://github.com/VeriorPies/ParrelSync.git?path=/ParrelSync#bb3d5067e49e403d8b8ba15c036d313b4dd2c696", diff --git a/Basic/Invaders/Packages/packages-lock.json b/Basic/Invaders/Packages/packages-lock.json index c655640f4..c5bbcf159 100644 --- a/Basic/Invaders/Packages/packages-lock.json +++ b/Basic/Invaders/Packages/packages-lock.json @@ -266,7 +266,7 @@ "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "3.0.8", + "version": "3.0.6", "depth": 0, "source": "registry", "dependencies": { diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fd722b76..39e11df79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ ### 2D Space Shooter #### Changed -- Upgraded to IDE Rider v3.0.28 and TextMeshPro v3.0.8 (#166) +- Upgraded to IDE Rider v3.0.28 (#166) ### Client Driven @@ -18,7 +18,7 @@ - Upgraded to Netcode for GameObjects v1.8.1 (#164) - Upgraded to the newer API for Rpcs, Universal Rpcs - The place of execution for a client's position was moved to ClientNetworkTransform child class, ClientDrivenNetworkTransform. This ensures no race condition issues on a client's first position sync. Server code now modifies a NetworkVariable that client-owned instances of ClientDrivenNetworkTransform use on OnNetworkSpawn to initially move a player -- Upgraded to IDE Rider v3.0.28, TextMeshPro v3.0.8 and Cinemachine 2.9.7 (#166) +- Upgraded to IDE Rider v3.0.28 (#166) #### Fixed - Added Spawner with event executed on Server Start to fix inconsistent ghost ingredients issue (#157) @@ -26,12 +26,12 @@ ### Dynamic Addressables Network Prefabs #### Changed -- Upgraded to IDE Rider v3.0.28, TextMeshPro v3.0.8 and Addressables v1.21.20 (#166) +- Upgraded to IDE Rider v3.0.28 (#166) ### Invaders #### Changed -- Upgraded to IDE Rider v3.0.28 and TextMeshPro v3.0.8 (#166) +- Upgraded to IDE Rider v3.0.28 (#166) ## [1.5.0] 2023-12-15