From 5aeaf57f97589932b16fa3b8a1a23f9f8e606948 Mon Sep 17 00:00:00 2001 From: saladplainzone <31338325+saladplainzone@users.noreply.github.com> Date: Mon, 15 Jan 2024 05:43:38 -0800 Subject: [PATCH] Last Minute R1 Audio Fixes (#623) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update issue template to include .riq/.zip info (#483) Co-authored-by: patata * Pull release 1 (#484) * Squashed commit of the following: commit 2c628a41093ab02d8dd26b246941c49e97c33aa7 Merge: 4fde418c 6246a144 Author: minenice55 Date: Wed Jun 14 01:23:31 2023 +0000 Merge pull request #473 from minenice55/easings-fix Enum Parsing Fix commit 6246a144b6c3b52d30df6616d62ab4456596b5c1 Author: minenice55 Date: Tue Jun 13 21:21:13 2023 -0400 fix all parsing of enums, removed the "special case" for eases update to latest Jukebox commit 4fde418c33d34ab9ed6ff18675d2bcaa7cbea63f Merge: b9043582 50bc8765 Author: minenice55 Date: Tue Jun 13 21:39:15 2023 +0000 Merge pull request #469 from minenice55/jukebox-update Jukebox Package Update commit b90435825af4901067545159e4a5201e30772684 Merge: eec3c09a 73e9efd4 Author: minenice55 Date: Tue Jun 13 21:39:08 2023 +0000 Merge pull request #458 from AstrlJelly/MiscAdditions_4 Bug Fixes + Feature Additions commit 73e9efd4b159d239d3e3bbbe3841382577779dc2 Author: minenice55 Date: Tue Jun 13 17:38:24 2023 -0400 add "updater" for the old marching entity commit b8d149743aebd1ff1f299d0ef4b7b7dbc430789c Merge: 4291333c eec3c09a Author: minenice55 Date: Tue Jun 13 17:22:01 2023 -0400 Merge branch 'release_1' into pr/458 commit 50bc876509762b7b9f551f66126b6e9c6f181ad4 Author: minenice55 Date: Tue Jun 13 16:55:02 2023 -0400 let play mode start if no song file is loaded fix issue with loading large audio files commit eec3c09aa892a04372ee2a6b94f0f0d4d186ef1d Merge: a0d70933 990af323 Author: minenice55 Date: Tue Jun 13 18:32:40 2023 +0000 Merge pull request #471 from Rapandrasmus/FixWorkingDoughCurve Fixed weird curve stuff on game switch in working dough commit 990af323792e23a7d9ccabacd19f0e650f6ed74e Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 19:24:13 2023 +0200 Fixed weird curve stuff on game switch in working dough commit a0d7093345214c690d6fd0f671cfcad26f62e057 Merge: bdef3f95 3d19e75e Author: minenice55 Date: Tue Jun 13 16:09:21 2023 +0000 Merge pull request #470 from Rapandrasmus/WorkingDoughFixes Fixed small balls not working in working dough commit 3d19e75e1a42eb1580f9769e84d6afa8a9332f61 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 18:07:13 2023 +0200 Fixed small balls not working in working dough commit bdef3f95c3c0f564d57bd048895e93ae7c3bef6f Merge: 8954b8c2 0bfafac6 Author: minenice55 Date: Tue Jun 13 14:56:58 2023 +0000 Merge pull request #467 from Rapandrasmus/WorkingDoughRework Working Dough rework commit 0bfafac6fe9af68547b92e48321e54dd0221f469 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:13:08 2023 +0200 modernised rockers pass turn commit d770266d8107e88f98311b824fce24e7222cb993 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:03:08 2023 +0200 Rhythm tweezers pass turn now works like working dough commit 2109c99a9585461c997fcb44fd3fd45b59c4134c Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 15:51:35 2023 +0200 gandw on balls has been added commit 785abf84862eef2b124bcad6fd8319ed757b1a70 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 14:59:56 2023 +0200 Proper inactive handling now commit 0a92b7bd690498a4d89e9db6c40c0cc126c07cd2 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:52:15 2023 +0200 OnSpawnBall reimplemented commit a14aacc181cebcc82faddee715960e80245c23d3 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:37:09 2023 +0200 new sounds commit 8b0544246dd4f9125bb1f512cb2c65b9593c2d82 Author: minenice55 Date: Mon Jun 12 17:18:37 2023 -0400 update Jukebox to latest version fixes for inferred entity loading commit d8ff6744c058ab2f93bd18f9456764e0451cbf85 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 21:36:57 2023 +0200 ball transporter anims for pass turn commit d283624b0705db36f351a113c00669b977dbde2e Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 20:38:48 2023 +0200 working dough converted, need to fix eveerything though commit 5b3c59eabd98959a5f9fdfce44a8f8e777bcce4f Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 18:36:41 2023 +0200 Converted everything to new curves and made playerballs handle themselves input-wise commit dee630ea45134c91388438a6930d807f53fdd595 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 14:04:32 2023 +0200 Some new curves commit 31e8890190a994c94183d9fad5eb2ee5dcd14d6c Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 12:03:21 2023 +0200 Rockers can do it too now commit 76bf6eefa65208f2856d30bf6acc75af6a5b9139 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 11:58:31 2023 +0200 You can now place inputs on top of pass turn for rhythm tweezers commit 8954b8c2690223e4e9cbcd456bc4c5bf5ad1cabb Merge: 743e954e ce3e6f2d Author: minenice55 Date: Sun Jun 11 15:55:40 2023 -0400 Merge branch 'master' into release_1 commit 743e954e05eefd75c7b7b951a71d70c1ba97c440 Merge: 5af551b3 8929cd56 Author: minenice55 Date: Sun Jun 11 19:53:47 2023 +0000 Merge pull request #465 from minenice55/dont_infer_track Don't infer the track field when importing converted v0 riq coming from unknown origin commit 8929cd5618d253682848e66dfdabd24066661000 Author: minenice55 Date: Sun Jun 11 15:52:14 2023 -0400 don't infer track when importing a v0 riq from another program commit 5af551b32eb33eb2505746afbc0e973175bc5d45 Author: minenice55 Date: Sun Jun 11 12:12:25 2023 -0400 make base datamodels for special entity reading (#463) * make base datamodels for special entity reading * fix crop stomp breaking when no game switch or remix end is set * fix save shortcut fix loading charts with no music commit 4291333cb0491450a147da4de5541ce3bd6db7a6 Author: minenice55 Date: Sat Jun 10 23:00:30 2023 -0400 add updater for marching orders turn commit 82da6da741348f45610568141ddd4ba422f286f0 Merge: 52a4d2b6 411b9a3c Author: minenice55 Date: Sat Jun 10 22:36:10 2023 -0400 Merge branch 'release_1' into pr/458 commit 411b9a3cb1c46d79efebd7c04640ccbdb6928feb Merge: b6c222a9 afc665ed Author: minenice55 Date: Sat Jun 10 22:30:32 2023 -0400 Merge branch 'master' into release_1 commit b6c222a981a056e433d80757702b712097a88937 Author: minenice55 Date: Sat Jun 10 22:27:58 2023 -0400 editor fixes (#459) * ditch loading dialog doesn't show up when it's supposed to * format song offset in editor * remove VorbisPlugin * Update Editor.cs commit 52a4d2b65cde2c292df52cc14a9a8ae98214a1ed Author: AstrlJelly Date: Sat Jun 10 16:55:10 2023 -0400 convert float to double and all that commit aa8f531466706880a822d89cbd6a4c77f0c1ce6d Merge: 242b076f afc665ed Author: AstrlJelly Date: Sat Jun 10 16:01:44 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit 242b076f0994fe8ee8e553d66877711a9f57b6c2 Merge: db653d5a 2b0ced2f Author: AstrlJelly Date: Sat Jun 10 15:21:22 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit db653d5a5221b913a718081aa7f14655d91ac56b Author: AstrlJelly Date: Sat Jun 10 15:18:45 2023 -0400 a lot * munchy monk input + mustache fixes * fork lifter and pajama party bopping * meat grinder miss bop fix * cloud monkey Real * marching orders Go! was broken * force march doesn't break when it's too early from a game switch * you can use the March! block without the marching now commit 50a1b7bcdbb4cebf4247d1220e559db2cd0e44ac Author: minenice55 Date: Sat Jun 10 15:13:29 2023 -0400 Integration of Jukebox Library (#451) * add Jukebox library todo: - saving / loading of new format - inferrence of unknown data like past versions - move the temporary float casts to proper use of double - make sound related functions take double for timing - inform people that the Jukebox sound player was renamed to SoundByte lol * make sound, input scheduling, and super curve use double precision * successfully load charts * editor works again v1 riqs can be saved and loaded * first tempo and volume markers are unmovable fix loading of charts' easing values * use gsync / freesync * update Jukebox refs to SoundByte * game events use double part 1 Air Rally - Glee Club converted * don't load song if chart load fails * finish conversion of all minigames * remove editor waveform toggle * timeline now respects added song offset length clear cache files on app close prepped notes for dsp sync * update timeline length when offset changed * update to latest Jukebox * make error panel object in global game manager * improve conductor music scheduling * added error message box fix first game events sometimes not playing * Squashed commit of the following: commit 0d25221b71c3797a7447663f62e5b620898754fe Merge: 5869d212 9163085d Author: minenice55 Date: Sat Jun 17 16:40:52 2023 +0000 Merge pull request #478 from evdial/working-dough Working Dough Tweaks commit 9163085d7ab5bea1ab36d6c5659e08c968ecd87e Merge: 6592a5f2 5869d212 Author: minenice55 Date: Sat Jun 17 12:40:06 2023 -0400 Merge branch 'release_1' into pr/478 commit 5869d212bcc3de47aff18e0334f1919d54cd7fa2 Author: patata Date: Sat Jun 17 17:20:15 2023 +0200 Update issue template to include .riq/.zip info commit 6592a5f202f70bf483dd7274054dc0e9c6dd7b7f Author: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 15:05:07 2023 -0400 assbuns commit 11a4c090a1ee0122d369d61ebb1637a86bb433f6 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Thu Jun 15 20:56:40 2023 +0200 made small idle not crazy commit 45e7d81b0f32afc05022983e071ec8eab3b1d407 Author: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 14:33:57 2023 -0400 fsd commit 47efa3e4f38930b4bea2d6c04514603a97522e1b Author: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 14:16:38 2023 -0400 anim commit c6fb8880a0e8529e87b7f3b6dc4255ec676890db Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Thu Jun 15 20:13:11 2023 +0200 Fixed stuff also scaled now yippee commit 16ce508b03536aa82f2e3dbc616481d573c7d8bc Author: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 13:50:10 2023 -0400 many commit 37b80a33c7d242f35ca3dd65a8adc27f17c659e5 Author: minenice55 Date: Tue Jun 13 21:28:21 2023 -0400 Squashed commit of the following: (#474) commit 2c628a41093ab02d8dd26b246941c49e97c33aa7 Merge: 4fde418c 6246a144 Author: minenice55 Date: Wed Jun 14 01:23:31 2023 +0000 Merge pull request #473 from minenice55/easings-fix Enum Parsing Fix commit 6246a144b6c3b52d30df6616d62ab4456596b5c1 Author: minenice55 Date: Tue Jun 13 21:21:13 2023 -0400 fix all parsing of enums, removed the "special case" for eases update to latest Jukebox commit 4fde418c33d34ab9ed6ff18675d2bcaa7cbea63f Merge: b9043582 50bc8765 Author: minenice55 Date: Tue Jun 13 21:39:15 2023 +0000 Merge pull request #469 from minenice55/jukebox-update Jukebox Package Update commit b90435825af4901067545159e4a5201e30772684 Merge: eec3c09a 73e9efd4 Author: minenice55 Date: Tue Jun 13 21:39:08 2023 +0000 Merge pull request #458 from AstrlJelly/MiscAdditions_4 Bug Fixes + Feature Additions commit 73e9efd4b159d239d3e3bbbe3841382577779dc2 Author: minenice55 Date: Tue Jun 13 17:38:24 2023 -0400 add "updater" for the old marching entity commit b8d149743aebd1ff1f299d0ef4b7b7dbc430789c Merge: 4291333c eec3c09a Author: minenice55 Date: Tue Jun 13 17:22:01 2023 -0400 Merge branch 'release_1' into pr/458 commit 50bc876509762b7b9f551f66126b6e9c6f181ad4 Author: minenice55 Date: Tue Jun 13 16:55:02 2023 -0400 let play mode start if no song file is loaded fix issue with loading large audio files commit eec3c09aa892a04372ee2a6b94f0f0d4d186ef1d Merge: a0d70933 990af323 Author: minenice55 Date: Tue Jun 13 18:32:40 2023 +0000 Merge pull request #471 from Rapandrasmus/FixWorkingDoughCurve Fixed weird curve stuff on game switch in working dough commit 990af323792e23a7d9ccabacd19f0e650f6ed74e Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 19:24:13 2023 +0200 Fixed weird curve stuff on game switch in working dough commit a0d7093345214c690d6fd0f671cfcad26f62e057 Merge: bdef3f95 3d19e75e Author: minenice55 Date: Tue Jun 13 16:09:21 2023 +0000 Merge pull request #470 from Rapandrasmus/WorkingDoughFixes Fixed small balls not working in working dough commit 3d19e75e1a42eb1580f9769e84d6afa8a9332f61 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 18:07:13 2023 +0200 Fixed small balls not working in working dough commit bdef3f95c3c0f564d57bd048895e93ae7c3bef6f Merge: 8954b8c2 0bfafac6 Author: minenice55 Date: Tue Jun 13 14:56:58 2023 +0000 Merge pull request #467 from Rapandrasmus/WorkingDoughRework Working Dough rework commit 0bfafac6fe9af68547b92e48321e54dd0221f469 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:13:08 2023 +0200 modernised rockers pass turn commit d770266d8107e88f98311b824fce24e7222cb993 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:03:08 2023 +0200 Rhythm tweezers pass turn now works like working dough commit 2109c99a9585461c997fcb44fd3fd45b59c4134c Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 15:51:35 2023 +0200 gandw on balls has been added commit 785abf84862eef2b124bcad6fd8319ed757b1a70 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 14:59:56 2023 +0200 Proper inactive handling now commit 0a92b7bd690498a4d89e9db6c40c0cc126c07cd2 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:52:15 2023 +0200 OnSpawnBall reimplemented commit a14aacc181cebcc82faddee715960e80245c23d3 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:37:09 2023 +0200 new sounds commit 8b0544246dd4f9125bb1f512cb2c65b9593c2d82 Author: minenice55 Date: Mon Jun 12 17:18:37 2023 -0400 update Jukebox to latest version fixes for inferred entity loading commit d8ff6744c058ab2f93bd18f9456764e0451cbf85 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 21:36:57 2023 +0200 ball transporter anims for pass turn commit d283624b0705db36f351a113c00669b977dbde2e Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 20:38:48 2023 +0200 working dough converted, need to fix eveerything though commit 5b3c59eabd98959a5f9fdfce44a8f8e777bcce4f Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 18:36:41 2023 +0200 Converted everything to new curves and made playerballs handle themselves input-wise commit dee630ea45134c91388438a6930d807f53fdd595 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 14:04:32 2023 +0200 Some new curves commit 31e8890190a994c94183d9fad5eb2ee5dcd14d6c Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 12:03:21 2023 +0200 Rockers can do it too now commit 76bf6eefa65208f2856d30bf6acc75af6a5b9139 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 11:58:31 2023 +0200 You can now place inputs on top of pass turn for rhythm tweezers commit 8954b8c2690223e4e9cbcd456bc4c5bf5ad1cabb Merge: 743e954e ce3e6f2d Author: minenice55 Date: Sun Jun 11 15:55:40 2023 -0400 Merge branch 'master' into release_1 commit 743e954e05eefd75c7b7b951a71d70c1ba97c440 Merge: 5af551b3 8929cd56 Author: minenice55 Date: Sun Jun 11 19:53:47 2023 +0000 Merge pull request #465 from minenice55/dont_infer_track Don't infer the track field when importing converted v0 riq coming from unknown origin commit 8929cd5618d253682848e66dfdabd24066661000 Author: minenice55 Date: Sun Jun 11 15:52:14 2023 -0400 don't infer track when importing a v0 riq from another program commit 5af551b32eb33eb2505746afbc0e973175bc5d45 Author: minenice55 Date: Sun Jun 11 12:12:25 2023 -0400 make base datamodels for special entity reading (#463) * make base datamodels for special entity reading * fix crop stomp breaking when no game switch or remix end is set * fix save shortcut fix loading charts with no music commit 4291333cb0491450a147da4de5541ce3bd6db7a6 Author: minenice55 Date: Sat Jun 10 23:00:30 2023 -0400 add updater for marching orders turn commit 82da6da741348f45610568141ddd4ba422f286f0 Merge: 52a4d2b6 411b9a3c Author: minenice55 Date: Sat Jun 10 22:36:10 2023 -0400 Merge branch 'release_1' into pr/458 commit 411b9a3cb1c46d79efebd7c04640ccbdb6928feb Merge: b6c222a9 afc665ed Author: minenice55 Date: Sat Jun 10 22:30:32 2023 -0400 Merge branch 'master' into release_1 commit b6c222a981a056e433d80757702b712097a88937 Author: minenice55 Date: Sat Jun 10 22:27:58 2023 -0400 editor fixes (#459) * ditch loading dialog doesn't show up when it's supposed to * format song offset in editor * remove VorbisPlugin * Update Editor.cs commit 52a4d2b65cde2c292df52cc14a9a8ae98214a1ed Author: AstrlJelly Date: Sat Jun 10 16:55:10 2023 -0400 convert float to double and all that commit aa8f531466706880a822d89cbd6a4c77f0c1ce6d Merge: 242b076f afc665ed Author: AstrlJelly Date: Sat Jun 10 16:01:44 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit 242b076f0994fe8ee8e553d66877711a9f57b6c2 Merge: db653d5a 2b0ced2f Author: AstrlJelly Date: Sat Jun 10 15:21:22 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit db653d5a5221b913a718081aa7f14655d91ac56b Author: AstrlJelly Date: Sat Jun 10 15:18:45 2023 -0400 a lot * munchy monk input + mustache fixes * fork lifter and pajama party bopping * meat grinder miss bop fix * cloud monkey Real * marching orders Go! was broken * force march doesn't break when it's too early from a game switch * you can use the March! block without the marching now commit 50a1b7bcdbb4cebf4247d1220e559db2cd0e44ac Author: minenice55 Date: Sat Jun 10 15:13:29 2023 -0400 Integration of Jukebox Library (#451) * add Jukebox library todo: - saving / loading of new format - inferrence of unknown data like past versions - move the temporary float casts to proper use of double - make sound related functions take double for timing - inform people that the Jukebox sound player was renamed to SoundByte lol * make sound, input scheduling, and super curve use double precision * successfully load charts * editor works again v1 riqs can be saved and loaded * first tempo and volume markers are unmovable fix loading of charts' easing values * use gsync / freesync * update Jukebox refs to SoundByte * game events use double part 1 Air Rally - Glee Club converted * don't load song if chart load fails * finish conversion of all minigames * remove editor waveform toggle * timeline now respects added song offset length clear cache files on app close prepped notes for dsp sync * update timeline length when offset changed * update to latest Jukebox * make error panel object in global game manager * improve conductor music scheduling * added error message box fix first game events sometimes not playing commit 2c628a41093ab02d8dd26b246941c49e97c33aa7 Merge: 4fde418c 6246a144 Author: minenice55 Date: Wed Jun 14 01:23:31 2023 +0000 Merge pull request #473 from minenice55/easings-fix Enum Parsing Fix commit 6246a144b6c3b52d30df6616d62ab4456596b5c1 Author: minenice55 Date: Tue Jun 13 21:21:13 2023 -0400 fix all parsing of enums, removed the "special case" for eases update to latest Jukebox commit 4fde418c33d34ab9ed6ff18675d2bcaa7cbea63f Merge: b9043582 50bc8765 Author: minenice55 Date: Tue Jun 13 21:39:15 2023 +0000 Merge pull request #469 from minenice55/jukebox-update Jukebox Package Update commit b90435825af4901067545159e4a5201e30772684 Merge: eec3c09a 73e9efd4 Author: minenice55 Date: Tue Jun 13 21:39:08 2023 +0000 Merge pull request #458 from AstrlJelly/MiscAdditions_4 Bug Fixes + Feature Additions commit 73e9efd4b159d239d3e3bbbe3841382577779dc2 Author: minenice55 Date: Tue Jun 13 17:38:24 2023 -0400 add "updater" for the old marching entity commit b8d149743aebd1ff1f299d0ef4b7b7dbc430789c Merge: 4291333c eec3c09a Author: minenice55 Date: Tue Jun 13 17:22:01 2023 -0400 Merge branch 'release_1' into pr/458 commit 50bc876509762b7b9f551f66126b6e9c6f181ad4 Author: minenice55 Date: Tue Jun 13 16:55:02 2023 -0400 let play mode start if no song file is loaded fix issue with loading large audio files commit eec3c09aa892a04372ee2a6b94f0f0d4d186ef1d Merge: a0d70933 990af323 Author: minenice55 Date: Tue Jun 13 18:32:40 2023 +0000 Merge pull request #471 from Rapandrasmus/FixWorkingDoughCurve Fixed weird curve stuff on game switch in working dough commit 990af323792e23a7d9ccabacd19f0e650f6ed74e Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 19:24:13 2023 +0200 Fixed weird curve stuff on game switch in working dough commit a0d7093345214c690d6fd0f671cfcad26f62e057 Merge: bdef3f95 3d19e75e Author: minenice55 Date: Tue Jun 13 16:09:21 2023 +0000 Merge pull request #470 from Rapandrasmus/WorkingDoughFixes Fixed small balls not working in working dough commit 3d19e75e1a42eb1580f9769e84d6afa8a9332f61 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 18:07:13 2023 +0200 Fixed small balls not working in working dough commit bdef3f95c3c0f564d57bd048895e93ae7c3bef6f Merge: 8954b8c2 0bfafac6 Author: minenice55 Date: Tue Jun 13 14:56:58 2023 +0000 Merge pull request #467 from Rapandrasmus/WorkingDoughRework Working Dough rework commit 0bfafac6fe9af68547b92e48321e54dd0221f469 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:13:08 2023 +0200 modernised rockers pass turn commit d770266d8107e88f98311b824fce24e7222cb993 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:03:08 2023 +0200 Rhythm tweezers pass turn now works like working dough commit 2109c99a9585461c997fcb44fd3fd45b59c4134c Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 15:51:35 2023 +0200 gandw on balls has been added commit 785abf84862eef2b124bcad6fd8319ed757b1a70 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 14:59:56 2023 +0200 Proper inactive handling now commit 0a92b7bd690498a4d89e9db6c40c0cc126c07cd2 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:52:15 2023 +0200 OnSpawnBall reimplemented commit a14aacc181cebcc82faddee715960e80245c23d3 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:37:09 2023 +0200 new sounds commit 8b0544246dd4f9125bb1f512cb2c65b9593c2d82 Author: minenice55 Date: Mon Jun 12 17:18:37 2023 -0400 update Jukebox to latest version fixes for inferred entity loading commit d8ff6744c058ab2f93bd18f9456764e0451cbf85 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 21:36:57 2023 +0200 ball transporter anims for pass turn commit d283624b0705db36f351a113c00669b977dbde2e Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 20:38:48 2023 +0200 working dough converted, need to fix eveerything though commit 5b3c59eabd98959a5f9fdfce44a8f8e777bcce4f Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 18:36:41 2023 +0200 Converted everything to new curves and made playerballs handle themselves input-wise commit dee630ea45134c91388438a6930d807f53fdd595 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 14:04:32 2023 +0200 Some new curves commit 31e8890190a994c94183d9fad5eb2ee5dcd14d6c Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 12:03:21 2023 +0200 Rockers can do it too now commit 76bf6eefa65208f2856d30bf6acc75af6a5b9139 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 11:58:31 2023 +0200 You can now place inputs on top of pass turn for rhythm tweezers commit 8954b8c2690223e4e9cbcd456bc4c5bf5ad1cabb Merge: 743e954e ce3e6f2d Author: minenice55 Date: Sun Jun 11 15:55:40 2023 -0400 Merge branch 'master' into release_1 commit 743e954e05eefd75c7b7b951a71d70c1ba97c440 Merge: 5af551b3 8929cd56 Author: minenice55 Date: Sun Jun 11 19:53:47 2023 +0000 Merge pull request #465 from minenice55/dont_infer_track Don't infer the track field when importing converted v0 riq coming from unknown origin commit 8929cd5618d253682848e66dfdabd24066661000 Author: minenice55 Date: Sun Jun 11 15:52:14 2023 -0400 don't infer track when importing a v0 riq from another program commit 5af551b32eb33eb2505746afbc0e973175bc5d45 Author: minenice55 Date: Sun Jun 11 12:12:25 2023 -0400 make base datamodels for special entity reading (#463) * make base datamodels for special entity reading * fix crop stomp breaking when no game switch or remix end is set * fix save shortcut fix loading charts with no music commit 4291333cb0491450a147da4de5541ce3bd6db7a6 Author: minenice55 Date: Sat Jun 10 23:00:30 2023 -0400 add updater for marching orders turn commit 82da6da741348f45610568141ddd4ba422f286f0 Merge: 52a4d2b6 411b9a3c Author: minenice55 Date: Sat Jun 10 22:36:10 2023 -0400 Merge branch 'release_1' into pr/458 commit 411b9a3cb1c46d79efebd7c04640ccbdb6928feb Merge: b6c222a9 afc665ed Author: minenice55 Date: Sat Jun 10 22:30:32 2023 -0400 Merge branch 'master' into release_1 commit b6c222a981a056e433d80757702b712097a88937 Author: minenice55 Date: Sat Jun 10 22:27:58 2023 -0400 editor fixes (#459) * ditch loading dialog doesn't show up when it's supposed to * format song offset in editor * remove VorbisPlugin * Update Editor.cs commit 52a4d2b65cde2c292df52cc14a9a8ae98214a1ed Author: AstrlJelly Date: Sat Jun 10 16:55:10 2023 -0400 convert float to double and all that commit aa8f531466706880a822d89cbd6a4c77f0c1ce6d Merge: 242b076f afc665ed Author: AstrlJelly Date: Sat Jun 10 16:01:44 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit 242b076f0994fe8ee8e553d66877711a9f57b6c2 Merge: db653d5a 2b0ced2f Author: AstrlJelly Date: Sat Jun 10 15:21:22 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit db653d5a5221b913a718081aa7f14655d91ac56b Author: AstrlJelly Date: Sat Jun 10 15:18:45 2023 -0400 a lot * munchy monk input + mustache fixes * fork lifter and pajama party bopping * meat grinder miss bop fix * cloud monkey Real * marching orders Go! was broken * force march doesn't break when it's too early from a game switch * you can use the March! block without the marching now commit 50a1b7bcdbb4cebf4247d1220e559db2cd0e44ac Author: minenice55 Date: Sat Jun 10 15:13:29 2023 -0400 Integration of Jukebox Library (#451) * add Jukebox library todo: - saving / loading of new format - inferrence of unknown data like past versions - move the temporary float casts to proper use of double - make sound related functions take double for timing - inform people that the Jukebox sound player was renamed to SoundByte lol * make sound, input scheduling, and super curve use double precision * successfully load charts * editor works again v1 riqs can be saved and loaded * first tempo and volume markers are unmovable fix loading of charts' easing values * use gsync / freesync * update Jukebox refs to SoundByte * game events use double part 1 Air Rally - Glee Club converted * don't load song if chart load fails * finish conversion of all minigames * remove editor waveform toggle * timeline now respects added song offset length clear cache files on app close prepped notes for dsp sync * update timeline length when offset changed * update to latest Jukebox * make error panel object in global game manager * improve conductor music scheduling * added error message box fix first game events sometimes not playing * Editor Additions (#479) * favoriting and pick block favoriting needs to not break after previewing (maybe make it persistent in the settings file?) pick block needs to pick the icon, too. and preferably scroll to it as well * final star anim + automatic icon game switching before i make any more changes im making a checkpoint here cuz i know it works * i want to add a way to specify which event SwitchGame() will switch to (because that's a cool feature for pick block) * i'll have to figure out how to auto scroll to the game when the icon is selected * the star now fully works, even between preview switches :+1: * fix the rest of the stuff the event name gets colored correctly and hidden games are skipped over, but still loaded. also i built mm ass buns * tweaks + zoom and sorting this stuff will be in the pr desc so it doesn't matter * oop one more thing * icons look better now :D mipmaps to the rescue * double date fix * Merge pull request #486 from RHeavenStudio/actions_rework Rework GitHub Actions and build script * add ab meta to gitignore (#489) * Sound Scheduling Improvements (#491) * port conductor adjustments * scheduled sounds prebake * allow aiff files to be imported add vbr mp3 warning to readme * improve wording * CNR API Internal Rework (#488) * Prep stuff * Tweezers now spawn in * Started converting tweezers * I hate <1 beat intervals * Actually nvm * fixed a bug * You can chain intervals now, stack them if you really wanted * Pass turn checks if crhandlerinstance exists * Fixed hairs being deleted by onion switch * Rockers rerewritten * working dough rerewritten * CNR API Internal Rework (#488) * Prep stuff * Tweezers now spawn in * Started converting tweezers * I hate <1 beat intervals * Actually nvm * fixed a bug * You can chain intervals now, stack them if you really wanted * Pass turn checks if crhandlerinstance exists * Fixed hairs being deleted by onion switch * Rockers rerewritten * working dough rerewritten * Games fixes/reworks patch (#501) * ghosts are scaled now * Lockstep fully reworked * mr. bach has been implemented * Space dance fixes * oops * Tap trial rework part 1 * tap trial rework part 2 * oopsie * Gramps Talk Update * Space Dance Voice Offsets * Giraffe done! (Except miss anim) * bg is not showing up for some reason * bg not rendering fixed + giraffe fixed * scrolling done * fixed space dance and space soccer bg scrolls * fixed rockers bugs * adjustment * fixed el inaccuracies * particle fix * changed pitch and volume of monkey tap * miss anim * megamix face for girl * Proper miss anim implementation * Added force stepping event * miss anim fix --------- Co-authored-by: saladplainzone Co-authored-by: ev <85412919+evdial@users.noreply.github.com> * Mahou Tsukai Rework (#502) * fixed not being able to whiff in tap trial * bored meeting fixes * more board meeting fix * ww now uses z axis instead of scale * Inputs are now reworked in mahou tsukai * Fixed the particle effect * Game Switch Black Flash is now beat-based. (#503) * Game switch flashes are now 0.25 beats long * ambient glow now turns black when the game switch flash is on * you can now set the void color, it doesn't work with game switch flashes * black * fixed! (#504) * Quiz Show and Tambourine Reworks (#505) * Tambourine fully reworked * quiz show rework part 1 * quiz show rework part 2 * oopsie doopsie * el fix numbah two * In CheerReaders.cs, quotation marks were aptly added, and references … (#506) * Update issue template to include .riq/.zip info (#483) Co-authored-by: patata * Pull release 1 (#484) * Squashed commit of the following: commit 2c628a41093ab02d8dd26b246941c49e97c33aa7 Merge: 4fde418c 6246a144 Author: minenice55 Date: Wed Jun 14 01:23:31 2023 +0000 Merge pull request #473 from minenice55/easings-fix Enum Parsing Fix commit 6246a144b6c3b52d30df6616d62ab4456596b5c1 Author: minenice55 Date: Tue Jun 13 21:21:13 2023 -0400 fix all parsing of enums, removed the "special case" for eases update to latest Jukebox commit 4fde418c33d34ab9ed6ff18675d2bcaa7cbea63f Merge: b9043582 50bc8765 Author: minenice55 Date: Tue Jun 13 21:39:15 2023 +0000 Merge pull request #469 from minenice55/jukebox-update Jukebox Package Update commit b90435825af4901067545159e4a5201e30772684 Merge: eec3c09a 73e9efd4 Author: minenice55 Date: Tue Jun 13 21:39:08 2023 +0000 Merge pull request #458 from AstrlJelly/MiscAdditions_4 Bug Fixes + Feature Additions commit 73e9efd4b159d239d3e3bbbe3841382577779dc2 Author: minenice55 Date: Tue Jun 13 17:38:24 2023 -0400 add "updater" for the old marching entity commit b8d149743aebd1ff1f299d0ef4b7b7dbc430789c Merge: 4291333c eec3c09a Author: minenice55 Date: Tue Jun 13 17:22:01 2023 -0400 Merge branch 'release_1' into pr/458 commit 50bc876509762b7b9f551f66126b6e9c6f181ad4 Author: minenice55 Date: Tue Jun 13 16:55:02 2023 -0400 let play mode start if no song file is loaded fix issue with loading large audio files commit eec3c09aa892a04372ee2a6b94f0f0d4d186ef1d Merge: a0d70933 990af323 Author: minenice55 Date: Tue Jun 13 18:32:40 2023 +0000 Merge pull request #471 from Rapandrasmus/FixWorkingDoughCurve Fixed weird curve stuff on game switch in working dough commit 990af323792e23a7d9ccabacd19f0e650f6ed74e Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 19:24:13 2023 +0200 Fixed weird curve stuff on game switch in working dough commit a0d7093345214c690d6fd0f671cfcad26f62e057 Merge: bdef3f95 3d19e75e Author: minenice55 Date: Tue Jun 13 16:09:21 2023 +0000 Merge pull request #470 from Rapandrasmus/WorkingDoughFixes Fixed small balls not working in working dough commit 3d19e75e1a42eb1580f9769e84d6afa8a9332f61 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 18:07:13 2023 +0200 Fixed small balls not working in working dough commit bdef3f95c3c0f564d57bd048895e93ae7c3bef6f Merge: 8954b8c2 0bfafac6 Author: minenice55 Date: Tue Jun 13 14:56:58 2023 +0000 Merge pull request #467 from Rapandrasmus/WorkingDoughRework Working Dough rework commit 0bfafac6fe9af68547b92e48321e54dd0221f469 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:13:08 2023 +0200 modernised rockers pass turn commit d770266d8107e88f98311b824fce24e7222cb993 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:03:08 2023 +0200 Rhythm tweezers pass turn now works like working dough commit 2109c99a9585461c997fcb44fd3fd45b59c4134c Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 15:51:35 2023 +0200 gandw on balls has been added commit 785abf84862eef2b124bcad6fd8319ed757b1a70 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 14:59:56 2023 +0200 Proper inactive handling now commit 0a92b7bd690498a4d89e9db6c40c0cc126c07cd2 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:52:15 2023 +0200 OnSpawnBall reimplemented commit a14aacc181cebcc82faddee715960e80245c23d3 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:37:09 2023 +0200 new sounds commit 8b0544246dd4f9125bb1f512cb2c65b9593c2d82 Author: minenice55 Date: Mon Jun 12 17:18:37 2023 -0400 update Jukebox to latest version fixes for inferred entity loading commit d8ff6744c058ab2f93bd18f9456764e0451cbf85 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 21:36:57 2023 +0200 ball transporter anims for pass turn commit d283624b0705db36f351a113c00669b977dbde2e Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 20:38:48 2023 +0200 working dough converted, need to fix eveerything though commit 5b3c59eabd98959a5f9fdfce44a8f8e777bcce4f Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 18:36:41 2023 +0200 Converted everything to new curves and made playerballs handle themselves input-wise commit dee630ea45134c91388438a6930d807f53fdd595 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 14:04:32 2023 +0200 Some new curves commit 31e8890190a994c94183d9fad5eb2ee5dcd14d6c Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 12:03:21 2023 +0200 Rockers can do it too now commit 76bf6eefa65208f2856d30bf6acc75af6a5b9139 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 11:58:31 2023 +0200 You can now place inputs on top of pass turn for rhythm tweezers commit 8954b8c2690223e4e9cbcd456bc4c5bf5ad1cabb Merge: 743e954e ce3e6f2d Author: minenice55 Date: Sun Jun 11 15:55:40 2023 -0400 Merge branch 'master' into release_1 commit 743e954e05eefd75c7b7b951a71d70c1ba97c440 Merge: 5af551b3 8929cd56 Author: minenice55 Date: Sun Jun 11 19:53:47 2023 +0000 Merge pull request #465 from minenice55/dont_infer_track Don't infer the track field when importing converted v0 riq coming from unknown origin commit 8929cd5618d253682848e66dfdabd24066661000 Author: minenice55 Date: Sun Jun 11 15:52:14 2023 -0400 don't infer track when importing a v0 riq from another program commit 5af551b32eb33eb2505746afbc0e973175bc5d45 Author: minenice55 Date: Sun Jun 11 12:12:25 2023 -0400 make base datamodels for special entity reading (#463) * make base datamodels for special entity reading * fix crop stomp breaking when no game switch or remix end is set * fix save shortcut fix loading charts with no music commit 4291333cb0491450a147da4de5541ce3bd6db7a6 Author: minenice55 Date: Sat Jun 10 23:00:30 2023 -0400 add updater for marching orders turn commit 82da6da741348f45610568141ddd4ba422f286f0 Merge: 52a4d2b6 411b9a3c Author: minenice55 Date: Sat Jun 10 22:36:10 2023 -0400 Merge branch 'release_1' into pr/458 commit 411b9a3cb1c46d79efebd7c04640ccbdb6928feb Merge: b6c222a9 afc665ed Author: minenice55 Date: Sat Jun 10 22:30:32 2023 -0400 Merge branch 'master' into release_1 commit b6c222a981a056e433d80757702b712097a88937 Author: minenice55 Date: Sat Jun 10 22:27:58 2023 -0400 editor fixes (#459) * ditch loading dialog doesn't show up when it's supposed to * format song offset in editor * remove VorbisPlugin * Update Editor.cs commit 52a4d2b65cde2c292df52cc14a9a8ae98214a1ed Author: AstrlJelly Date: Sat Jun 10 16:55:10 2023 -0400 convert float to double and all that commit aa8f531466706880a822d89cbd6a4c77f0c1ce6d Merge: 242b076f afc665ed Author: AstrlJelly Date: Sat Jun 10 16:01:44 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit 242b076f0994fe8ee8e553d66877711a9f57b6c2 Merge: db653d5a 2b0ced2f Author: AstrlJelly Date: Sat Jun 10 15:21:22 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit db653d5a5221b913a718081aa7f14655d91ac56b Author: AstrlJelly Date: Sat Jun 10 15:18:45 2023 -0400 a lot * munchy monk input + mustache fixes * fork lifter and pajama party bopping * meat grinder miss bop fix * cloud monkey Real * marching orders Go! was broken * force march doesn't break when it's too early from a game switch * you can use the March! block without the marching now commit 50a1b7bcdbb4cebf4247d1220e559db2cd0e44ac Author: minenice55 Date: Sat Jun 10 15:13:29 2023 -0400 Integration of Jukebox Library (#451) * add Jukebox library todo: - saving / loading of new format - inferrence of unknown data like past versions - move the temporary float casts to proper use of double - make sound related functions take double for timing - inform people that the Jukebox sound player was renamed to SoundByte lol * make sound, input scheduling, and super curve use double precision * successfully load charts * editor works again v1 riqs can be saved and loaded * first tempo and volume markers are unmovable fix loading of charts' easing values * use gsync / freesync * update Jukebox refs to SoundByte * game events use double part 1 Air Rally - Glee Club converted * don't load song if chart load fails * finish conversion of all minigames * remove editor waveform toggle * timeline now respects added song offset length clear cache files on app close prepped notes for dsp sync * update timeline length when offset changed * update to latest Jukebox * make error panel object in global game manager * improve conductor music scheduling * added error message box fix first game events sometimes not playing * Squashed commit of the following: commit 0d25221b71c3797a7447663f62e5b620898754fe Merge: 5869d212 9163085d Author: minenice55 Date: Sat Jun 17 16:40:52 2023 +0000 Merge pull request #478 from evdial/working-dough Working Dough Tweaks commit 9163085d7ab5bea1ab36d6c5659e08c968ecd87e Merge: 6592a5f2 5869d212 Author: minenice55 Date: Sat Jun 17 12:40:06 2023 -0400 Merge branch 'release_1' into pr/478 commit 5869d212bcc3de47aff18e0334f1919d54cd7fa2 Author: patata Date: Sat Jun 17 17:20:15 2023 +0200 Update issue template to include .riq/.zip info commit 6592a5f202f70bf483dd7274054dc0e9c6dd7b7f Author: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 15:05:07 2023 -0400 assbuns commit 11a4c090a1ee0122d369d61ebb1637a86bb433f6 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Thu Jun 15 20:56:40 2023 +0200 made small idle not crazy commit 45e7d81b0f32afc05022983e071ec8eab3b1d407 Author: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 14:33:57 2023 -0400 fsd commit 47efa3e4f38930b4bea2d6c04514603a97522e1b Author: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 14:16:38 2023 -0400 anim commit c6fb8880a0e8529e87b7f3b6dc4255ec676890db Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Thu Jun 15 20:13:11 2023 +0200 Fixed stuff also scaled now yippee commit 16ce508b03536aa82f2e3dbc616481d573c7d8bc Author: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 13:50:10 2023 -0400 many commit 37b80a33c7d242f35ca3dd65a8adc27f17c659e5 Author: minenice55 Date: Tue Jun 13 21:28:21 2023 -0400 Squashed commit of the following: (#474) commit 2c628a41093ab02d8dd26b246941c49e97c33aa7 Merge: 4fde418c 6246a144 Author: minenice55 Date: Wed Jun 14 01:23:31 2023 +0000 Merge pull request #473 from minenice55/easings-fix Enum Parsing Fix commit 6246a144b6c3b52d30df6616d62ab4456596b5c1 Author: minenice55 Date: Tue Jun 13 21:21:13 2023 -0400 fix all parsing of enums, removed the "special case" for eases update to latest Jukebox commit 4fde418c33d34ab9ed6ff18675d2bcaa7cbea63f Merge: b9043582 50bc8765 Author: minenice55 Date: Tue Jun 13 21:39:15 2023 +0000 Merge pull request #469 from minenice55/jukebox-update Jukebox Package Update commit b90435825af4901067545159e4a5201e30772684 Merge: eec3c09a 73e9efd4 Author: minenice55 Date: Tue Jun 13 21:39:08 2023 +0000 Merge pull request #458 from AstrlJelly/MiscAdditions_4 Bug Fixes + Feature Additions commit 73e9efd4b159d239d3e3bbbe3841382577779dc2 Author: minenice55 Date: Tue Jun 13 17:38:24 2023 -0400 add "updater" for the old marching entity commit b8d149743aebd1ff1f299d0ef4b7b7dbc430789c Merge: 4291333c eec3c09a Author: minenice55 Date: Tue Jun 13 17:22:01 2023 -0400 Merge branch 'release_1' into pr/458 commit 50bc876509762b7b9f551f66126b6e9c6f181ad4 Author: minenice55 Date: Tue Jun 13 16:55:02 2023 -0400 let play mode start if no song file is loaded fix issue with loading large audio files commit eec3c09aa892a04372ee2a6b94f0f0d4d186ef1d Merge: a0d70933 990af323 Author: minenice55 Date: Tue Jun 13 18:32:40 2023 +0000 Merge pull request #471 from Rapandrasmus/FixWorkingDoughCurve Fixed weird curve stuff on game switch in working dough commit 990af323792e23a7d9ccabacd19f0e650f6ed74e Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 19:24:13 2023 +0200 Fixed weird curve stuff on game switch in working dough commit a0d7093345214c690d6fd0f671cfcad26f62e057 Merge: bdef3f95 3d19e75e Author: minenice55 Date: Tue Jun 13 16:09:21 2023 +0000 Merge pull request #470 from Rapandrasmus/WorkingDoughFixes Fixed small balls not working in working dough commit 3d19e75e1a42eb1580f9769e84d6afa8a9332f61 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 18:07:13 2023 +0200 Fixed small balls not working in working dough commit bdef3f95c3c0f564d57bd048895e93ae7c3bef6f Merge: 8954b8c2 0bfafac6 Author: minenice55 Date: Tue Jun 13 14:56:58 2023 +0000 Merge pull request #467 from Rapandrasmus/WorkingDoughRework Working Dough rework commit 0bfafac6fe9af68547b92e48321e54dd0221f469 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:13:08 2023 +0200 modernised rockers pass turn commit d770266d8107e88f98311b824fce24e7222cb993 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:03:08 2023 +0200 Rhythm tweezers pass turn now works like working dough commit 2109c99a9585461c997fcb44fd3fd45b59c4134c Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 15:51:35 2023 +0200 gandw on balls has been added commit 785abf84862eef2b124bcad6fd8319ed757b1a70 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 14:59:56 2023 +0200 Proper inactive handling now commit 0a92b7bd690498a4d89e9db6c40c0cc126c07cd2 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:52:15 2023 +0200 OnSpawnBall reimplemented commit a14aacc181cebcc82faddee715960e80245c23d3 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:37:09 2023 +0200 new sounds commit 8b0544246dd4f9125bb1f512cb2c65b9593c2d82 Author: minenice55 Date: Mon Jun 12 17:18:37 2023 -0400 update Jukebox to latest version fixes for inferred entity loading commit d8ff6744c058ab2f93bd18f9456764e0451cbf85 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 21:36:57 2023 +0200 ball transporter anims for pass turn commit d283624b0705db36f351a113c00669b977dbde2e Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 20:38:48 2023 +0200 working dough converted, need to fix eveerything though commit 5b3c59eabd98959a5f9fdfce44a8f8e777bcce4f Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 18:36:41 2023 +0200 Converted everything to new curves and made playerballs handle themselves input-wise commit dee630ea45134c91388438a6930d807f53fdd595 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 14:04:32 2023 +0200 Some new curves commit 31e8890190a994c94183d9fad5eb2ee5dcd14d6c Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 12:03:21 2023 +0200 Rockers can do it too now commit 76bf6eefa65208f2856d30bf6acc75af6a5b9139 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 11:58:31 2023 +0200 You can now place inputs on top of pass turn for rhythm tweezers commit 8954b8c2690223e4e9cbcd456bc4c5bf5ad1cabb Merge: 743e954e ce3e6f2d Author: minenice55 Date: Sun Jun 11 15:55:40 2023 -0400 Merge branch 'master' into release_1 commit 743e954e05eefd75c7b7b951a71d70c1ba97c440 Merge: 5af551b3 8929cd56 Author: minenice55 Date: Sun Jun 11 19:53:47 2023 +0000 Merge pull request #465 from minenice55/dont_infer_track Don't infer the track field when importing converted v0 riq coming from unknown origin commit 8929cd5618d253682848e66dfdabd24066661000 Author: minenice55 Date: Sun Jun 11 15:52:14 2023 -0400 don't infer track when importing a v0 riq from another program commit 5af551b32eb33eb2505746afbc0e973175bc5d45 Author: minenice55 Date: Sun Jun 11 12:12:25 2023 -0400 make base datamodels for special entity reading (#463) * make base datamodels for special entity reading * fix crop stomp breaking when no game switch or remix end is set * fix save shortcut fix loading charts with no music commit 4291333cb0491450a147da4de5541ce3bd6db7a6 Author: minenice55 Date: Sat Jun 10 23:00:30 2023 -0400 add updater for marching orders turn commit 82da6da741348f45610568141ddd4ba422f286f0 Merge: 52a4d2b6 411b9a3c Author: minenice55 Date: Sat Jun 10 22:36:10 2023 -0400 Merge branch 'release_1' into pr/458 commit 411b9a3cb1c46d79efebd7c04640ccbdb6928feb Merge: b6c222a9 afc665ed Author: minenice55 Date: Sat Jun 10 22:30:32 2023 -0400 Merge branch 'master' into release_1 commit b6c222a981a056e433d80757702b712097a88937 Author: minenice55 Date: Sat Jun 10 22:27:58 2023 -0400 editor fixes (#459) * ditch loading dialog doesn't show up when it's supposed to * format song offset in editor * remove VorbisPlugin * Update Editor.cs commit 52a4d2b65cde2c292df52cc14a9a8ae98214a1ed Author: AstrlJelly Date: Sat Jun 10 16:55:10 2023 -0400 convert float to double and all that commit aa8f531466706880a822d89cbd6a4c77f0c1ce6d Merge: 242b076f afc665ed Author: AstrlJelly Date: Sat Jun 10 16:01:44 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit 242b076f0994fe8ee8e553d66877711a9f57b6c2 Merge: db653d5a 2b0ced2f Author: AstrlJelly Date: Sat Jun 10 15:21:22 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit db653d5a5221b913a718081aa7f14655d91ac56b Author: AstrlJelly Date: Sat Jun 10 15:18:45 2023 -0400 a lot * munchy monk input + mustache fixes * fork lifter and pajama party bopping * meat grinder miss bop fix * cloud monkey Real * marching orders Go! was broken * force march doesn't break when it's too early from a game switch * you can use the March! block without the marching now commit 50a1b7bcdbb4cebf4247d1220e559db2cd0e44ac Author: minenice55 Date: Sat Jun 10 15:13:29 2023 -0400 Integration of Jukebox Library (#451) * add Jukebox library todo: - saving / loading of new format - inferrence of unknown data like past versions - move the temporary float casts to proper use of double - make sound related functions take double for timing - inform people that the Jukebox sound player was renamed to SoundByte lol * make sound, input scheduling, and super curve use double precision * successfully load charts * editor works again v1 riqs can be saved and loaded * first tempo and volume markers are unmovable fix loading of charts' easing values * use gsync / freesync * update Jukebox refs to SoundByte * game events use double part 1 Air Rally - Glee Club converted * don't load song if chart load fails * finish conversion of all minigames * remove editor waveform toggle * timeline now respects added song offset length clear cache files on app close prepped notes for dsp sync * update timeline length when offset changed * update to latest Jukebox * make error panel object in global game manager * improve conductor music scheduling * added error message box fix first game events sometimes not playing commit 2c628a41093ab02d8dd26b246941c49e97c33aa7 Merge: 4fde418c 6246a144 Author: minenice55 Date: Wed Jun 14 01:23:31 2023 +0000 Merge pull request #473 from minenice55/easings-fix Enum Parsing Fix commit 6246a144b6c3b52d30df6616d62ab4456596b5c1 Author: minenice55 Date: Tue Jun 13 21:21:13 2023 -0400 fix all parsing of enums, removed the "special case" for eases update to latest Jukebox commit 4fde418c33d34ab9ed6ff18675d2bcaa7cbea63f Merge: b9043582 50bc8765 Author: minenice55 Date: Tue Jun 13 21:39:15 2023 +0000 Merge pull request #469 from minenice55/jukebox-update Jukebox Package Update commit b90435825af4901067545159e4a5201e30772684 Merge: eec3c09a 73e9efd4 Author: minenice55 Date: Tue Jun 13 21:39:08 2023 +0000 Merge pull request #458 from AstrlJelly/MiscAdditions_4 Bug Fixes + Feature Additions commit 73e9efd4b159d239d3e3bbbe3841382577779dc2 Author: minenice55 Date: Tue Jun 13 17:38:24 2023 -0400 add "updater" for the old marching entity commit b8d149743aebd1ff1f299d0ef4b7b7dbc430789c Merge: 4291333c eec3c09a Author: minenice55 Date: Tue Jun 13 17:22:01 2023 -0400 Merge branch 'release_1' into pr/458 commit 50bc876509762b7b9f551f66126b6e9c6f181ad4 Author: minenice55 Date: Tue Jun 13 16:55:02 2023 -0400 let play mode start if no song file is loaded fix issue with loading large audio files commit eec3c09aa892a04372ee2a6b94f0f0d4d186ef1d Merge: a0d70933 990af323 Author: minenice55 Date: Tue Jun 13 18:32:40 2023 +0000 Merge pull request #471 from Rapandrasmus/FixWorkingDoughCurve Fixed weird curve stuff on game switch in working dough commit 990af323792e23a7d9ccabacd19f0e650f6ed74e Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 19:24:13 2023 +0200 Fixed weird curve stuff on game switch in working dough commit a0d7093345214c690d6fd0f671cfcad26f62e057 Merge: bdef3f95 3d19e75e Author: minenice55 Date: Tue Jun 13 16:09:21 2023 +0000 Merge pull request #470 from Rapandrasmus/WorkingDoughFixes Fixed small balls not working in working dough commit 3d19e75e1a42eb1580f9769e84d6afa8a9332f61 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 18:07:13 2023 +0200 Fixed small balls not working in working dough commit bdef3f95c3c0f564d57bd048895e93ae7c3bef6f Merge: 8954b8c2 0bfafac6 Author: minenice55 Date: Tue Jun 13 14:56:58 2023 +0000 Merge pull request #467 from Rapandrasmus/WorkingDoughRework Working Dough rework commit 0bfafac6fe9af68547b92e48321e54dd0221f469 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:13:08 2023 +0200 modernised rockers pass turn commit d770266d8107e88f98311b824fce24e7222cb993 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:03:08 2023 +0200 Rhythm tweezers pass turn now works like working dough commit 2109c99a9585461c997fcb44fd3fd45b59c4134c Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 15:51:35 2023 +0200 gandw on balls has been added commit 785abf84862eef2b124bcad6fd8319ed757b1a70 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 14:59:56 2023 +0200 Proper inactive handling now commit 0a92b7bd690498a4d89e9db6c40c0cc126c07cd2 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:52:15 2023 +0200 OnSpawnBall reimplemented commit a14aacc181cebcc82faddee715960e80245c23d3 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:37:09 2023 +0200 new sounds commit 8b0544246dd4f9125bb1f512cb2c65b9593c2d82 Author: minenice55 Date: Mon Jun 12 17:18:37 2023 -0400 update Jukebox to latest version fixes for inferred entity loading commit d8ff6744c058ab2f93bd18f9456764e0451cbf85 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 21:36:57 2023 +0200 ball transporter anims for pass turn commit d283624b0705db36f351a113c00669b977dbde2e Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 20:38:48 2023 +0200 working dough converted, need to fix eveerything though commit 5b3c59eabd98959a5f9fdfce44a8f8e777bcce4f Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 18:36:41 2023 +0200 Converted everything to new curves and made playerballs handle themselves input-wise commit dee630ea45134c91388438a6930d807f53fdd595 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 14:04:32 2023 +0200 Some new curves commit 31e8890190a994c94183d9fad5eb2ee5dcd14d6c Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 12:03:21 2023 +0200 Rockers can do it too now commit 76bf6eefa65208f2856d30bf6acc75af6a5b9139 Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 11:58:31 2023 +0200 You can now place inputs on top of pass turn for rhythm tweezers commit 8954b8c2690223e4e9cbcd456bc4c5bf5ad1cabb Merge: 743e954e ce3e6f2d Author: minenice55 Date: Sun Jun 11 15:55:40 2023 -0400 Merge branch 'master' into release_1 commit 743e954e05eefd75c7b7b951a71d70c1ba97c440 Merge: 5af551b3 8929cd56 Author: minenice55 Date: Sun Jun 11 19:53:47 2023 +0000 Merge pull request #465 from minenice55/dont_infer_track Don't infer the track field when importing converted v0 riq coming from unknown origin commit 8929cd5618d253682848e66dfdabd24066661000 Author: minenice55 Date: Sun Jun 11 15:52:14 2023 -0400 don't infer track when importing a v0 riq from another program commit 5af551b32eb33eb2505746afbc0e973175bc5d45 Author: minenice55 Date: Sun Jun 11 12:12:25 2023 -0400 make base datamodels for special entity reading (#463) * make base datamodels for special entity reading * fix crop stomp breaking when no game switch or remix end is set * fix save shortcut fix loading charts with no music commit 4291333cb0491450a147da4de5541ce3bd6db7a6 Author: minenice55 Date: Sat Jun 10 23:00:30 2023 -0400 add updater for marching orders turn commit 82da6da741348f45610568141ddd4ba422f286f0 Merge: 52a4d2b6 411b9a3c Author: minenice55 Date: Sat Jun 10 22:36:10 2023 -0400 Merge branch 'release_1' into pr/458 commit 411b9a3cb1c46d79efebd7c04640ccbdb6928feb Merge: b6c222a9 afc665ed Author: minenice55 Date: Sat Jun 10 22:30:32 2023 -0400 Merge branch 'master' into release_1 commit b6c222a981a056e433d80757702b712097a88937 Author: minenice55 Date: Sat Jun 10 22:27:58 2023 -0400 editor fixes (#459) * ditch loading dialog doesn't show up when it's supposed to * format song offset in editor * remove VorbisPlugin * Update Editor.cs commit 52a4d2b65cde2c292df52cc14a9a8ae98214a1ed Author: AstrlJelly Date: Sat Jun 10 16:55:10 2023 -0400 convert float to double and all that commit aa8f531466706880a822d89cbd6a4c77f0c1ce6d Merge: 242b076f afc665ed Author: AstrlJelly Date: Sat Jun 10 16:01:44 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit 242b076f0994fe8ee8e553d66877711a9f57b6c2 Merge: db653d5a 2b0ced2f Author: AstrlJelly Date: Sat Jun 10 15:21:22 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit db653d5a5221b913a718081aa7f14655d91ac56b Author: AstrlJelly Date: Sat Jun 10 15:18:45 2023 -0400 a lot * munchy monk input + mustache fixes * fork lifter and pajama party bopping * meat grinder miss bop fix * cloud monkey Real * marching orders Go! was broken * force march doesn't break when it's too early from a game switch * you can use the March! block without the marching now commit 50a1b7bcdbb4cebf4247d1220e559db2cd0e44ac Author: minenice55 Date: Sat Jun 10 15:13:29 2023 -0400 Integration of Jukebox Library (#451) * add Jukebox library todo: - saving / loading of new format - inferrence of unknown data like past versions - move the temporary float casts to proper use of double - make sound related functions take double for timing - inform people that the Jukebox sound player was renamed to SoundByte lol * make sound, input scheduling, and super curve use double precision * successfully load charts * editor works again v1 riqs can be saved and loaded * first tempo and volume markers are unmovable fix loading of charts' easing values * use gsync / freesync * update Jukebox refs to SoundByte * game events use double part 1 Air Rally - Glee Club converted * don't load song if chart load fails * finish conversion of all minigames * remove editor waveform toggle * timeline now respects added song offset length clear cache files on app close prepped notes for dsp sync * update timeline length when offset changed * update to latest Jukebox * make error panel object in global game manager * improve conductor music scheduling * added error message box fix first game events sometimes not playing * Editor Additions (#479) * favoriting and pick block favoriting needs to not break after previewing (maybe make it persistent in the settings file?) pick block needs to pick the icon, too. and preferably scroll to it as well * final star anim + automatic icon game switching before i make any more changes im making a checkpoint here cuz i know it works * i want to add a way to specify which event SwitchGame() will switch to (because that's a cool feature for pick block) * i'll have to figure out how to auto scroll to the game when the icon is selected * the star now fully works, even between preview switches :+1: * fix the rest of the stuff the event name gets colored correctly and hidden games are skipped over, but still loaded. also i built mm ass buns * tweaks + zoom and sorting this stuff will be in the pr desc so it doesn't matter * oop one more thing * icons look better now :D mipmaps to the rescue * double date fix * Merge pull request #486 from RHeavenStudio/actions_rework Rework GitHub Actions and build script * add ab meta to gitignore (#489) * Sound Scheduling Improvements (#491) * port conductor adjustments * scheduled sounds prebake * allow aiff files to be imported add vbr mp3 warning to readme * improve wording * CNR API Internal Rework (#488) * Prep stuff * Tweezers now spawn in * Started converting tweezers * I hate <1 beat intervals * Actually nvm * fixed a bug * You can chain intervals now, stack them if you really wanted * Pass turn checks if crhandlerinstance exists * Fixed hairs being deleted by onion switch * Rockers rerewritten * working dough rerewritten * CNR API Internal Rework (#488) * Prep stuff * Tweezers now spawn in * Started converting tweezers * I hate <1 beat intervals * Actually nvm * fixed a bug * You can chain intervals now, stack them if you really wanted * Pass turn checks if crhandlerinstance exists * Fixed hairs being deleted by onion switch * Rockers rerewritten * working dough rerewritten * Games fixes/reworks patch (#501) * ghosts are scaled now * Lockstep fully reworked * mr. bach has been implemented * Space dance fixes * oops * Tap trial rework part 1 * tap trial rework part 2 * oopsie * Gramps Talk Update * Space Dance Voice Offsets * Giraffe done! (Except miss anim) * bg is not showing up for some reason * bg not rendering fixed + giraffe fixed * scrolling done * fixed space dance and space soccer bg scrolls * fixed rockers bugs * adjustment * fixed el inaccuracies * particle fix * changed pitch and volume of monkey tap * miss anim * megamix face for girl * Proper miss anim implementation * Added force stepping event * miss anim fix --------- Co-authored-by: saladplainzone Co-authored-by: ev <85412919+evdial@users.noreply.github.com> * In CheerReaders.cs, quotation marks were aptly added, and references to the girls were more-so neutralized. Consider this my cheer. * revert capitalization and quotations while keeping grammar changes --------- Co-authored-by: minenice55 Co-authored-by: patata Co-authored-by: AstrlJelly Co-authored-by: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Co-authored-by: saladplainzone Co-authored-by: ev <85412919+evdial@users.noreply.github.com> * oops * add manually triggering build action to workflows (#507) * don't crash if origin is undefined (#513) reword the unknown origin message to be less scary * test action to free space (#516) * maybe not this * clear out unused tools before run * we do need a swap file * Mr. Upbeat Re-Re-Rework (#525) * so much * reworked everything (AGAIN.) -everything just uses recursive methods and beatactions, and only uses the update loop for inactive queuing * count-ins -need hq 4 sound effect, kitties doesn't have the og :( * mr. downbeat rere-revived (unfortunately enough.) * huge change to how stepping works, to make it so you can't step over it the wrong way, and so that missing looks good * added missing miss anim, which happens in the same way as the og * added a check on game switch to use the last bg change/blip color block's attributes -i think i might add these to other games; it should make the process of remixing more intuitive and fun, even if it's a small change currently all i'm missing is blip jank fix. but im not staying up another hour for that lol * letter/blip jank fixed + force stepping * instead of being a separate animator, the letter is instead set to have a scale of (1, 1, 1) in the update loop, so that no graphical bugs happen even when the scale is changed. * hopefully this new system is a lot less janky, but if bugs do still come up they'll be a lot easier to fix now * make mac build script put streamingassets in the right place * Release game's render texture before resizing it (#548) * update package cache * remove unused windows forms reference(??) * remove unneeded using directives * update Jukebox * stub out fork lifter bob * Child/BG/Objects done guhhh * Oh my god samurai slice looks good now! except unstep * fix unstep add notes for splat * Add Splat Anims/Sound * splat * properly snap debris to hands * denied the high school prep squad from yelling so hard it starts to destroy the universe * Couple audio fixes - sneaky spirits laugh - tram n pauline new sounds and panning * octo machine release sound trim * goodened lockstep voice offsets * Ringside Sound Overhaul * Munchy Monk Offset fix * i did an oopsy * Launch Party Parallax * new icons * misc samurai fixes - weird hand rotation - obj size - melon color * Fixed Hand i fixed it * Rebalancing Lockstep Lowered Space Soccer Lowered Tap Troupe Lowered Quiz Show Raised Tram Pauline Raised Toss Boys Raised See Saw Lowered Glee Club Lowered Munchy Monk Lowered TOTC Lowered Somen Lowered Contact Lowered Mr Upbeat Raised * Glee Club Wave Loop Fix fuuuuck dude haaaaahahahaaa --------- Co-authored-by: minenice55 Co-authored-by: patata Co-authored-by: AstrlJelly Co-authored-by: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Co-authored-by: ev <85412919+evdial@users.noreply.github.com> Co-authored-by: Xylon <40894547+scriptorluminary@users.noreply.github.com> Co-authored-by: Braedon Lewis --- Assets/Resources/Games/launchParty.prefab | 26 +- Assets/Resources/Games/munchyMonk.prefab | 16 +- Assets/Resources/Games/samuraiSliceNtr.prefab | 7 +- Assets/Resources/Sfx/games/ringside/new.meta | 8 + .../Sfx/games/ringside/new/badpose_1.wav.meta | 22 + .../Sfx/games/ringside/new/badpose_2.wav.meta | 22 + .../Sfx/games/ringside/new/badpose_3.wav.meta | 22 + .../Sfx/games/ringside/new/badpose_4.wav.meta | 22 + .../Sfx/games/ringside/new/badpose_5.wav.meta | 22 + .../Sfx/games/ringside/new/badpose_6.wav.meta | 22 + .../Sfx/games/ringside/new/badpose_7.wav.meta | 22 + .../games/ringside/new/bigguy_var1_1.wav.meta | 22 + .../games/ringside/new/bigguy_var1_2.wav.meta | 22 + .../games/ringside/new/bigguy_var1_3.wav.meta | 22 + .../games/ringside/new/bigguy_var1_4.wav.meta | 22 + .../games/ringside/new/bigguy_var1_5.wav.meta | 22 + .../games/ringside/new/bigguy_var2_1.wav.meta | 22 + .../games/ringside/new/bigguy_var2_2.wav.meta | 22 + .../games/ringside/new/bigguy_var2_3.wav.meta | 22 + .../games/ringside/new/bigguy_var2_4.wav.meta | 22 + .../games/ringside/new/bigguy_var2_5.wav.meta | 22 + .../games/ringside/new/bigguy_var3_1.wav.meta | 22 + .../games/ringside/new/bigguy_var3_2.wav.meta | 22 + .../games/ringside/new/bigguy_var3_3.wav.meta | 22 + .../games/ringside/new/bigguy_var3_4.wav.meta | 22 + .../games/ringside/new/bigguy_var3_5.wav.meta | 22 + .../games/ringside/new/mic_swoosh.wav.meta | 22 + .../Sfx/games/ringside/new/pose_and.wav.meta | 22 + .../games/ringside/new/pose_var1_1.wav.meta | 22 + .../games/ringside/new/pose_var1_2.wav.meta | 22 + .../games/ringside/new/pose_var1_3.wav.meta | 22 + .../games/ringside/new/pose_var1_4.wav.meta | 22 + .../games/ringside/new/pose_var1_5.wav.meta | 22 + .../games/ringside/new/pose_var1_6.wav.meta | 22 + .../games/ringside/new/pose_var2_1.wav.meta | 22 + .../games/ringside/new/pose_var2_2.wav.meta | 22 + .../games/ringside/new/pose_var2_3.wav.meta | 22 + .../games/ringside/new/pose_var2_4.wav.meta | 22 + .../games/ringside/new/pose_var2_5.wav.meta | 22 + .../games/ringside/new/pose_var2_6.wav.meta | 22 + .../games/ringside/new/wubdub_konk_1.wav.meta | 22 + .../games/ringside/new/wubdub_konk_2.wav.meta | 22 + .../games/ringside/new/wubdub_konk_3.wav.meta | 22 + .../games/ringside/new/wubdub_var1_1.wav.meta | 22 + .../games/ringside/new/wubdub_var1_2.wav.meta | 22 + .../games/ringside/new/wubdub_var1_3.wav.meta | 22 + .../games/ringside/new/wubdub_var1_4.wav.meta | 22 + .../games/ringside/new/wubdub_var1_5.wav.meta | 22 + .../games/ringside/new/wubdub_var1_6.wav.meta | 22 + .../games/ringside/new/wubdub_var1_7.wav.meta | 22 + .../games/ringside/new/wubdub_var1_8.wav.meta | 22 + .../games/ringside/new/wubdub_var2_1.wav.meta | 22 + .../games/ringside/new/wubdub_var2_2.wav.meta | 22 + .../games/ringside/new/wubdub_var2_3.wav.meta | 22 + .../games/ringside/new/wubdub_var2_4.wav.meta | 22 + .../games/ringside/new/wubdub_var2_5.wav.meta | 22 + .../games/ringside/new/wubdub_var2_6.wav.meta | 22 + .../games/ringside/new/wubdub_var2_7.wav.meta | 22 + .../games/ringside/new/wubdub_var2_8.wav.meta | 22 + .../games/ringside/new/wubdub_var3_1.wav.meta | 22 + .../games/ringside/new/wubdub_var3_2.wav.meta | 22 + .../games/ringside/new/wubdub_var3_3.wav.meta | 22 + .../games/ringside/new/wubdub_var3_4.wav.meta | 22 + .../games/ringside/new/wubdub_var3_5.wav.meta | 22 + .../games/ringside/new/wubdub_var3_6.wav.meta | 22 + .../games/ringside/new/wubdub_var3_7.wav.meta | 22 + .../games/ringside/new/wubdub_var3_8.wav.meta | 22 + .../Sfx/games/tramAndPauline/jumpL1.ogg.meta | 22 + .../Sfx/games/tramAndPauline/jumpL2.ogg.meta | 22 + .../Sfx/games/tramAndPauline/jumpR1.ogg.meta | 22 + .../Sfx/games/tramAndPauline/jumpR2.ogg.meta | 22 + .../SamuraiSliceNtr/Anime/Samurai/Beat.anim | 116 +++++- .../SamuraiSliceNtr/Anime/Samurai/NoPose.anim | 116 +++++- .../SamuraiSliceNtr/Anime/Samurai/Slash.anim | 382 +++++++++++++----- .../SamuraiSliceNtr/Anime/Samurai/Step.anim | 114 +++++- .../SamuraiSliceNtr/Anime/Samurai/Unstep.anim | 170 +++++++- Assets/Scripts/Games/Lockstep/Lockstep.cs | 36 +- Assets/Scripts/Games/Ringside/Ringside.cs | 53 +-- .../Games/SneakySpirits/SneakySpirits.cs | 2 +- .../Games/TramAndPauline/TramAndPauline.cs | 4 +- 80 files changed, 2335 insertions(+), 189 deletions(-) create mode 100644 Assets/Resources/Sfx/games/ringside/new.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/badpose_1.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/badpose_2.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/badpose_3.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/badpose_4.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/badpose_5.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/badpose_6.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/badpose_7.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/bigguy_var1_1.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/bigguy_var1_2.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/bigguy_var1_3.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/bigguy_var1_4.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/bigguy_var1_5.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/bigguy_var2_1.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/bigguy_var2_2.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/bigguy_var2_3.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/bigguy_var2_4.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/bigguy_var2_5.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/bigguy_var3_1.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/bigguy_var3_2.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/bigguy_var3_3.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/bigguy_var3_4.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/bigguy_var3_5.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/mic_swoosh.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/pose_and.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/pose_var1_1.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/pose_var1_2.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/pose_var1_3.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/pose_var1_4.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/pose_var1_5.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/pose_var1_6.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/pose_var2_1.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/pose_var2_2.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/pose_var2_3.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/pose_var2_4.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/pose_var2_5.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/pose_var2_6.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/wubdub_konk_1.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/wubdub_konk_2.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/wubdub_konk_3.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/wubdub_var1_1.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/wubdub_var1_2.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/wubdub_var1_3.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/wubdub_var1_4.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/wubdub_var1_5.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/wubdub_var1_6.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/wubdub_var1_7.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/wubdub_var1_8.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/wubdub_var2_1.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/wubdub_var2_2.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/wubdub_var2_3.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/wubdub_var2_4.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/wubdub_var2_5.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/wubdub_var2_6.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/wubdub_var2_7.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/wubdub_var2_8.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/wubdub_var3_1.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/wubdub_var3_2.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/wubdub_var3_3.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/wubdub_var3_4.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/wubdub_var3_5.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/wubdub_var3_6.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/wubdub_var3_7.wav.meta create mode 100644 Assets/Resources/Sfx/games/ringside/new/wubdub_var3_8.wav.meta create mode 100644 Assets/Resources/Sfx/games/tramAndPauline/jumpL1.ogg.meta create mode 100644 Assets/Resources/Sfx/games/tramAndPauline/jumpL2.ogg.meta create mode 100644 Assets/Resources/Sfx/games/tramAndPauline/jumpR1.ogg.meta create mode 100644 Assets/Resources/Sfx/games/tramAndPauline/jumpR2.ogg.meta diff --git a/Assets/Resources/Games/launchParty.prefab b/Assets/Resources/Games/launchParty.prefab index a7740d08..c22fe67d 100644 --- a/Assets/Resources/Games/launchParty.prefab +++ b/Assets/Resources/Games/launchParty.prefab @@ -1574,7 +1574,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1502138646470043659} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 2.18} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -2461,7 +2461,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2198155337455343688} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -2.3} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -2672,7 +2672,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2364807215172239617} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 2.18} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -3054,7 +3054,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2591902619112967187} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -2.3} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -3601,7 +3601,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3268905332919582678} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 2.18} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -4403,7 +4403,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3827916254657136956} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -2.3} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -4446,7 +4446,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3935916386830708752} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -2.3} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -6275,7 +6275,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6093695872543899040} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 2.18} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -7246,7 +7246,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6561292846486288656} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.101, y: 0.194, z: 0} + m_LocalPosition: {x: -1.101, y: 0.194, z: -0.084} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -7749,7 +7749,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7278122616026706364} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 2.18} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -8384,7 +8384,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7858878317832744708} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 2.18} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -8514,7 +8514,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8112509877096007021} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -2.3} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -9313,7 +9313,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8724844040395206150} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -2.3} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/Resources/Games/munchyMonk.prefab b/Assets/Resources/Games/munchyMonk.prefab index 81a00aa8..c50e0950 100644 --- a/Assets/Resources/Games/munchyMonk.prefab +++ b/Assets/Resources/Games/munchyMonk.prefab @@ -3541,14 +3541,14 @@ MonoBehaviour: pitch: 1 volume: 1 looping: 0 - offset: 0 + offset: 0.038 parameters: [] - clip: munchyMonk/one_2 beat: 1 pitch: 1 volume: 1 looping: 0 - offset: 0 + offset: 0.012 parameters: [] - name: two_go sequence: @@ -3574,14 +3574,14 @@ MonoBehaviour: pitch: 1 volume: 1 looping: 0 - offset: 0 + offset: 0.012 parameters: [] - clip: munchyMonk/two_4 beat: 1.5 pitch: 1 volume: 1 looping: 0 - offset: 0 + offset: 0.012 parameters: [] - name: three_go sequence: @@ -3593,28 +3593,28 @@ MonoBehaviour: pitch: 1 volume: 1 looping: 0 - offset: 0 + offset: 0.069 parameters: [] - clip: munchyMonk/three_2 beat: 1 pitch: 1 volume: 1 looping: 0 - offset: 0 + offset: 0.016 parameters: [] - clip: munchyMonk/three_3 beat: 2 pitch: 1 volume: 1 looping: 0 - offset: 0 + offset: 0.025 parameters: [] - clip: munchyMonk/three_4 beat: 3 pitch: 1 volume: 1 looping: 0 - offset: 0 + offset: 0.015 parameters: [] scheduledInputs: [] dumplings: [] diff --git a/Assets/Resources/Games/samuraiSliceNtr.prefab b/Assets/Resources/Games/samuraiSliceNtr.prefab index cf87791c..5b545740 100644 --- a/Assets/Resources/Games/samuraiSliceNtr.prefab +++ b/Assets/Resources/Games/samuraiSliceNtr.prefab @@ -1014,7 +1014,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 907170206961966871} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.478, y: 0.486, z: -0.001} + m_LocalPosition: {x: 0.537, y: 0.537, z: -0.001} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -6680,7 +6680,7 @@ Transform: m_GameObject: {fileID: 1404833178906827570} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.85, y: 0.85, z: 0.85} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: - {fileID: 5589869724872896603} @@ -6704,7 +6704,6 @@ MonoBehaviour: pickelBurstSplat: {fileID: 2565932505832932526} anim: {fileID: 6574142642051032078} secondHalf: {fileID: 0} - floorHeight: -5.65 doubleLaunchPos: {fileID: 16156449826625334} heldPos: {fileID: 0} startBeat: 0 @@ -13040,7 +13039,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3625395986258989249} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.478, y: 0.486, z: -0.001} + m_LocalPosition: {x: -0.537, y: 0.537, z: -0.001} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Resources/Sfx/games/ringside/new.meta b/Assets/Resources/Sfx/games/ringside/new.meta new file mode 100644 index 00000000..d25b61b4 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 830fff114630f16438fe0f2cae3c62ef +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/badpose_1.wav.meta b/Assets/Resources/Sfx/games/ringside/new/badpose_1.wav.meta new file mode 100644 index 00000000..1793a861 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/badpose_1.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 9e5b5bbebe893e646a3e9ad796a056e6 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/badpose_2.wav.meta b/Assets/Resources/Sfx/games/ringside/new/badpose_2.wav.meta new file mode 100644 index 00000000..49ca9584 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/badpose_2.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 3ffe4834911d92945a01ef1b692d7bd9 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/badpose_3.wav.meta b/Assets/Resources/Sfx/games/ringside/new/badpose_3.wav.meta new file mode 100644 index 00000000..0804370f --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/badpose_3.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 174eef19581f80848bf7038f3c8e0f6c +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/badpose_4.wav.meta b/Assets/Resources/Sfx/games/ringside/new/badpose_4.wav.meta new file mode 100644 index 00000000..57bb6b93 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/badpose_4.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 1dfa1f8d0cf6cc3479aa7c8bcbc78e1b +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/badpose_5.wav.meta b/Assets/Resources/Sfx/games/ringside/new/badpose_5.wav.meta new file mode 100644 index 00000000..560f6180 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/badpose_5.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 3fd7b2390ec327e4f8b94d2612315174 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/badpose_6.wav.meta b/Assets/Resources/Sfx/games/ringside/new/badpose_6.wav.meta new file mode 100644 index 00000000..26361e7d --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/badpose_6.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 8c83a51bc004179489d881fb55e33092 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/badpose_7.wav.meta b/Assets/Resources/Sfx/games/ringside/new/badpose_7.wav.meta new file mode 100644 index 00000000..aeef7e3a --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/badpose_7.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 89d5488da28678a43a30c10308575537 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/bigguy_var1_1.wav.meta b/Assets/Resources/Sfx/games/ringside/new/bigguy_var1_1.wav.meta new file mode 100644 index 00000000..0af2d810 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/bigguy_var1_1.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: dfd46380dbe92074188fbb58846b3718 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/bigguy_var1_2.wav.meta b/Assets/Resources/Sfx/games/ringside/new/bigguy_var1_2.wav.meta new file mode 100644 index 00000000..1b12db6b --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/bigguy_var1_2.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 87e1a0be7ec1454489523b6e8859a8b7 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/bigguy_var1_3.wav.meta b/Assets/Resources/Sfx/games/ringside/new/bigguy_var1_3.wav.meta new file mode 100644 index 00000000..ed4bf1d8 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/bigguy_var1_3.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 1db7755f6bc564b438cb9125e6f87817 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/bigguy_var1_4.wav.meta b/Assets/Resources/Sfx/games/ringside/new/bigguy_var1_4.wav.meta new file mode 100644 index 00000000..53d792da --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/bigguy_var1_4.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: c7c558fed28912b4f9f89216f8e0cca3 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/bigguy_var1_5.wav.meta b/Assets/Resources/Sfx/games/ringside/new/bigguy_var1_5.wav.meta new file mode 100644 index 00000000..e318553f --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/bigguy_var1_5.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: fb1286a8ff431724185056508a05f7b4 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/bigguy_var2_1.wav.meta b/Assets/Resources/Sfx/games/ringside/new/bigguy_var2_1.wav.meta new file mode 100644 index 00000000..284022d9 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/bigguy_var2_1.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 878293504fa2ff040bcd86b57ac1dbef +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/bigguy_var2_2.wav.meta b/Assets/Resources/Sfx/games/ringside/new/bigguy_var2_2.wav.meta new file mode 100644 index 00000000..3e316acc --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/bigguy_var2_2.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 45d39e5905150504c9d3fd9cd12e55b9 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/bigguy_var2_3.wav.meta b/Assets/Resources/Sfx/games/ringside/new/bigguy_var2_3.wav.meta new file mode 100644 index 00000000..6e23ed31 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/bigguy_var2_3.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: a83b53c21d0650340977a03104647d25 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/bigguy_var2_4.wav.meta b/Assets/Resources/Sfx/games/ringside/new/bigguy_var2_4.wav.meta new file mode 100644 index 00000000..f9fba015 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/bigguy_var2_4.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 36b71aee2cc64d0459f014a59d4a9deb +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/bigguy_var2_5.wav.meta b/Assets/Resources/Sfx/games/ringside/new/bigguy_var2_5.wav.meta new file mode 100644 index 00000000..d013d85b --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/bigguy_var2_5.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: c2ab65ed6542902458f9503daf65c052 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/bigguy_var3_1.wav.meta b/Assets/Resources/Sfx/games/ringside/new/bigguy_var3_1.wav.meta new file mode 100644 index 00000000..2f051935 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/bigguy_var3_1.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 24582d8a3559bb848be31a8170202c28 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/bigguy_var3_2.wav.meta b/Assets/Resources/Sfx/games/ringside/new/bigguy_var3_2.wav.meta new file mode 100644 index 00000000..115dbd1b --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/bigguy_var3_2.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: ee62e9bafac5c5d49b4a114cecbee991 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/bigguy_var3_3.wav.meta b/Assets/Resources/Sfx/games/ringside/new/bigguy_var3_3.wav.meta new file mode 100644 index 00000000..52660b5b --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/bigguy_var3_3.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: eb3281e0f02bab84a9a86fc281eb683e +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/bigguy_var3_4.wav.meta b/Assets/Resources/Sfx/games/ringside/new/bigguy_var3_4.wav.meta new file mode 100644 index 00000000..ff332ee8 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/bigguy_var3_4.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 2897313e1162880488a108ae2f651b1a +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/bigguy_var3_5.wav.meta b/Assets/Resources/Sfx/games/ringside/new/bigguy_var3_5.wav.meta new file mode 100644 index 00000000..50655f92 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/bigguy_var3_5.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: ce7f12f2b9044a742ac669eacbc79c1c +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/mic_swoosh.wav.meta b/Assets/Resources/Sfx/games/ringside/new/mic_swoosh.wav.meta new file mode 100644 index 00000000..e44fad07 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/mic_swoosh.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 776b9370ad911a1468a4aacae1d6d72c +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/pose_and.wav.meta b/Assets/Resources/Sfx/games/ringside/new/pose_and.wav.meta new file mode 100644 index 00000000..4a3a02ff --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/pose_and.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 81d8cf40c58d59442a6299c45a21c0b8 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/pose_var1_1.wav.meta b/Assets/Resources/Sfx/games/ringside/new/pose_var1_1.wav.meta new file mode 100644 index 00000000..d08a0ba7 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/pose_var1_1.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 2a4300b89653ce74dbe8a04a0e523fa9 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/pose_var1_2.wav.meta b/Assets/Resources/Sfx/games/ringside/new/pose_var1_2.wav.meta new file mode 100644 index 00000000..b6b77f07 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/pose_var1_2.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 57255800cdf71354993160eab17c7b29 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/pose_var1_3.wav.meta b/Assets/Resources/Sfx/games/ringside/new/pose_var1_3.wav.meta new file mode 100644 index 00000000..c0d9117f --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/pose_var1_3.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 87349b6da282799489c6d2b2d4deec8e +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/pose_var1_4.wav.meta b/Assets/Resources/Sfx/games/ringside/new/pose_var1_4.wav.meta new file mode 100644 index 00000000..779625b2 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/pose_var1_4.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: f4efeb2e4b2fba141837ded868e101db +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/pose_var1_5.wav.meta b/Assets/Resources/Sfx/games/ringside/new/pose_var1_5.wav.meta new file mode 100644 index 00000000..89e874cb --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/pose_var1_5.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 65e06d747b7e47d4980db160a362867e +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/pose_var1_6.wav.meta b/Assets/Resources/Sfx/games/ringside/new/pose_var1_6.wav.meta new file mode 100644 index 00000000..79b9b4ff --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/pose_var1_6.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: b77236d25dd16114eb18c4f9c5069953 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/pose_var2_1.wav.meta b/Assets/Resources/Sfx/games/ringside/new/pose_var2_1.wav.meta new file mode 100644 index 00000000..c855f74d --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/pose_var2_1.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 8c49af1f96a71cc4da0d5c6a80728420 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/pose_var2_2.wav.meta b/Assets/Resources/Sfx/games/ringside/new/pose_var2_2.wav.meta new file mode 100644 index 00000000..3abdf9b7 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/pose_var2_2.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: bd475c40e17bbc3429b64ebd00772bc0 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/pose_var2_3.wav.meta b/Assets/Resources/Sfx/games/ringside/new/pose_var2_3.wav.meta new file mode 100644 index 00000000..b85c4e20 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/pose_var2_3.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 9125307b3750b69469a3f0570f1929fc +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/pose_var2_4.wav.meta b/Assets/Resources/Sfx/games/ringside/new/pose_var2_4.wav.meta new file mode 100644 index 00000000..043186a5 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/pose_var2_4.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: f47dc63d5c258a94ba020955b68a610e +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/pose_var2_5.wav.meta b/Assets/Resources/Sfx/games/ringside/new/pose_var2_5.wav.meta new file mode 100644 index 00000000..56938a2e --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/pose_var2_5.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 175142ab6747dd240a0c861ac8a1be8e +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/pose_var2_6.wav.meta b/Assets/Resources/Sfx/games/ringside/new/pose_var2_6.wav.meta new file mode 100644 index 00000000..97c4af9a --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/pose_var2_6.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 98e7299a67615f04b8dd798cd639180c +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/wubdub_konk_1.wav.meta b/Assets/Resources/Sfx/games/ringside/new/wubdub_konk_1.wav.meta new file mode 100644 index 00000000..5f905e70 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/wubdub_konk_1.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 6dcfe4c0da2d65147adb18eaebc545f2 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/wubdub_konk_2.wav.meta b/Assets/Resources/Sfx/games/ringside/new/wubdub_konk_2.wav.meta new file mode 100644 index 00000000..3d813286 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/wubdub_konk_2.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 95b1cba1a7ec7d442bddf181591a23d2 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/wubdub_konk_3.wav.meta b/Assets/Resources/Sfx/games/ringside/new/wubdub_konk_3.wav.meta new file mode 100644 index 00000000..0c1eed6d --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/wubdub_konk_3.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 5e21a79f2c062b44b9bf0b177d69cd5c +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/wubdub_var1_1.wav.meta b/Assets/Resources/Sfx/games/ringside/new/wubdub_var1_1.wav.meta new file mode 100644 index 00000000..67111a19 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/wubdub_var1_1.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 352b3b5465351354a84c4ccec2a57d1b +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/wubdub_var1_2.wav.meta b/Assets/Resources/Sfx/games/ringside/new/wubdub_var1_2.wav.meta new file mode 100644 index 00000000..211195fc --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/wubdub_var1_2.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 1542770305d226044aa9f95287209ec8 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/wubdub_var1_3.wav.meta b/Assets/Resources/Sfx/games/ringside/new/wubdub_var1_3.wav.meta new file mode 100644 index 00000000..7b38bcb9 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/wubdub_var1_3.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: adf7c006778a0be44b460b1c0ced48c9 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/wubdub_var1_4.wav.meta b/Assets/Resources/Sfx/games/ringside/new/wubdub_var1_4.wav.meta new file mode 100644 index 00000000..41731eae --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/wubdub_var1_4.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: eff1718d762250047a9b6489251a2783 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/wubdub_var1_5.wav.meta b/Assets/Resources/Sfx/games/ringside/new/wubdub_var1_5.wav.meta new file mode 100644 index 00000000..12ecfca3 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/wubdub_var1_5.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: f0525e1edb884e34eb8e03546d2d818f +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/wubdub_var1_6.wav.meta b/Assets/Resources/Sfx/games/ringside/new/wubdub_var1_6.wav.meta new file mode 100644 index 00000000..60425f10 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/wubdub_var1_6.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: f2756b7cb5f41b94f8ede3005b66ce04 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/wubdub_var1_7.wav.meta b/Assets/Resources/Sfx/games/ringside/new/wubdub_var1_7.wav.meta new file mode 100644 index 00000000..63f14c79 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/wubdub_var1_7.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 6f5790c84c02efc4688f96e58ec3a267 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/wubdub_var1_8.wav.meta b/Assets/Resources/Sfx/games/ringside/new/wubdub_var1_8.wav.meta new file mode 100644 index 00000000..5f98f839 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/wubdub_var1_8.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: b8c67c70e7be534418d3bc3c255fb425 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/wubdub_var2_1.wav.meta b/Assets/Resources/Sfx/games/ringside/new/wubdub_var2_1.wav.meta new file mode 100644 index 00000000..d33325d7 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/wubdub_var2_1.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 4c4a2580df5bf704c9e20225aba1ae9d +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/wubdub_var2_2.wav.meta b/Assets/Resources/Sfx/games/ringside/new/wubdub_var2_2.wav.meta new file mode 100644 index 00000000..ecae83f0 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/wubdub_var2_2.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 9896cb2d0559f5c4eadbda903e5df03f +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/wubdub_var2_3.wav.meta b/Assets/Resources/Sfx/games/ringside/new/wubdub_var2_3.wav.meta new file mode 100644 index 00000000..dcfb9a11 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/wubdub_var2_3.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 2df4300502a9fcf47af0ec337459a606 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/wubdub_var2_4.wav.meta b/Assets/Resources/Sfx/games/ringside/new/wubdub_var2_4.wav.meta new file mode 100644 index 00000000..e642159a --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/wubdub_var2_4.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: c2fc0530a4b0482438d6610348cedd48 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/wubdub_var2_5.wav.meta b/Assets/Resources/Sfx/games/ringside/new/wubdub_var2_5.wav.meta new file mode 100644 index 00000000..7ed97813 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/wubdub_var2_5.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 928b603259a3a6e448fc1b9053fe4fb8 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/wubdub_var2_6.wav.meta b/Assets/Resources/Sfx/games/ringside/new/wubdub_var2_6.wav.meta new file mode 100644 index 00000000..dd407025 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/wubdub_var2_6.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 26c2bfa8a9316a04fb9de6559da54e9f +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/wubdub_var2_7.wav.meta b/Assets/Resources/Sfx/games/ringside/new/wubdub_var2_7.wav.meta new file mode 100644 index 00000000..0bfd33a7 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/wubdub_var2_7.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 4163ecc5a0583ab4fb96785e68d1673a +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/wubdub_var2_8.wav.meta b/Assets/Resources/Sfx/games/ringside/new/wubdub_var2_8.wav.meta new file mode 100644 index 00000000..13fde1d8 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/wubdub_var2_8.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 06d1fa02a80563444b5b6e69619c1b6e +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/wubdub_var3_1.wav.meta b/Assets/Resources/Sfx/games/ringside/new/wubdub_var3_1.wav.meta new file mode 100644 index 00000000..71d634f9 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/wubdub_var3_1.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 32380fb7d92a0a64c9403f7c5d93176f +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/wubdub_var3_2.wav.meta b/Assets/Resources/Sfx/games/ringside/new/wubdub_var3_2.wav.meta new file mode 100644 index 00000000..4d69f5a1 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/wubdub_var3_2.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: e474a355b583d564c9a4130f89afa629 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/wubdub_var3_3.wav.meta b/Assets/Resources/Sfx/games/ringside/new/wubdub_var3_3.wav.meta new file mode 100644 index 00000000..0f1fac83 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/wubdub_var3_3.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: cc9891e4798568246be81594d25d1fb6 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/wubdub_var3_4.wav.meta b/Assets/Resources/Sfx/games/ringside/new/wubdub_var3_4.wav.meta new file mode 100644 index 00000000..2804a90a --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/wubdub_var3_4.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: f703d268fb39bb04a830624573c72ce5 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/wubdub_var3_5.wav.meta b/Assets/Resources/Sfx/games/ringside/new/wubdub_var3_5.wav.meta new file mode 100644 index 00000000..a14cf81e --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/wubdub_var3_5.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: c4c4d237361a77741a0efd648e787d12 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/wubdub_var3_6.wav.meta b/Assets/Resources/Sfx/games/ringside/new/wubdub_var3_6.wav.meta new file mode 100644 index 00000000..425f64fd --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/wubdub_var3_6.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 2a8ae84283ac86949a5e7cb2b17608b7 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/wubdub_var3_7.wav.meta b/Assets/Resources/Sfx/games/ringside/new/wubdub_var3_7.wav.meta new file mode 100644 index 00000000..98db9352 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/wubdub_var3_7.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 5bed942bfe355534aa637752353cbfff +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/ringside/new/wubdub_var3_8.wav.meta b/Assets/Resources/Sfx/games/ringside/new/wubdub_var3_8.wav.meta new file mode 100644 index 00000000..45aebfb7 --- /dev/null +++ b/Assets/Resources/Sfx/games/ringside/new/wubdub_var3_8.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 2e15c449b4d705f4688fe4e5cca4a6be +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/tramAndPauline/jumpL1.ogg.meta b/Assets/Resources/Sfx/games/tramAndPauline/jumpL1.ogg.meta new file mode 100644 index 00000000..92c5113f --- /dev/null +++ b/Assets/Resources/Sfx/games/tramAndPauline/jumpL1.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: a6958febf3350d14d8eebd377dd4c438 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/tramAndPauline/jumpL2.ogg.meta b/Assets/Resources/Sfx/games/tramAndPauline/jumpL2.ogg.meta new file mode 100644 index 00000000..7efe1e96 --- /dev/null +++ b/Assets/Resources/Sfx/games/tramAndPauline/jumpL2.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 84121b7baccb6cc44a05dbe309a21d6a +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/tramAndPauline/jumpR1.ogg.meta b/Assets/Resources/Sfx/games/tramAndPauline/jumpR1.ogg.meta new file mode 100644 index 00000000..cbb30874 --- /dev/null +++ b/Assets/Resources/Sfx/games/tramAndPauline/jumpR1.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 7bb9720921657bf49b8c6a652b1d8f17 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/tramAndPauline/jumpR2.ogg.meta b/Assets/Resources/Sfx/games/tramAndPauline/jumpR2.ogg.meta new file mode 100644 index 00000000..be013134 --- /dev/null +++ b/Assets/Resources/Sfx/games/tramAndPauline/jumpR2.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 0a55377ed38696f48b7481de72e6a20a +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Samurai/Beat.anim b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Samurai/Beat.anim index c960dcbf..7e3d108a 100644 --- a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Samurai/Beat.anim +++ b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Samurai/Beat.anim @@ -30,6 +30,22 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: body/hand01 + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: -14.011} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: body/hand00 m_PositionCurves: - curve: serializedVersion: 2 @@ -52,7 +68,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.73, y: -0.98, z: 0} + value: {x: 0.7300009, y: -0.9799999, z: 0} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 @@ -418,6 +434,13 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + - serializedVersion: 2 + path: 3858490583 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 pptrCurveMapping: - {fileID: -963895908, guid: 76432e2902ee41440bb4dcde61fac224, type: 3} - {fileID: 675014051, guid: 76432e2902ee41440bb4dcde61fac224, type: 3} @@ -512,7 +535,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.73 + value: 0.7300009 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -531,7 +554,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.98 + value: -0.9799999 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1077,6 +1100,63 @@ AnimationClip: path: legR/footR00 classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: body/hand00 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: body/hand00 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -14.011 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: body/hand00 + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 @@ -1108,6 +1188,36 @@ AnimationClip: path: body/hand01 classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: body/hand00 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: body/hand00 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: body/hand00 + classID: 4 + script: {fileID: 0} m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Samurai/NoPose.anim b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Samurai/NoPose.anim index 480ca735..71b5b79a 100644 --- a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Samurai/NoPose.anim +++ b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Samurai/NoPose.anim @@ -30,6 +30,22 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: body/hand01 + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: -9.271} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: body/hand00 m_PositionCurves: - curve: serializedVersion: 2 @@ -116,7 +132,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.73, y: -0.98, z: 0} + value: {x: 0.7300009, y: -0.9799999, z: 0} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 @@ -418,6 +434,13 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + - serializedVersion: 2 + path: 3858490583 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 pptrCurveMapping: - {fileID: 1775400228, guid: 76432e2902ee41440bb4dcde61fac224, type: 3} - {fileID: 1134055980, guid: 76432e2902ee41440bb4dcde61fac224, type: 3} @@ -740,7 +763,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.73 + value: 0.7300009 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -759,7 +782,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.98 + value: -0.9799999 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1077,6 +1100,63 @@ AnimationClip: path: head/neck classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: body/hand00 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: body/hand00 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -9.271 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: body/hand00 + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 @@ -1108,6 +1188,36 @@ AnimationClip: path: body/hand01 classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: body/hand00 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: body/hand00 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: body/hand00 + classID: 4 + script: {fileID: 0} m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Samurai/Slash.anim b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Samurai/Slash.anim index 9a9f448c..76a18456 100644 --- a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Samurai/Slash.anim +++ b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Samurai/Slash.anim @@ -531,6 +531,40 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: body/seathe (1) + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.11666667 + value: {x: 0, y: 0, z: -34.628} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.21666667 + value: {x: 0, y: 0, z: -11.09} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: body/hand00 m_PositionCurves: - curve: serializedVersion: 2 @@ -760,7 +794,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.21666667 - value: {x: 0.6, y: -0.993, z: 0} + value: {x: 0.60000026, y: -0.99299955, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -2666,6 +2700,13 @@ AnimationClip: typeID: 4 customType: 4 isPPtrCurve: 0 + - serializedVersion: 2 + path: 3858490583 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 - serializedVersion: 2 path: 799235036 attribute: 3 @@ -3391,7 +3432,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 - value: 0.6 + value: 0.60000026 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3527,7 +3568,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.21666667 - value: -0.993 + value: -0.99299955 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -9216,6 +9257,117 @@ AnimationClip: path: body/seathe (1) classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.11666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: body/hand00 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.11666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: body/hand00 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.11666667 + value: -34.628 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: -11.09 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: body/hand00 + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 @@ -9224,7 +9376,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: body/seathe + path: body/hand01 classID: 4 script: {fileID: 0} - curve: @@ -9234,7 +9386,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: body/seathe + path: body/hand01 classID: 4 script: {fileID: 0} - curve: @@ -9244,7 +9396,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: body/seathe + path: body/hand01 classID: 4 script: {fileID: 0} - curve: @@ -9254,7 +9406,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: head + path: body/sord classID: 4 script: {fileID: 0} - curve: @@ -9264,7 +9416,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: head + path: body/sord classID: 4 script: {fileID: 0} - curve: @@ -9274,7 +9426,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: head + path: body/sord classID: 4 script: {fileID: 0} - curve: @@ -9314,96 +9466,6 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: body/sord - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: body/sord - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: body/sord - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: body/hand01 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: body/hand01 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: body/hand01 - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: head/neck - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: head/neck - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: head/neck - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x path: body/seathe (1) classID: 4 script: {fileID: 0} @@ -9423,10 +9485,130 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z + attribute: m_LocalEulerAngles.x path: body/seathe (1) classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: body/hand00 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: body/hand00 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: body/hand00 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: body/seathe + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: body/seathe + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: body/seathe + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: head/neck + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: head/neck + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: head/neck + classID: 4 + script: {fileID: 0} m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Samurai/Step.anim b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Samurai/Step.anim index 0a97cb8d..9d9e84a2 100644 --- a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Samurai/Step.anim +++ b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Samurai/Step.anim @@ -78,6 +78,22 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: body/hand01 + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: -35.05} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: body/hand00 m_PositionCurves: - curve: serializedVersion: 2 @@ -180,7 +196,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1, y: -0.88, z: 0} + value: {x: 1.0000001, y: -0.88, z: 0} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 @@ -301,6 +317,13 @@ AnimationClip: typeID: 4 customType: 4 isPPtrCurve: 0 + - serializedVersion: 2 + path: 3858490583 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -841,7 +864,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 1.0000001 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1007,6 +1030,63 @@ AnimationClip: path: body/hand01 classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: body/hand00 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: body/hand00 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -35.05 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: body/hand00 + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 @@ -1128,6 +1208,36 @@ AnimationClip: path: head/neck classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: body/hand00 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: body/hand00 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: body/hand00 + classID: 4 + script: {fileID: 0} m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Samurai/Unstep.anim b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Samurai/Unstep.anim index 926bf760..aa4bf7e8 100644 --- a/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Samurai/Unstep.anim +++ b/Assets/Resources/Sprites/Games/SamuraiSliceNtr/Anime/Samurai/Unstep.anim @@ -213,6 +213,31 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: head/neck + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: -35.884} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.1 + value: {x: 0, y: 0, z: -11.831} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: body/hand00 m_PositionCurves: - curve: serializedVersion: 2 @@ -316,7 +341,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.1 - value: {x: 0.6, y: -0.993, z: 0} + value: {x: 0.60000026, y: -0.99299955, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -969,6 +994,13 @@ AnimationClip: typeID: 4 customType: 4 isPPtrCurve: 0 + - serializedVersion: 2 + path: 3858490583 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 - serializedVersion: 2 path: 2817783452 attribute: 0 @@ -1328,7 +1360,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.1 - value: 0.6 + value: 0.60000026 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1401,7 +1433,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.1 - value: -0.993 + value: -0.99299955 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -3495,6 +3527,90 @@ AnimationClip: path: head/neck classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: body/hand00 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: body/hand00 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -35.884 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: -11.831 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: body/hand00 + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 @@ -3503,7 +3619,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: body/hand01 + path: body/hand00 classID: 4 script: {fileID: 0} - curve: @@ -3513,7 +3629,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: body/hand01 + path: body/hand00 classID: 4 script: {fileID: 0} - curve: @@ -3523,7 +3639,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: body/hand01 + path: body/hand00 classID: 4 script: {fileID: 0} - curve: @@ -3533,7 +3649,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: head/neck + path: body/seathe (1) classID: 4 script: {fileID: 0} - curve: @@ -3543,7 +3659,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: head/neck + path: body/seathe (1) classID: 4 script: {fileID: 0} - curve: @@ -3553,7 +3669,37 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: head/neck + path: body/seathe (1) + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: body/hand01 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: body/hand01 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: body/hand01 classID: 4 script: {fileID: 0} - curve: @@ -3593,7 +3739,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.x - path: body/seathe (1) + path: head/neck classID: 4 script: {fileID: 0} - curve: @@ -3603,7 +3749,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: body/seathe (1) + path: head/neck classID: 4 script: {fileID: 0} - curve: @@ -3613,7 +3759,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: body/seathe (1) + path: head/neck classID: 4 script: {fileID: 0} m_HasGenericRootTransform: 0 diff --git a/Assets/Scripts/Games/Lockstep/Lockstep.cs b/Assets/Scripts/Games/Lockstep/Lockstep.cs index dddec690..a78d8b16 100644 --- a/Assets/Scripts/Games/Lockstep/Lockstep.cs +++ b/Assets/Scripts/Games/Lockstep/Lockstep.cs @@ -465,12 +465,12 @@ namespace HeavenStudio.Games public static void HaiSound(double beat) { - SoundByte.PlayOneShot("games/lockstep/hai", beat, 1, 1, false, null, 0.02314814814f); + SoundByte.PlayOneShot("games/lockstep/hai", beat, 1, 1, false, null, 0.018); } public static void HoSound(double beat) { - SoundByte.PlayOneShot("games/lockstep/ho", beat, 1, 1, false, null, 0.03086419753); + SoundByte.PlayOneShot("games/lockstep/ho", beat, 1, 1, false, null, 0.015); } public static void OnbeatSwitchSound(double beat, int hais, bool sound) @@ -479,10 +479,10 @@ namespace HeavenStudio.Games { MultiSound.Play(new MultiSound.Sound[] { - new MultiSound.Sound("lockstep/nha1", beat, 1, 1, false, 0.03086419753), - new MultiSound.Sound("lockstep/nha2", beat + 0.5f, 1, 1, false, 0.04629629629), - new MultiSound.Sound("lockstep/nha1", beat + 1f, 1, 1, false, 0.03086419753), - new MultiSound.Sound("lockstep/nha2", beat + 1.5f, 1, 1, false, 0.04629629629) + new MultiSound.Sound("lockstep/nha1", beat, 1, 1, false, 0), + new MultiSound.Sound("lockstep/nha2", beat + 0.5f, 1, 1, false, 0.01), + new MultiSound.Sound("lockstep/nha1", beat + 1f, 1, 1, false, 0), + new MultiSound.Sound("lockstep/nha2", beat + 1.5f, 1, 1, false, 0.01) }, forcePlay: true); } @@ -492,7 +492,7 @@ namespace HeavenStudio.Games for (int i = 0; i < hais; i++) { - haisList.Add(new MultiSound.Sound("lockstep/hai", beat + 2 + i, 1, 1, false, 0.02314814814)); + haisList.Add(new MultiSound.Sound("lockstep/hai", beat + 2 + i, 1, 1, false, 0.018)); } double nextOffBeat = double.MaxValue; @@ -544,21 +544,21 @@ namespace HeavenStudio.Games { MultiSound.Play(new MultiSound.Sound[] { - new MultiSound.Sound("lockstep/hai", beat, 1, 1, false, 0.02314814814), - new MultiSound.Sound("lockstep/hai", beat + 1f, 1, 1, false, 0.02314814814), - new MultiSound.Sound("lockstep/hai", beat + 2f, 1, 1, false, 0.02314814814), - new MultiSound.Sound("lockstep/hahai1", beat + 3f, 1, 1, false, 0.03086419753), - new MultiSound.Sound("lockstep/hahai2", beat + 3.5f, 1, 1, false, 0.03086419753), + new MultiSound.Sound("lockstep/hai", beat, 1, 1, false, 0.018), + new MultiSound.Sound("lockstep/hai", beat + 1f, 1, 1, false, 0.018), + new MultiSound.Sound("lockstep/hai", beat + 2f, 1, 1, false, 0.018), + new MultiSound.Sound("lockstep/hahai1", beat + 3f, 1, 1, false, 0), + new MultiSound.Sound("lockstep/hahai2", beat + 3.5f, 1, 1, false, 0.014), }, forcePlay: true); } if (hoSound) { List hos = new List { - new MultiSound.Sound("lockstep/ho", beat + 4.5f, 1, 1, false, 0.03086419753), - new MultiSound.Sound("lockstep/ho", beat + 5.5f, 1, 0.6835514f, false, 0.03086419753), - new MultiSound.Sound("lockstep/ho", beat + 6.5f, 1, 0.3395127f, false, 0.03086419753), - new MultiSound.Sound("lockstep/ho", beat + 7.5f, 1, 0.1200322f, false, 0.03086419753), + new MultiSound.Sound("lockstep/ho", beat + 4.5f, 1, 1, false, 0.015), + new MultiSound.Sound("lockstep/ho", beat + 5.5f, 1, 0.6835514f, false, 0.015), + new MultiSound.Sound("lockstep/ho", beat + 6.5f, 1, 0.3395127f, false, 0.015), + new MultiSound.Sound("lockstep/ho", beat + 7.5f, 1, 0.1200322f, false, 0.015), }; double nextOnBeat = double.MaxValue; @@ -645,7 +645,7 @@ namespace HeavenStudio.Games MultiSound.Sound[] sounds = new MultiSound.Sound[amount]; for (int i = 0; i < amount; i++) { - sounds[i] = new MultiSound.Sound($"lockstep/" + (offBeat ? "ho" : "hai"), beat + i, 1, 1, false, offBeat ? 0.03086419753 : 0.02314814814); + sounds[i] = new MultiSound.Sound($"lockstep/" + (offBeat ? "ho" : "hai"), beat + i, 1, 1, false, offBeat ? 0.015 : 0.018); } MultiSound.Play(sounds, true, true); } @@ -688,7 +688,7 @@ namespace HeavenStudio.Games MultiSound.Sound[] sounds = new MultiSound.Sound[amount]; for (int i = 0; i < amount; i++) { - sounds[i] = new MultiSound.Sound($"lockstep/" + (offBeat ? "ho" : "hai"), beat + i, 1, 1, false, offBeat ? 0.03086419753 : 0.02314814814); + sounds[i] = new MultiSound.Sound($"lockstep/" + (offBeat ? "ho" : "hai"), beat + i, 1, 1, false, offBeat ? 0.015 : 0.018); } MultiSound.Play(sounds, true, true); } diff --git a/Assets/Scripts/Games/Ringside/Ringside.cs b/Assets/Scripts/Games/Ringside/Ringside.cs index cfc3e7f6..bb1d5740 100644 --- a/Assets/Scripts/Games/Ringside/Ringside.cs +++ b/Assets/Scripts/Games/Ringside/Ringside.cs @@ -276,7 +276,7 @@ namespace HeavenStudio.Games wrestlerAnim.Play($"Pose{randomPose}", 0, 0); if (canDoMissExpression()) reporterAnim.Play("FlinchReporter", 0, 0); if (canDoMissExpression()) reporterHeadAnim.Play("Flinch", 0, 0); - SoundByte.PlayOneShotGame($"ringside/yell{UnityEngine.Random.Range(1, 7)}Raw"); + SoundByte.PlayOneShotGame($"ringside/new/badpose_{UnityEngine.Random.Range(1, 7)}"); wrestlerTransform.localScale = new Vector3(1.1f, 1.1f, 1f); BeatAction.New(instance, new List() { @@ -386,12 +386,12 @@ namespace HeavenStudio.Games List qSounds = new List(); if (alt) { - qSounds.Add(new MultiSound.Sound($"ringside/wub{currentQuestion}", beat)); + qSounds.Add(new MultiSound.Sound($"ringside/new/wubdub_var{currentQuestion}_1", beat, 1, 1, false, 0.015)); } else { - qSounds.Add(new MultiSound.Sound($"ringside/wubba{currentQuestion}-1", beat)); - qSounds.Add(new MultiSound.Sound($"ringside/wubba{currentQuestion}-2", beat + 0.25f)); + qSounds.Add(new MultiSound.Sound($"ringside/new/wubdub_var{currentQuestion}_1", beat, 1, 1, false, 0.015)); + qSounds.Add(new MultiSound.Sound($"ringside/new/wubdub_var{currentQuestion}_2", beat + 0.25f, 1, 1, false, 0.002)); } float extend = length - 3f; int totalExtend = 0; @@ -399,10 +399,10 @@ namespace HeavenStudio.Games { for (int i = 0; i < extend; i++) { - qSounds.Add(new MultiSound.Sound($"ringside/dubba{currentQuestion}-1", beat + i + 0.5f )); - qSounds.Add(new MultiSound.Sound($"ringside/dubba{currentQuestion}-2", beat + i + 0.75f )); - qSounds.Add(new MultiSound.Sound($"ringside/dubba{currentQuestion}-3", beat + i + 1f )); - qSounds.Add(new MultiSound.Sound($"ringside/dubba{currentQuestion}-4", beat + i + 1.25f )); + qSounds.Add(new MultiSound.Sound($"ringside/new/wubdub_var{currentQuestion}_3", beat + i + 0.5f, 1, 1, false, 0.003 )); + qSounds.Add(new MultiSound.Sound($"ringside/new/wubdub_var{currentQuestion}_4", beat + i + 0.75f, 1, 1, false, 0 )); + qSounds.Add(new MultiSound.Sound($"ringside/new/wubdub_var{currentQuestion}_5", beat + i + 1f, 1, 1, false, 0 )); + qSounds.Add(new MultiSound.Sound($"ringside/new/wubdub_var{currentQuestion}_6", beat + i + 1.25f, 1, 1, false, 0 )); totalExtend++; } } @@ -431,8 +431,12 @@ namespace HeavenStudio.Games { MultiSound.Play(new MultiSound.Sound[] { - new MultiSound.Sound($"ringside/that{currentQuestion}", beat + 0.5f), - new MultiSound.Sound($"ringside/true{currentQuestion}", beat + 1f), + new MultiSound.Sound($"ringside/new/wubdub_var{currentQuestion}_7", beat + 0.5f, 1, 1, false, 0.025), + new MultiSound.Sound($"ringside/new/wubdub_konk_1", beat + 0.5f, 1, 1, false, 0), + new MultiSound.Sound($"ringside/new/wubdub_konk_2", beat + 0.75f, 1, 1, false, 0), + new MultiSound.Sound($"ringside/new/wubdub_var{currentQuestion}_8", beat + 1f, 1, 1, false, 0.018), + new MultiSound.Sound($"ringside/new/wubdub_konk_3", beat + 1f, 1, 1, false, 0), + new MultiSound.Sound($"ringside/new/mic_swoosh", beat + 1f, 1, 1, false, 0), }, forcePlay: true); ScheduleInput(beat, 2f, InputAction_BasicPress, JustQuestion, Miss, Nothing); BeatAction.New(instance, new List() @@ -449,15 +453,16 @@ namespace HeavenStudio.Games if (currentQuestion == (int)QuestionVariant.Random) currentQuestion = UnityEngine.Random.Range(1, 4); reporterAnim.DoScaledAnimationAsync("Woah", 0.5f); reporterHeadAnim.DoScaledAnimationAsync("Woah", 0.5f); - float youBeat = 0.65f; - if (currentQuestion == (int)QuestionVariant.Third) youBeat = 0.7f; + float youBeat = 0.081f; + if (currentQuestion == (int)QuestionVariant.Third) youBeat = 0.027f; MultiSound.Play(new MultiSound.Sound[] { - new MultiSound.Sound($"ringside/woah{currentQuestion}", beat), - new MultiSound.Sound($"ringside/you{currentQuestion}", beat + youBeat), - new MultiSound.Sound($"ringside/go{currentQuestion}", beat + 1f), - new MultiSound.Sound($"ringside/big{currentQuestion}", beat + 1.5f), - new MultiSound.Sound($"ringside/guy{currentQuestion}", beat + 2f), + new MultiSound.Sound($"ringside/new/bigguy_var{currentQuestion}_1", beat, 1, 1, false, youBeat), + new MultiSound.Sound($"ringside/new/bigguy_var{currentQuestion}_2", beat + 0.75f, 1, 1, false, youBeat), + new MultiSound.Sound($"ringside/new/bigguy_var{currentQuestion}_3", beat + 1f, 1, 1, false, 0), + new MultiSound.Sound($"ringside/new/bigguy_var{currentQuestion}_4", beat + 1.5f, 1, 1, false, 0.006), + new MultiSound.Sound($"ringside/new/bigguy_var{currentQuestion}_5", beat + 2f, 1, 1, false, 0.009), + new MultiSound.Sound($"ringside/new/mic_swoosh", beat + 2f, 1, 1, false, 0), }, forcePlay: true); ScheduleInput(beat, 2.5f, InputAction_BasicPress, JustBigGuyFirst, MissBigGuyOne, Nothing); @@ -476,17 +481,19 @@ namespace HeavenStudio.Games { MultiSound.Play(new MultiSound.Sound[] { - new MultiSound.Sound("ringside/poseAnd", beat - 0.5f), + new MultiSound.Sound("ringside/new/pose_and", beat - 0.5f), }, forcePlay: true); } int poseLine = variant; if (poseLine == 3) poseLine = UnityEngine.Random.Range(1, 3); MultiSound.Play(new MultiSound.Sound[] { - new MultiSound.Sound($"ringside/pose{poseLine}", beat), - new MultiSound.Sound($"ringside/for{poseLine}", beat + 0.5f), - new MultiSound.Sound($"ringside/the{poseLine}", beat + 0.75f), - new MultiSound.Sound($"ringside/fans{poseLine}", beat + 1f), + new MultiSound.Sound($"ringside/new/pose_var{poseLine}_1", beat, 1, 1, false, 0.02), + new MultiSound.Sound($"ringside/new/pose_var{poseLine}_2", beat + 0.3333f, 1, 1, false, 0.00), + new MultiSound.Sound($"ringside/new/pose_var{poseLine}_3", beat + 0.5f, 1, 1, false, 0.00), + new MultiSound.Sound($"ringside/new/pose_var{poseLine}_4", beat + 0.75f, 1, 1, false, 0.022), + new MultiSound.Sound($"ringside/new/pose_var{poseLine}_5", beat + 1f, 1, 1, false, 0.035), + new MultiSound.Sound($"ringside/new/pose_var{poseLine}_6", beat + 1.8f, 1, 1, false, 0.00), }, forcePlay: true); if (GameManager.instance.currentGame == "ringside") { @@ -853,7 +860,7 @@ namespace HeavenStudio.Games wrestlerTransform.localScale = new Vector3(1.2f, 1.2f, 1f); int randomPose = UnityEngine.Random.Range(1, 7); wrestlerAnim.Play($"Pose{randomPose}", 0, 0); - SoundByte.PlayOneShotGame($"ringside/yell{UnityEngine.Random.Range(1, 7)}Raw"); + SoundByte.PlayOneShotGame($"ringside/new/badpose_{UnityEngine.Random.Range(1, 7)}"); reporterHeadAnim.Play("Late", 0, 0); SoundByte.PlayOneShotGame($"ringside/huhaudience{UnityEngine.Random.Range(0, 2)}"); BeatAction.New(instance, new List() diff --git a/Assets/Scripts/Games/SneakySpirits/SneakySpirits.cs b/Assets/Scripts/Games/SneakySpirits/SneakySpirits.cs index e44b0bea..8c96d96f 100644 --- a/Assets/Scripts/Games/SneakySpirits/SneakySpirits.cs +++ b/Assets/Scripts/Games/SneakySpirits/SneakySpirits.cs @@ -375,7 +375,7 @@ namespace HeavenStudio.Games new BeatAction.Action(caller.startBeat + caller.timer + 1f, delegate { if (GameManager.instance.currentGame == "sneakySpirits") { - SoundByte.PlayOneShotGame("sneakySpirits/laugh", -1, 1.2f); + SoundByte.PlayOneShotGame("sneakySpirits/laugh", -1, 1f); spawnedGhost.GetComponent().DoScaledAnimationAsync("GhostLaugh", 0.25f); } }), diff --git a/Assets/Scripts/Games/TramAndPauline/TramAndPauline.cs b/Assets/Scripts/Games/TramAndPauline/TramAndPauline.cs index d8553111..c483a8c1 100644 --- a/Assets/Scripts/Games/TramAndPauline/TramAndPauline.cs +++ b/Assets/Scripts/Games/TramAndPauline/TramAndPauline.cs @@ -283,14 +283,14 @@ namespace HeavenStudio.Games private void TramJump(double beat, bool audienceReact) { - SoundByte.PlayOneShotGame("tramAndPauline/jump" + UnityEngine.Random.Range(1, 3)); + SoundByte.PlayOneShotGame("tramAndPauline/jumpL" + UnityEngine.Random.Range(1, 3)); tram.Jump(beat); ScheduleInput(beat, 1, InputAction_Left, audienceReact ? TramJustAudience : TramJust, Empty, Empty); } private void PaulineJump(double beat, bool audienceReact) { - SoundByte.PlayOneShotGame("tramAndPauline/jump" + UnityEngine.Random.Range(1, 3)); + SoundByte.PlayOneShotGame("tramAndPauline/jumpR" + UnityEngine.Random.Range(1, 3)); pauline.Jump(beat); ScheduleInput(beat, 1, InputAction_Right, audienceReact ? PaulineJustAudience : PaulineJust, Empty, Empty); }