diff --git a/Assets/Prefabs/Case List/Entries/1993/Happy Happy Troy Troy.prefab b/Assets/Prefabs/Case List/Entries/1993/Happy Happy Troy Troy.prefab index 46365fa..5ecd86b 100644 --- a/Assets/Prefabs/Case List/Entries/1993/Happy Happy Troy Troy.prefab +++ b/Assets/Prefabs/Case List/Entries/1993/Happy Happy Troy Troy.prefab @@ -73,21 +73,6 @@ PrefabInstance: propertyPath: m_Name value: Happy Happy Troy Troy objectReference: {fileID: 0} - - target: {fileID: 4897177162454936150, guid: 3929edff864c3a84abaac327dbadaf65, - type: 3} - propertyPath: m_Color.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4897177162454936150, guid: 3929edff864c3a84abaac327dbadaf65, - type: 3} - propertyPath: m_Color.g - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4897177162454936150, guid: 3929edff864c3a84abaac327dbadaf65, - type: 3} - propertyPath: m_Color.r - value: 0.78431374 - objectReference: {fileID: 0} - target: {fileID: 4897177162454936150, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_Material @@ -399,21 +384,6 @@ PrefabInstance: propertyPath: FallbackVideoFiles.Array.data[5].url value: https://filehost.battybovine.com/witwics/the-williamsburglary/WilliamRagsdale.mp4 objectReference: {fileID: 0} - - target: {fileID: 7635005722111176880, guid: 3929edff864c3a84abaac327dbadaf65, - type: 3} - propertyPath: m_Color.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7635005722111176880, guid: 3929edff864c3a84abaac327dbadaf65, - type: 3} - propertyPath: m_Color.g - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7635005722111176880, guid: 3929edff864c3a84abaac327dbadaf65, - type: 3} - propertyPath: m_Color.r - value: 0.78431374 - objectReference: {fileID: 0} - target: {fileID: 7635005722111176880, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_Material @@ -429,21 +399,6 @@ PrefabInstance: propertyPath: m_fontSize value: 49 objectReference: {fileID: 0} - - target: {fileID: 9017700041050903883, guid: 3929edff864c3a84abaac327dbadaf65, - type: 3} - propertyPath: m_Color.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9017700041050903883, guid: 3929edff864c3a84abaac327dbadaf65, - type: 3} - propertyPath: m_Color.g - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9017700041050903883, guid: 3929edff864c3a84abaac327dbadaf65, - type: 3} - propertyPath: m_Color.r - value: 0.78431374 - objectReference: {fileID: 0} - target: {fileID: 9017700041050903883, guid: 3929edff864c3a84abaac327dbadaf65, type: 3} propertyPath: m_Material diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs index a05eb8a..e6bdc53 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs @@ -574,6 +574,7 @@ public class GameManagerRound3 : GameManagerBase } public void EndVideoPlayerCameraSwitch() { + _CameraControllerRound3.PlayDoItRockapella(false); _CameraControllerRound3.ActivateFrontOverheadCameraSwitcher(); } diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset index b946757..036a370 100644 --- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: BoneFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5, + serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset index b35639e..13d78db 100644 --- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset +++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: InteractToggle m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864, + serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset index 1def3de..d89a1a4 100644 --- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset +++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: PlayerModSetter m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b, + serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset index 8101274..ea98aa4 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: GlobalToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872, + serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset index 901d05e..b4b3ede 100644 --- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset +++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: MasterToggleObject m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91, + serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset index da92932..c624599 100644 --- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset +++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: TrackingDataFollower m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2, + serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555, type: 2} udonAssembly: assemblyError: diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset index ee4621f..5226f4f 100644 --- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset +++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} m_Name: WorldAudioSettings m_EditorClassIdentifier: - serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab, + serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694, type: 2} udonAssembly: assemblyError: diff --git a/Credits And License Requirements.txt b/Credits And License Requirements.txt deleted file mode 100644 index cd7aabc..0000000 --- a/Credits And License Requirements.txt +++ /dev/null @@ -1,37 +0,0 @@ -CREDITS: -- 56k Modem.mp3 by BlueNeon -- https://freesound.org/s/203512/ -- License: Creative Commons Attribution Non-Commercial 3.0 -- Mancunian dot matrix printer by azumarill -- https://freesound.org/s/322125/ -- License: Creative Commons Attribution 3.0 -- ImagesWriter II Power-On Sound by jewettg -- https://freesound.org/s/662715/ -- License: Creative Commons 0 -- Stromberg Carlson 1543.wav by Hockinfinger -- https://freesound.org/s/274436/ -- License: Creative Commons 0 -- Zanussi Z930 drier - last minutes of drying with buzzer by tryl -- https://freesound.org/s/449829/ -- License: Creative Commons Attribution 4.0 -- Interior Trim Assets by Roman -- https://skfb.ly/oPWt6 -- License: Creative Commons Attribution 4.0 -- Serra da Leba, Angola -- https://www.flickr.com/photos/erikkristensen/134925835/ -- License: Creative Commons Attribution 2.0 -- butter slides off while the honey drips -- jeffreyw -- https://www.flickr.com/photos/jeffreyww/4577869719 -- License: Creative Commons Attribution 2.0 -- 9" Plate -- ami.becker -- https://www.flickr.com/photos/kitters78/4753832492 -- License: Creative Commons Attribution-Non Commercial-No Derivatives 2.0 -- Teatro Amazonas -- henribergius -- https://www.flickr.com/photos/bergie/4404263539 -- License: Creative Commons Attribution-Share Alike 2.0 -- Light Switch On and Off.wav by nickrandomsounds -- https://freesound.org/s/615283/ -- License: Creative Commons 0 -- Great echoing foghorn.aiff by Danjocross -- https://freesound.org/s/507472/ -- License: Creative Commons 0 -- Old Trail Town in Cody by faungg -- https://www.flickr.com/photos/44534236@N00/15264948568 -- License: Creative Commons Attribution-No Derivatives 2.0 -- Christian IV's Crown, Rosenborg Castle, Copenhagen, Denmark -- https://www.flickr.com/photos/alex-david/49981622668 -- License: Creative Commons Attribution 4.0 -- Filing Cabinet Drawer Open/Close by SamsterBirdies -- https://freesound.org/s/581404/ -- License: Creative Commons 0 -- Отдел исследований мозга by Wetscherinin -- https://ru.wikipedia.org/wiki/%D0%A4%D0%B0%D0%B9%D0%BB:%D0%9E%D1%82%D0%B4%D0%B5%D0%BB_%D0%B8%D1%81%D1%81%D0%BB%D0%B5%D0%B4%D0%BE%D0%B2%D0%B0%D0%BD%D0%B8%D0%B9_%D0%BC%D0%BE%D0%B7%D0%B3%D0%B0.jpg -- License: Creative Commons Attribution 4.0 International -- Trojan Horse - Terra Mitica Benidorm -- elgringospain -- https://www.flickr.com/photos/youngun/7623601276 -- License: Creative Commons Attribution-No Derivatives 2.0 -- 02112 Silver Serving Tray, Shooting Award 1950 -- L.G.Hicks Memorial Collection -- https://www.flickr.com/photos/qormuseum/39735887392/ -- License: Creative Commons Attribution-Non Commercial 2.0 -- A soviet hourglass by Valger -- https://skfb.ly/oO6HU -- License: Creative Commons Attribution 4.0 - -------------------------------------------------------------------------------- - -NEED TO PURCHASE: -- Futura Now Headline Condensed Bold: -- - https://www.myfonts.com/products/headline-condensed-bold-futura-now-348079 -- Hannah Barbera Sound Effects Library -- - Disc 1 - Boing Cartoon 14-15 -- - Disc 1 - Lever Cartoon 67-01 -- - Disc 3 - Electronic 16-02 -- - Disc 3 - Thunder 93-03 -- - Disc 3 - SciFi 28-01 -- - Disc 3 - SciFi 33-03 -- - Disc 3 - SciFi 34-03 -- - Disc 3 - SciFi 83-02 -- - Disc 5 - Horn Fog 52-05 -- Berlin Atmospheres - Sound Effect #0307 \ No newline at end of file diff --git a/Purchase Requirements.txt b/Purchase Requirements.txt new file mode 100644 index 0000000..74e693d --- /dev/null +++ b/Purchase Requirements.txt @@ -0,0 +1,14 @@ +NEED TO PURCHASE: +- Futura Now Headline Condensed Bold: +- - https://www.myfonts.com/products/headline-condensed-bold-futura-now-348079 +- Hannah Barbera Sound Effects Library +- - Disc 1 - Boing Cartoon 14-15 +- - Disc 1 - Lever Cartoon 67-01 +- - Disc 3 - Electronic 16-02 +- - Disc 3 - Thunder 93-03 +- - Disc 3 - SciFi 28-01 +- - Disc 3 - SciFi 33-03 +- - Disc 3 - SciFi 34-03 +- - Disc 3 - SciFi 83-02 +- - Disc 5 - Horn Fog 52-05 +- Berlin Atmospheres - Sound Effect #0307 \ No newline at end of file diff --git a/Raw Files/Kneemoi In Jail.xcf b/Raw Files/Kneemoi In Jail.xcf new file mode 100644 index 0000000..846854a Binary files /dev/null and b/Raw Files/Kneemoi In Jail.xcf differ