mirror of
https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git
synced 2024-11-30 05:23:06 +00:00
3d4427c96a
* Update issue template to include .riq/.zip info (#483) Co-authored-by: patata <patataofcourse@gmail.com> * Pull release 1 (#484) * Squashed commit of the following: commit2c628a4109
Merge:4fde418c
6246a144
Author: minenice55 <star.elementa@gmail.com> Date: Wed Jun 14 01:23:31 2023 +0000 Merge pull request #473 from minenice55/easings-fix Enum Parsing Fix commit6246a144b6
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:21:13 2023 -0400 fix all parsing of enums, removed the "special case" for eases update to latest Jukebox commit4fde418c33
Merge:b9043582
50bc8765
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:39:15 2023 +0000 Merge pull request #469 from minenice55/jukebox-update Jukebox Package Update commitb90435825a
Merge:eec3c09a
73e9efd4
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:39:08 2023 +0000 Merge pull request #458 from AstrlJelly/MiscAdditions_4 Bug Fixes + Feature Additions commit73e9efd4b1
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 17:38:24 2023 -0400 add "updater" for the old marching entity commitb8d149743a
Merge:4291333c
eec3c09a
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 17:22:01 2023 -0400 Merge branch 'release_1' into pr/458 commit50bc876509
Author: minenice55 <star.elementa@gmail.com> 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 commiteec3c09aa8
Merge:a0d70933
990af323
Author: minenice55 <star.elementa@gmail.com> 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 commit990af32379
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 commita0d7093345
Merge:bdef3f95
3d19e75e
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 16:09:21 2023 +0000 Merge pull request #470 from Rapandrasmus/WorkingDoughFixes Fixed small balls not working in working dough commit3d19e75e1a
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 commitbdef3f95c3
Merge:8954b8c2
0bfafac6
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 14:56:58 2023 +0000 Merge pull request #467 from Rapandrasmus/WorkingDoughRework Working Dough rework commit0bfafac6fe
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:13:08 2023 +0200 modernised rockers pass turn commitd770266d81
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 commit2109c99a95
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 15:51:35 2023 +0200 gandw on balls has been added commit785abf8486
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 14:59:56 2023 +0200 Proper inactive handling now commit0a92b7bd69
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:52:15 2023 +0200 OnSpawnBall reimplemented commita14aacc181
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:37:09 2023 +0200 new sounds commit8b0544246d
Author: minenice55 <star.elementa@gmail.com> Date: Mon Jun 12 17:18:37 2023 -0400 update Jukebox to latest version fixes for inferred entity loading commitd8ff6744c0
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 21:36:57 2023 +0200 ball transporter anims for pass turn commitd283624b07
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 commit5b3c59eabd
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 commitdee630ea45
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 14:04:32 2023 +0200 Some new curves commit31e8890190
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 12:03:21 2023 +0200 Rockers can do it too now commit76bf6eefa6
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 commit8954b8c269
Merge:743e954e
ce3e6f2d
Author: minenice55 <star.elementa@gmail.com> Date: Sun Jun 11 15:55:40 2023 -0400 Merge branch 'master' into release_1 commit743e954e05
Merge:5af551b3
8929cd56
Author: minenice55 <star.elementa@gmail.com> 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 commit8929cd5618
Author: minenice55 <star.elementa@gmail.com> Date: Sun Jun 11 15:52:14 2023 -0400 don't infer track when importing a v0 riq from another program commit5af551b32e
Author: minenice55 <star.elementa@gmail.com> 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 commit4291333cb0
Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 23:00:30 2023 -0400 add updater for marching orders turn commit82da6da741
Merge:52a4d2b6
411b9a3c
Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 22:36:10 2023 -0400 Merge branch 'release_1' into pr/458 commit411b9a3cb1
Merge:b6c222a9
afc665ed
Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 22:30:32 2023 -0400 Merge branch 'master' into release_1 commitb6c222a981
Author: minenice55 <star.elementa@gmail.com> 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 commit52a4d2b65c
Author: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 16:55:10 2023 -0400 convert float to double and all that commitaa8f531466
Merge:242b076f
afc665ed
Author: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 16:01:44 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit242b076f09
Merge:db653d5a
2b0ced2f
Author: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 15:21:22 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commitdb653d5a52
Author: AstrlJelly <bdlawson115@gmail.com> 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 commit50a1b7bcdb
Author: minenice55 <star.elementa@gmail.com> 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: commit0d25221b71
Merge:5869d212
9163085d
Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 17 16:40:52 2023 +0000 Merge pull request #478 from evdial/working-dough Working Dough Tweaks commit9163085d7a
Merge:6592a5f2
5869d212
Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 17 12:40:06 2023 -0400 Merge branch 'release_1' into pr/478 commit5869d212bc
Author: patata <patataofcourse@gmail.com> Date: Sat Jun 17 17:20:15 2023 +0200 Update issue template to include .riq/.zip info commit6592a5f202
Author: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 15:05:07 2023 -0400 assbuns commit11a4c090a1
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Thu Jun 15 20:56:40 2023 +0200 made small idle not crazy commit45e7d81b0f
Author: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 14:33:57 2023 -0400 fsd commit47efa3e4f3
Author: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 14:16:38 2023 -0400 anim commitc6fb8880a0
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Thu Jun 15 20:13:11 2023 +0200 Fixed stuff also scaled now yippee commit16ce508b03
Author: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 13:50:10 2023 -0400 many commit37b80a33c7
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:28:21 2023 -0400 Squashed commit of the following: (#474) commit2c628a4109
Merge:4fde418c
6246a144
Author: minenice55 <star.elementa@gmail.com> Date: Wed Jun 14 01:23:31 2023 +0000 Merge pull request #473 from minenice55/easings-fix Enum Parsing Fix commit6246a144b6
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:21:13 2023 -0400 fix all parsing of enums, removed the "special case" for eases update to latest Jukebox commit4fde418c33
Merge:b9043582
50bc8765
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:39:15 2023 +0000 Merge pull request #469 from minenice55/jukebox-update Jukebox Package Update commitb90435825a
Merge:eec3c09a
73e9efd4
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:39:08 2023 +0000 Merge pull request #458 from AstrlJelly/MiscAdditions_4 Bug Fixes + Feature Additions commit73e9efd4b1
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 17:38:24 2023 -0400 add "updater" for the old marching entity commitb8d149743a
Merge:4291333c
eec3c09a
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 17:22:01 2023 -0400 Merge branch 'release_1' into pr/458 commit50bc876509
Author: minenice55 <star.elementa@gmail.com> 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 commiteec3c09aa8
Merge:a0d70933
990af323
Author: minenice55 <star.elementa@gmail.com> 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 commit990af32379
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 commita0d7093345
Merge:bdef3f95
3d19e75e
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 16:09:21 2023 +0000 Merge pull request #470 from Rapandrasmus/WorkingDoughFixes Fixed small balls not working in working dough commit3d19e75e1a
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 commitbdef3f95c3
Merge:8954b8c2
0bfafac6
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 14:56:58 2023 +0000 Merge pull request #467 from Rapandrasmus/WorkingDoughRework Working Dough rework commit0bfafac6fe
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:13:08 2023 +0200 modernised rockers pass turn commitd770266d81
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 commit2109c99a95
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 15:51:35 2023 +0200 gandw on balls has been added commit785abf8486
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 14:59:56 2023 +0200 Proper inactive handling now commit0a92b7bd69
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:52:15 2023 +0200 OnSpawnBall reimplemented commita14aacc181
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:37:09 2023 +0200 new sounds commit8b0544246d
Author: minenice55 <star.elementa@gmail.com> Date: Mon Jun 12 17:18:37 2023 -0400 update Jukebox to latest version fixes for inferred entity loading commitd8ff6744c0
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 21:36:57 2023 +0200 ball transporter anims for pass turn commitd283624b07
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 commit5b3c59eabd
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 commitdee630ea45
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 14:04:32 2023 +0200 Some new curves commit31e8890190
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 12:03:21 2023 +0200 Rockers can do it too now commit76bf6eefa6
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 commit8954b8c269
Merge:743e954e
ce3e6f2d
Author: minenice55 <star.elementa@gmail.com> Date: Sun Jun 11 15:55:40 2023 -0400 Merge branch 'master' into release_1 commit743e954e05
Merge:5af551b3
8929cd56
Author: minenice55 <star.elementa@gmail.com> 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 commit8929cd5618
Author: minenice55 <star.elementa@gmail.com> Date: Sun Jun 11 15:52:14 2023 -0400 don't infer track when importing a v0 riq from another program commit5af551b32e
Author: minenice55 <star.elementa@gmail.com> 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 commit4291333cb0
Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 23:00:30 2023 -0400 add updater for marching orders turn commit82da6da741
Merge:52a4d2b6
411b9a3c
Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 22:36:10 2023 -0400 Merge branch 'release_1' into pr/458 commit411b9a3cb1
Merge:b6c222a9
afc665ed
Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 22:30:32 2023 -0400 Merge branch 'master' into release_1 commitb6c222a981
Author: minenice55 <star.elementa@gmail.com> 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 commit52a4d2b65c
Author: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 16:55:10 2023 -0400 convert float to double and all that commitaa8f531466
Merge:242b076f
afc665ed
Author: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 16:01:44 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit242b076f09
Merge:db653d5a
2b0ced2f
Author: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 15:21:22 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commitdb653d5a52
Author: AstrlJelly <bdlawson115@gmail.com> 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 commit50a1b7bcdb
Author: minenice55 <star.elementa@gmail.com> 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 commit2c628a4109
Merge:4fde418c
6246a144
Author: minenice55 <star.elementa@gmail.com> Date: Wed Jun 14 01:23:31 2023 +0000 Merge pull request #473 from minenice55/easings-fix Enum Parsing Fix commit6246a144b6
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:21:13 2023 -0400 fix all parsing of enums, removed the "special case" for eases update to latest Jukebox commit4fde418c33
Merge:b9043582
50bc8765
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:39:15 2023 +0000 Merge pull request #469 from minenice55/jukebox-update Jukebox Package Update commitb90435825a
Merge:eec3c09a
73e9efd4
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:39:08 2023 +0000 Merge pull request #458 from AstrlJelly/MiscAdditions_4 Bug Fixes + Feature Additions commit73e9efd4b1
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 17:38:24 2023 -0400 add "updater" for the old marching entity commitb8d149743a
Merge:4291333c
eec3c09a
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 17:22:01 2023 -0400 Merge branch 'release_1' into pr/458 commit50bc876509
Author: minenice55 <star.elementa@gmail.com> 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 commiteec3c09aa8
Merge:a0d70933
990af323
Author: minenice55 <star.elementa@gmail.com> 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 commit990af32379
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 commita0d7093345
Merge:bdef3f95
3d19e75e
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 16:09:21 2023 +0000 Merge pull request #470 from Rapandrasmus/WorkingDoughFixes Fixed small balls not working in working dough commit3d19e75e1a
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 commitbdef3f95c3
Merge:8954b8c2
0bfafac6
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 14:56:58 2023 +0000 Merge pull request #467 from Rapandrasmus/WorkingDoughRework Working Dough rework commit0bfafac6fe
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:13:08 2023 +0200 modernised rockers pass turn commitd770266d81
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 commit2109c99a95
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 15:51:35 2023 +0200 gandw on balls has been added commit785abf8486
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 14:59:56 2023 +0200 Proper inactive handling now commit0a92b7bd69
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:52:15 2023 +0200 OnSpawnBall reimplemented commita14aacc181
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:37:09 2023 +0200 new sounds commit8b0544246d
Author: minenice55 <star.elementa@gmail.com> Date: Mon Jun 12 17:18:37 2023 -0400 update Jukebox to latest version fixes for inferred entity loading commitd8ff6744c0
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 21:36:57 2023 +0200 ball transporter anims for pass turn commitd283624b07
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 commit5b3c59eabd
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 commitdee630ea45
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 14:04:32 2023 +0200 Some new curves commit31e8890190
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 12:03:21 2023 +0200 Rockers can do it too now commit76bf6eefa6
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 commit8954b8c269
Merge:743e954e
ce3e6f2d
Author: minenice55 <star.elementa@gmail.com> Date: Sun Jun 11 15:55:40 2023 -0400 Merge branch 'master' into release_1 commit743e954e05
Merge:5af551b3
8929cd56
Author: minenice55 <star.elementa@gmail.com> 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 commit8929cd5618
Author: minenice55 <star.elementa@gmail.com> Date: Sun Jun 11 15:52:14 2023 -0400 don't infer track when importing a v0 riq from another program commit5af551b32e
Author: minenice55 <star.elementa@gmail.com> 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 commit4291333cb0
Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 23:00:30 2023 -0400 add updater for marching orders turn commit82da6da741
Merge:52a4d2b6
411b9a3c
Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 22:36:10 2023 -0400 Merge branch 'release_1' into pr/458 commit411b9a3cb1
Merge:b6c222a9
afc665ed
Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 22:30:32 2023 -0400 Merge branch 'master' into release_1 commitb6c222a981
Author: minenice55 <star.elementa@gmail.com> 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 commit52a4d2b65c
Author: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 16:55:10 2023 -0400 convert float to double and all that commitaa8f531466
Merge:242b076f
afc665ed
Author: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 16:01:44 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit242b076f09
Merge:db653d5a
2b0ced2f
Author: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 15:21:22 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commitdb653d5a52
Author: AstrlJelly <bdlawson115@gmail.com> 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 commit50a1b7bcdb
Author: minenice55 <star.elementa@gmail.com> 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 👍 * 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 <chocolate2890mail@gmail.com> 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 <patataofcourse@gmail.com> * Pull release 1 (#484) * Squashed commit of the following: commit2c628a4109
Merge:4fde418c
6246a144
Author: minenice55 <star.elementa@gmail.com> Date: Wed Jun 14 01:23:31 2023 +0000 Merge pull request #473 from minenice55/easings-fix Enum Parsing Fix commit6246a144b6
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:21:13 2023 -0400 fix all parsing of enums, removed the "special case" for eases update to latest Jukebox commit4fde418c33
Merge:b9043582
50bc8765
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:39:15 2023 +0000 Merge pull request #469 from minenice55/jukebox-update Jukebox Package Update commitb90435825a
Merge:eec3c09a
73e9efd4
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:39:08 2023 +0000 Merge pull request #458 from AstrlJelly/MiscAdditions_4 Bug Fixes + Feature Additions commit73e9efd4b1
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 17:38:24 2023 -0400 add "updater" for the old marching entity commitb8d149743a
Merge:4291333c
eec3c09a
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 17:22:01 2023 -0400 Merge branch 'release_1' into pr/458 commit50bc876509
Author: minenice55 <star.elementa@gmail.com> 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 commiteec3c09aa8
Merge:a0d70933
990af323
Author: minenice55 <star.elementa@gmail.com> 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 commit990af32379
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 commita0d7093345
Merge:bdef3f95
3d19e75e
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 16:09:21 2023 +0000 Merge pull request #470 from Rapandrasmus/WorkingDoughFixes Fixed small balls not working in working dough commit3d19e75e1a
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 commitbdef3f95c3
Merge:8954b8c2
0bfafac6
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 14:56:58 2023 +0000 Merge pull request #467 from Rapandrasmus/WorkingDoughRework Working Dough rework commit0bfafac6fe
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:13:08 2023 +0200 modernised rockers pass turn commitd770266d81
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 commit2109c99a95
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 15:51:35 2023 +0200 gandw on balls has been added commit785abf8486
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 14:59:56 2023 +0200 Proper inactive handling now commit0a92b7bd69
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:52:15 2023 +0200 OnSpawnBall reimplemented commita14aacc181
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:37:09 2023 +0200 new sounds commit8b0544246d
Author: minenice55 <star.elementa@gmail.com> Date: Mon Jun 12 17:18:37 2023 -0400 update Jukebox to latest version fixes for inferred entity loading commitd8ff6744c0
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 21:36:57 2023 +0200 ball transporter anims for pass turn commitd283624b07
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 commit5b3c59eabd
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 commitdee630ea45
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 14:04:32 2023 +0200 Some new curves commit31e8890190
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 12:03:21 2023 +0200 Rockers can do it too now commit76bf6eefa6
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 commit8954b8c269
Merge:743e954e
ce3e6f2d
Author: minenice55 <star.elementa@gmail.com> Date: Sun Jun 11 15:55:40 2023 -0400 Merge branch 'master' into release_1 commit743e954e05
Merge:5af551b3
8929cd56
Author: minenice55 <star.elementa@gmail.com> 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 commit8929cd5618
Author: minenice55 <star.elementa@gmail.com> Date: Sun Jun 11 15:52:14 2023 -0400 don't infer track when importing a v0 riq from another program commit5af551b32e
Author: minenice55 <star.elementa@gmail.com> 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 commit4291333cb0
Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 23:00:30 2023 -0400 add updater for marching orders turn commit82da6da741
Merge:52a4d2b6
411b9a3c
Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 22:36:10 2023 -0400 Merge branch 'release_1' into pr/458 commit411b9a3cb1
Merge:b6c222a9
afc665ed
Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 22:30:32 2023 -0400 Merge branch 'master' into release_1 commitb6c222a981
Author: minenice55 <star.elementa@gmail.com> 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 commit52a4d2b65c
Author: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 16:55:10 2023 -0400 convert float to double and all that commitaa8f531466
Merge:242b076f
afc665ed
Author: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 16:01:44 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit242b076f09
Merge:db653d5a
2b0ced2f
Author: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 15:21:22 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commitdb653d5a52
Author: AstrlJelly <bdlawson115@gmail.com> 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 commit50a1b7bcdb
Author: minenice55 <star.elementa@gmail.com> 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: commit0d25221b71
Merge:5869d212
9163085d
Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 17 16:40:52 2023 +0000 Merge pull request #478 from evdial/working-dough Working Dough Tweaks commit9163085d7a
Merge:6592a5f2
5869d212
Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 17 12:40:06 2023 -0400 Merge branch 'release_1' into pr/478 commit5869d212bc
Author: patata <patataofcourse@gmail.com> Date: Sat Jun 17 17:20:15 2023 +0200 Update issue template to include .riq/.zip info commit6592a5f202
Author: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 15:05:07 2023 -0400 assbuns commit11a4c090a1
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Thu Jun 15 20:56:40 2023 +0200 made small idle not crazy commit45e7d81b0f
Author: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 14:33:57 2023 -0400 fsd commit47efa3e4f3
Author: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 14:16:38 2023 -0400 anim commitc6fb8880a0
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Thu Jun 15 20:13:11 2023 +0200 Fixed stuff also scaled now yippee commit16ce508b03
Author: ev <85412919+evdial@users.noreply.github.com> Date: Thu Jun 15 13:50:10 2023 -0400 many commit37b80a33c7
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:28:21 2023 -0400 Squashed commit of the following: (#474) commit2c628a4109
Merge:4fde418c
6246a144
Author: minenice55 <star.elementa@gmail.com> Date: Wed Jun 14 01:23:31 2023 +0000 Merge pull request #473 from minenice55/easings-fix Enum Parsing Fix commit6246a144b6
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:21:13 2023 -0400 fix all parsing of enums, removed the "special case" for eases update to latest Jukebox commit4fde418c33
Merge:b9043582
50bc8765
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:39:15 2023 +0000 Merge pull request #469 from minenice55/jukebox-update Jukebox Package Update commitb90435825a
Merge:eec3c09a
73e9efd4
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:39:08 2023 +0000 Merge pull request #458 from AstrlJelly/MiscAdditions_4 Bug Fixes + Feature Additions commit73e9efd4b1
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 17:38:24 2023 -0400 add "updater" for the old marching entity commitb8d149743a
Merge:4291333c
eec3c09a
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 17:22:01 2023 -0400 Merge branch 'release_1' into pr/458 commit50bc876509
Author: minenice55 <star.elementa@gmail.com> 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 commiteec3c09aa8
Merge:a0d70933
990af323
Author: minenice55 <star.elementa@gmail.com> 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 commit990af32379
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 commita0d7093345
Merge:bdef3f95
3d19e75e
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 16:09:21 2023 +0000 Merge pull request #470 from Rapandrasmus/WorkingDoughFixes Fixed small balls not working in working dough commit3d19e75e1a
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 commitbdef3f95c3
Merge:8954b8c2
0bfafac6
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 14:56:58 2023 +0000 Merge pull request #467 from Rapandrasmus/WorkingDoughRework Working Dough rework commit0bfafac6fe
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:13:08 2023 +0200 modernised rockers pass turn commitd770266d81
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 commit2109c99a95
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 15:51:35 2023 +0200 gandw on balls has been added commit785abf8486
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 14:59:56 2023 +0200 Proper inactive handling now commit0a92b7bd69
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:52:15 2023 +0200 OnSpawnBall reimplemented commita14aacc181
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:37:09 2023 +0200 new sounds commit8b0544246d
Author: minenice55 <star.elementa@gmail.com> Date: Mon Jun 12 17:18:37 2023 -0400 update Jukebox to latest version fixes for inferred entity loading commitd8ff6744c0
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 21:36:57 2023 +0200 ball transporter anims for pass turn commitd283624b07
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 commit5b3c59eabd
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 commitdee630ea45
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 14:04:32 2023 +0200 Some new curves commit31e8890190
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 12:03:21 2023 +0200 Rockers can do it too now commit76bf6eefa6
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 commit8954b8c269
Merge:743e954e
ce3e6f2d
Author: minenice55 <star.elementa@gmail.com> Date: Sun Jun 11 15:55:40 2023 -0400 Merge branch 'master' into release_1 commit743e954e05
Merge:5af551b3
8929cd56
Author: minenice55 <star.elementa@gmail.com> 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 commit8929cd5618
Author: minenice55 <star.elementa@gmail.com> Date: Sun Jun 11 15:52:14 2023 -0400 don't infer track when importing a v0 riq from another program commit5af551b32e
Author: minenice55 <star.elementa@gmail.com> 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 commit4291333cb0
Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 23:00:30 2023 -0400 add updater for marching orders turn commit82da6da741
Merge:52a4d2b6
411b9a3c
Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 22:36:10 2023 -0400 Merge branch 'release_1' into pr/458 commit411b9a3cb1
Merge:b6c222a9
afc665ed
Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 22:30:32 2023 -0400 Merge branch 'master' into release_1 commitb6c222a981
Author: minenice55 <star.elementa@gmail.com> 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 commit52a4d2b65c
Author: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 16:55:10 2023 -0400 convert float to double and all that commitaa8f531466
Merge:242b076f
afc665ed
Author: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 16:01:44 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit242b076f09
Merge:db653d5a
2b0ced2f
Author: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 15:21:22 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commitdb653d5a52
Author: AstrlJelly <bdlawson115@gmail.com> 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 commit50a1b7bcdb
Author: minenice55 <star.elementa@gmail.com> 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 commit2c628a4109
Merge:4fde418c
6246a144
Author: minenice55 <star.elementa@gmail.com> Date: Wed Jun 14 01:23:31 2023 +0000 Merge pull request #473 from minenice55/easings-fix Enum Parsing Fix commit6246a144b6
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:21:13 2023 -0400 fix all parsing of enums, removed the "special case" for eases update to latest Jukebox commit4fde418c33
Merge:b9043582
50bc8765
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:39:15 2023 +0000 Merge pull request #469 from minenice55/jukebox-update Jukebox Package Update commitb90435825a
Merge:eec3c09a
73e9efd4
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 21:39:08 2023 +0000 Merge pull request #458 from AstrlJelly/MiscAdditions_4 Bug Fixes + Feature Additions commit73e9efd4b1
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 17:38:24 2023 -0400 add "updater" for the old marching entity commitb8d149743a
Merge:4291333c
eec3c09a
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 17:22:01 2023 -0400 Merge branch 'release_1' into pr/458 commit50bc876509
Author: minenice55 <star.elementa@gmail.com> 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 commiteec3c09aa8
Merge:a0d70933
990af323
Author: minenice55 <star.elementa@gmail.com> 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 commit990af32379
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 commita0d7093345
Merge:bdef3f95
3d19e75e
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 16:09:21 2023 +0000 Merge pull request #470 from Rapandrasmus/WorkingDoughFixes Fixed small balls not working in working dough commit3d19e75e1a
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 commitbdef3f95c3
Merge:8954b8c2
0bfafac6
Author: minenice55 <star.elementa@gmail.com> Date: Tue Jun 13 14:56:58 2023 +0000 Merge pull request #467 from Rapandrasmus/WorkingDoughRework Working Dough rework commit0bfafac6fe
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 16:13:08 2023 +0200 modernised rockers pass turn commitd770266d81
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 commit2109c99a95
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 15:51:35 2023 +0200 gandw on balls has been added commit785abf8486
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 14:59:56 2023 +0200 Proper inactive handling now commit0a92b7bd69
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:52:15 2023 +0200 OnSpawnBall reimplemented commita14aacc181
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Tue Jun 13 13:37:09 2023 +0200 new sounds commit8b0544246d
Author: minenice55 <star.elementa@gmail.com> Date: Mon Jun 12 17:18:37 2023 -0400 update Jukebox to latest version fixes for inferred entity loading commitd8ff6744c0
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 21:36:57 2023 +0200 ball transporter anims for pass turn commitd283624b07
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 commit5b3c59eabd
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 commitdee630ea45
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 14:04:32 2023 +0200 Some new curves commit31e8890190
Author: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Date: Mon Jun 12 12:03:21 2023 +0200 Rockers can do it too now commit76bf6eefa6
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 commit8954b8c269
Merge:743e954e
ce3e6f2d
Author: minenice55 <star.elementa@gmail.com> Date: Sun Jun 11 15:55:40 2023 -0400 Merge branch 'master' into release_1 commit743e954e05
Merge:5af551b3
8929cd56
Author: minenice55 <star.elementa@gmail.com> 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 commit8929cd5618
Author: minenice55 <star.elementa@gmail.com> Date: Sun Jun 11 15:52:14 2023 -0400 don't infer track when importing a v0 riq from another program commit5af551b32e
Author: minenice55 <star.elementa@gmail.com> 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 commit4291333cb0
Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 23:00:30 2023 -0400 add updater for marching orders turn commit82da6da741
Merge:52a4d2b6
411b9a3c
Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 22:36:10 2023 -0400 Merge branch 'release_1' into pr/458 commit411b9a3cb1
Merge:b6c222a9
afc665ed
Author: minenice55 <star.elementa@gmail.com> Date: Sat Jun 10 22:30:32 2023 -0400 Merge branch 'master' into release_1 commitb6c222a981
Author: minenice55 <star.elementa@gmail.com> 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 commit52a4d2b65c
Author: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 16:55:10 2023 -0400 convert float to double and all that commitaa8f531466
Merge:242b076f
afc665ed
Author: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 16:01:44 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commit242b076f09
Merge:db653d5a
2b0ced2f
Author: AstrlJelly <bdlawson115@gmail.com> Date: Sat Jun 10 15:21:22 2023 -0400 Merge remote-tracking branch 'upstream/master' into MiscAdditions_4 commitdb653d5a52
Author: AstrlJelly <bdlawson115@gmail.com> 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 commit50a1b7bcdb
Author: minenice55 <star.elementa@gmail.com> 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 👍 * 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 <chocolate2890mail@gmail.com> 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 <star.elementa@gmail.com> Co-authored-by: patata <patataofcourse@gmail.com> Co-authored-by: AstrlJelly <bdlawson115@gmail.com> Co-authored-by: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Co-authored-by: saladplainzone <chocolate2890mail@gmail.com> 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) * basic setup * Block pooling and finish editor redesign * Blocks almost fully replaced * Fix box selection * Too much to list all them * editor icon sprite sheet * vertical timeline scrolling * external profiler * metronome animation * fix special timeline * fix timeline autoscrolling * Fix dialogs * timeline zoom * block resizing * Add duplicate * fix place undo * copy paste * fixes 1 * sus fix for loading and saving * fix block window rescaling * another fix * nope that wasn't right * block positioning fix * update Jukebox * add special marker operations to the undo/redo system fix bugs with special marker operations --------- Co-authored-by: minenice55 <star.elementa@gmail.com> Co-authored-by: patata <patataofcourse@gmail.com> Co-authored-by: AstrlJelly <bdlawson115@gmail.com> Co-authored-by: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com> Co-authored-by: saladplainzone <chocolate2890mail@gmail.com> Co-authored-by: ev <85412919+evdial@users.noreply.github.com> Co-authored-by: Xylon <40894547+scriptorluminary@users.noreply.github.com>
1025 lines
No EOL
38 KiB
C#
1025 lines
No EOL
38 KiB
C#
using System;
|
|
using System.Collections;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using UnityEngine;
|
|
using UnityEngine.Pool;
|
|
|
|
using Starpelly;
|
|
using Jukebox;
|
|
using HeavenStudio.Util;
|
|
using HeavenStudio.Games;
|
|
using HeavenStudio.Common;
|
|
|
|
namespace HeavenStudio
|
|
{
|
|
public class GameManager : MonoBehaviour
|
|
{
|
|
const int SoundPoolSizeMin = 32;
|
|
const int SoundPoolSizeMax = 32;
|
|
|
|
[Header("Lists")]
|
|
[NonSerialized] public RiqBeatmap Beatmap = new();
|
|
private List<GameObject> preloadedGames = new();
|
|
[NonSerialized] public ObjectPool<Sound> SoundObjects;
|
|
|
|
[Header("Components")]
|
|
[NonSerialized] public Camera GameCamera, CursorCam, OverlayCamera, StaticCamera;
|
|
[NonSerialized] public CircleCursor CircleCursor;
|
|
[NonSerialized] public GameObject GamesHolder;
|
|
[NonSerialized] public Games.Global.Flash fade;
|
|
[NonSerialized] public Games.Global.Filter filter;
|
|
|
|
[Header("Games")]
|
|
[NonSerialized] public string currentGame;
|
|
Coroutine currentGameSwitchIE;
|
|
|
|
[Header("Properties")]
|
|
[NonSerialized] public string txt = null;
|
|
[NonSerialized] public string ext = null;
|
|
|
|
[NonSerialized]
|
|
public int currentEvent, currentTempoEvent, currentVolumeEvent, currentSectionEvent,
|
|
currentPreEvent, currentPreSwitch, currentPreSequence;
|
|
[NonSerialized] public double endBeat;
|
|
[NonSerialized] public float startOffset;
|
|
[NonSerialized] public bool playOnStart;
|
|
[NonSerialized] public double startBeat;
|
|
[NonSerialized] public GameObject currentGameO;
|
|
[NonSerialized] public bool autoplay;
|
|
[NonSerialized] public bool canInput = true;
|
|
[NonSerialized] public RiqEntity currentSection, nextSection;
|
|
public double sectionProgress { get; private set; }
|
|
|
|
bool AudioLoadDone;
|
|
bool ChartLoadError;
|
|
|
|
List<double> eventBeats, tempoBeats, volumeBeats, sectionBeats;
|
|
List<RiqEntity> allGameSwitches;
|
|
|
|
public event Action<double> onBeatChanged;
|
|
public event Action<RiqEntity> onSectionChange;
|
|
|
|
public int BeatmapEntities()
|
|
{
|
|
return Beatmap.Entities.Count + Beatmap.TempoChanges.Count + Beatmap.VolumeChanges.Count + Beatmap.SectionMarkers.Count;
|
|
}
|
|
|
|
public static GameManager instance { get; private set; }
|
|
private EventCaller eventCaller;
|
|
|
|
// average input accuracy (msec)
|
|
List<int> inputOffsetSamples = new List<int>();
|
|
float averageInputOffset = 0;
|
|
public float AvgInputOffset
|
|
{
|
|
get
|
|
{
|
|
return averageInputOffset;
|
|
}
|
|
set
|
|
{
|
|
inputOffsetSamples.Add((int)value);
|
|
averageInputOffset = (float)inputOffsetSamples.Average();
|
|
}
|
|
}
|
|
|
|
// input accuracy (%)
|
|
double totalInputs = 0;
|
|
double totalPlayerAccuracy = 0;
|
|
public double PlayerAccuracy
|
|
{
|
|
get
|
|
{
|
|
if (totalInputs == 0) return 0;
|
|
return totalPlayerAccuracy / totalInputs;
|
|
}
|
|
}
|
|
bool skillStarCollected = false;
|
|
|
|
// cleared sections
|
|
List<bool> clearedSections = new List<bool>();
|
|
public bool ClearedSection
|
|
{
|
|
set
|
|
{
|
|
clearedSections.Add(value);
|
|
}
|
|
}
|
|
|
|
private void Awake()
|
|
{
|
|
// autoplay = true;
|
|
instance = this;
|
|
}
|
|
|
|
public void Init(bool preLoaded = false)
|
|
{
|
|
AudioLoadDone = false;
|
|
ChartLoadError = false;
|
|
currentPreEvent = 0;
|
|
currentPreSwitch = 0;
|
|
currentPreSequence = 0;
|
|
|
|
GameObject filter = new GameObject("filter");
|
|
this.filter = filter.AddComponent<Games.Global.Filter>();
|
|
|
|
eventCaller = this.gameObject.AddComponent<EventCaller>();
|
|
eventCaller.GamesHolder = GamesHolder.transform;
|
|
eventCaller.Init();
|
|
Conductor.instance.SetBpm(120f);
|
|
Conductor.instance.SetVolume(100f);
|
|
Conductor.instance.firstBeatOffset = Beatmap.data.offset;
|
|
|
|
// note: serialize this shit in the inspector //
|
|
GameObject textbox = Instantiate(Resources.Load<GameObject>("Prefabs/Common/Textbox"));
|
|
textbox.name = "Textbox";
|
|
|
|
GameObject timingDisp = Instantiate(Resources.Load<GameObject>("Prefabs/Common/Overlays/TimingAccuracy"));
|
|
timingDisp.name = "TimingDisplay";
|
|
|
|
GameObject skillStarDisp = Instantiate(Resources.Load<GameObject>("Prefabs/Common/Overlays/SkillStar"));
|
|
skillStarDisp.name = "SkillStar";
|
|
|
|
GameObject overlays = Instantiate(Resources.Load<GameObject>("Prefabs/Common/Overlays"));
|
|
overlays.name = "Overlays";
|
|
|
|
GoForAPerfect.instance.Disable();
|
|
/////
|
|
|
|
SoundObjects = new ObjectPool<Sound>(CreatePooledSound, OnTakePooledSound, OnReturnPooledSound, OnDestroyPooledSound, true, SoundPoolSizeMin, SoundPoolSizeMax);
|
|
|
|
|
|
if (preLoaded)
|
|
{
|
|
LoadRemix(false);
|
|
}
|
|
else
|
|
{
|
|
RiqFileHandler.ClearCache();
|
|
NewRemix();
|
|
}
|
|
|
|
SortEventsList();
|
|
|
|
if (Beatmap.Entities.Count >= 1)
|
|
{
|
|
string game = Beatmap.Entities[0].datamodel.Split(0);
|
|
SetCurrentGame(game);
|
|
SetGame(game);
|
|
}
|
|
else
|
|
{
|
|
SetGame("noGame");
|
|
}
|
|
|
|
if (playOnStart)
|
|
{
|
|
StartCoroutine(WaitReadyAndPlayCo(startBeat));
|
|
}
|
|
}
|
|
|
|
Sound CreatePooledSound()
|
|
{
|
|
GameObject oneShot = new GameObject($"Pooled Scheduled Sound");
|
|
oneShot.transform.SetParent(transform);
|
|
|
|
AudioSource audioSource = oneShot.AddComponent<AudioSource>();
|
|
audioSource.playOnAwake = false;
|
|
|
|
Sound snd = oneShot.AddComponent<Sound>();
|
|
|
|
oneShot.SetActive(false);
|
|
|
|
return snd;
|
|
}
|
|
|
|
// Called when an item is returned to the pool using Release
|
|
void OnReturnPooledSound(Sound snd)
|
|
{
|
|
snd.Stop();
|
|
}
|
|
|
|
// Called when an item is taken from the pool using Get
|
|
void OnTakePooledSound(Sound snd)
|
|
{
|
|
snd.gameObject.SetActive(true);
|
|
}
|
|
|
|
// If the pool capacity is reached then any items returned will be destroyed.
|
|
void OnDestroyPooledSound(Sound snd)
|
|
{
|
|
snd.Stop();
|
|
Destroy(snd.gameObject);
|
|
}
|
|
|
|
public void NewRemix()
|
|
{
|
|
AudioLoadDone = false;
|
|
Beatmap = new("1", "HeavenStudio");
|
|
Beatmap.data.properties = Minigames.propertiesModel;
|
|
Beatmap.AddNewTempoChange(0, 120f);
|
|
Beatmap.AddNewVolumeChange(0, 100f);
|
|
Beatmap.data.offset = 0f;
|
|
Conductor.instance.musicSource.clip = null;
|
|
RiqFileHandler.UnlockCache();
|
|
RiqFileHandler.WriteRiq(Beatmap);
|
|
AudioLoadDone = true;
|
|
}
|
|
|
|
public IEnumerator LoadMusic()
|
|
{
|
|
ChartLoadError = false;
|
|
IEnumerator load = RiqFileHandler.LoadSong();
|
|
while (true)
|
|
{
|
|
object current = load.Current;
|
|
try
|
|
{
|
|
if (load.MoveNext() == false)
|
|
{
|
|
break;
|
|
}
|
|
current = load.Current;
|
|
}
|
|
catch (System.IO.FileNotFoundException f)
|
|
{
|
|
Debug.LogWarning("chart has no music: " + f.Message);
|
|
Conductor.instance.musicSource.clip = null;
|
|
AudioLoadDone = true;
|
|
yield break;
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
Debug.LogError($"Failed to load music: {e.Message}");
|
|
GlobalGameManager.ShowErrorMessage("Error Loading Music", e.Message + "\n\n" + e.StackTrace);
|
|
AudioLoadDone = true;
|
|
ChartLoadError = true;
|
|
yield break;
|
|
}
|
|
yield return current;
|
|
}
|
|
Conductor.instance.musicSource.clip = RiqFileHandler.StreamedAudioClip;
|
|
AudioLoadDone = true;
|
|
}
|
|
|
|
public void LoadRemix(bool editor = false)
|
|
{
|
|
AudioLoadDone = false;
|
|
ChartLoadError = false;
|
|
try
|
|
{
|
|
Beatmap = RiqFileHandler.ReadRiq();
|
|
}
|
|
catch (Exception e)
|
|
{
|
|
Debug.LogError($"Failed to load remix: {e.Message}");
|
|
GlobalGameManager.ShowErrorMessage("Error Loading RIQ", e.Message + "\n\n" + e.StackTrace);
|
|
ChartLoadError = true;
|
|
return;
|
|
}
|
|
if (!editor)
|
|
StartCoroutine(LoadMusic());
|
|
SortEventsList();
|
|
Conductor.instance.SetBpm(Beatmap.TempoChanges[0]["tempo"]);
|
|
Conductor.instance.SetVolume(Beatmap.VolumeChanges[0]["volume"]);
|
|
Conductor.instance.firstBeatOffset = Beatmap.data.offset;
|
|
if (!playOnStart)
|
|
{
|
|
Stop(0);
|
|
}
|
|
SetCurrentEventToClosest(0);
|
|
|
|
if (Beatmap.Entities.Count >= 1)
|
|
{
|
|
string game = Beatmap.Entities[0].datamodel.Split(0);
|
|
SetCurrentGame(game);
|
|
SetGame(game);
|
|
}
|
|
else
|
|
{
|
|
SetGame("noGame");
|
|
}
|
|
|
|
if (editor)
|
|
{
|
|
Debug.Log(Beatmap.data.riqOrigin);
|
|
if (Beatmap.data.riqOrigin != "HeavenStudio")
|
|
{
|
|
string origin = Beatmap.data.riqOrigin?.DisplayName() ?? "Unknown Origin";
|
|
GlobalGameManager.ShowErrorMessage("Warning",
|
|
$"This chart came from\n<alpha=#AA>{origin}</color>\nand uses content not included in Heaven Studio.\n\n<color=\"yellow\">You may be able to edit this chart in Heaven Studio to be used in its original program.</color>");
|
|
}
|
|
}
|
|
}
|
|
|
|
public void ScoreInputAccuracy(double accuracy, bool late, double time, double weight = 1, bool doDisplay = true)
|
|
{
|
|
totalInputs += weight;
|
|
totalPlayerAccuracy += accuracy * weight;
|
|
|
|
if (accuracy < Minigame.rankOkThreshold && weight > 0)
|
|
{
|
|
SkillStarManager.instance.KillStar();
|
|
}
|
|
|
|
if (SkillStarManager.instance.IsEligible && !skillStarCollected && accuracy >= 1f)
|
|
{
|
|
if (SkillStarManager.instance.DoStarJust())
|
|
skillStarCollected = true;
|
|
}
|
|
|
|
// push the hit event to the timing display
|
|
if (doDisplay)
|
|
TimingAccuracyDisplay.instance.MakeAccuracyVfx(time, late);
|
|
}
|
|
|
|
static bool StringStartsWith(string a, string b)
|
|
{
|
|
int aLen = a.Length;
|
|
int bLen = b.Length;
|
|
|
|
int ap = 0; int bp = 0;
|
|
|
|
while (ap < aLen && bp < bLen && a [ap] == b [bp])
|
|
{
|
|
ap++;
|
|
bp++;
|
|
}
|
|
|
|
return (bp == bLen);
|
|
}
|
|
|
|
public void SeekAheadAndPreload(double start, float seekTime = 8f)
|
|
{
|
|
List<RiqEntity> entitiesAtSameBeat = ListPool<RiqEntity>.Get();
|
|
Minigames.Minigame inf;
|
|
|
|
//seek ahead to preload games that have assetbundles
|
|
if (currentPreSwitch < allGameSwitches.Count && currentPreSwitch >= 0)
|
|
{
|
|
if (start + seekTime >= allGameSwitches[currentPreSwitch].beat)
|
|
{
|
|
string gameName = allGameSwitches[currentPreSwitch].datamodel.Split('/')[2];
|
|
inf = GetGameInfo(gameName);
|
|
if (inf != null && inf.usesAssetBundle && !inf.AssetsLoaded)
|
|
{
|
|
Debug.Log($"ASYNC loading assetbundles for game {gameName}");
|
|
StartCoroutine(inf.LoadCommonAssetBundleAsync());
|
|
StartCoroutine(inf.LoadLocalizedAssetBundleAsync());
|
|
}
|
|
currentPreSwitch++;
|
|
}
|
|
}
|
|
//then check game entities
|
|
if (currentPreEvent < Beatmap.Entities.Count && currentPreEvent >= 0)
|
|
{
|
|
if (start + seekTime >= eventBeats[currentPreEvent])
|
|
{
|
|
foreach (RiqEntity entity in Beatmap.Entities)
|
|
{
|
|
if (entity.beat == Beatmap.Entities[currentPreEvent].beat && !EventCaller.FXOnlyGames().Contains(eventCaller.GetMinigame(entity.datamodel.Split('/')[0])))
|
|
{
|
|
entitiesAtSameBeat.Add(entity);
|
|
}
|
|
}
|
|
SortEventsByPriority(entitiesAtSameBeat);
|
|
foreach (RiqEntity entity in entitiesAtSameBeat)
|
|
{
|
|
string gameName = entity.datamodel.Split('/')[0];
|
|
inf = GetGameInfo(gameName);
|
|
if (inf != null && inf.usesAssetBundle && !inf.AssetsLoaded)
|
|
{
|
|
Debug.Log($"ASYNC loading assetbundles for game {gameName}");
|
|
StartCoroutine(inf.LoadCommonAssetBundleAsync());
|
|
StartCoroutine(inf.LoadLocalizedAssetBundleAsync());
|
|
}
|
|
currentPreEvent++;
|
|
}
|
|
}
|
|
}
|
|
|
|
ListPool<RiqEntity>.Release(entitiesAtSameBeat);
|
|
}
|
|
|
|
public void SeekAheadAndDoPreEvent(double start)
|
|
{
|
|
if (currentPreSequence < Beatmap.Entities.Count && currentPreSequence >= 0)
|
|
{
|
|
List<RiqEntity> entitiesAtSameBeat = ListPool<RiqEntity>.Get();
|
|
RiqEntity seekEntity = Beatmap.Entities[currentPreSequence];
|
|
|
|
foreach (RiqEntity entity in Beatmap.Entities)
|
|
{
|
|
if (entity.beat == seekEntity.beat)
|
|
{
|
|
entitiesAtSameBeat.Add(entity);
|
|
}
|
|
}
|
|
SortEventsByPriority(entitiesAtSameBeat);
|
|
|
|
string[] seekEntityDatamodel = seekEntity.datamodel.Split('/');
|
|
|
|
float seekTime = eventCaller.GetGameAction(
|
|
eventCaller.GetMinigame(seekEntityDatamodel[0]), seekEntityDatamodel[1]).preFunctionLength;
|
|
|
|
if (start + seekTime >= eventBeats[currentPreSequence])
|
|
{
|
|
foreach (RiqEntity entity in entitiesAtSameBeat)
|
|
{
|
|
currentPreSequence++;
|
|
string gameName = entity.datamodel.Split('/')[0];
|
|
var inf = GetGameInfo(gameName);
|
|
if (inf != null && inf.usesAssetBundle && inf.AssetsLoaded && !inf.SequencesPreloaded)
|
|
{
|
|
Debug.Log($"Preloading game {gameName}");
|
|
PreloadGameSequences(gameName);
|
|
}
|
|
eventCaller.CallPreEvent(entity);
|
|
}
|
|
}
|
|
ListPool<RiqEntity>.Release(entitiesAtSameBeat);
|
|
}
|
|
}
|
|
|
|
private void Update()
|
|
{
|
|
if (BeatmapEntities() < 1) //bruh really you forgot to ckeck tempo changes
|
|
return;
|
|
if (!Conductor.instance.isPlaying)
|
|
return;
|
|
Conductor cond = Conductor.instance;
|
|
|
|
if (currentTempoEvent < Beatmap.TempoChanges.Count && currentTempoEvent >= 0)
|
|
{
|
|
if (cond.songPositionInBeatsAsDouble >= tempoBeats[currentTempoEvent])
|
|
{
|
|
cond.SetBpm(Beatmap.TempoChanges[currentTempoEvent]["tempo"]);
|
|
currentTempoEvent++;
|
|
}
|
|
}
|
|
|
|
if (currentVolumeEvent < Beatmap.VolumeChanges.Count && currentVolumeEvent >= 0)
|
|
{
|
|
if (cond.songPositionInBeatsAsDouble >= volumeBeats[currentVolumeEvent])
|
|
{
|
|
cond.SetVolume(Beatmap.VolumeChanges[currentVolumeEvent]["volume"]);
|
|
currentVolumeEvent++;
|
|
}
|
|
}
|
|
|
|
if (currentSectionEvent < Beatmap.SectionMarkers.Count && currentSectionEvent >= 0)
|
|
{
|
|
if (cond.songPositionInBeatsAsDouble >= sectionBeats[currentSectionEvent])
|
|
{
|
|
Debug.Log("Section " + Beatmap.SectionMarkers[currentSectionEvent]["sectionName"] + " started");
|
|
currentSection = Beatmap.SectionMarkers[currentSectionEvent];
|
|
currentSectionEvent++;
|
|
if (currentSectionEvent < Beatmap.SectionMarkers.Count)
|
|
nextSection = Beatmap.SectionMarkers[currentSectionEvent];
|
|
else
|
|
nextSection = default(RiqEntity);
|
|
onSectionChange?.Invoke(currentSection);
|
|
}
|
|
}
|
|
|
|
float seekTime = 8f;
|
|
//seek ahead to preload games that have assetbundles
|
|
SeekAheadAndPreload(cond.songPositionInBeatsAsDouble, seekTime);
|
|
SeekAheadAndDoPreEvent(cond.songPositionInBeatsAsDouble);
|
|
|
|
if (currentEvent < Beatmap.Entities.Count && currentEvent >= 0)
|
|
{
|
|
if (cond.songPositionInBeatsAsDouble >= eventBeats[currentEvent])
|
|
{
|
|
List<RiqEntity> entitiesAtSameBeat = ListPool<RiqEntity>.Get();
|
|
List<RiqEntity> fxEntities = ListPool<RiqEntity>.Get();
|
|
|
|
// allows for multiple events on the same beat to be executed on the same frame, so no more 1-frame delay
|
|
using (PooledObject<List<RiqEntity>> pool = ListPool<RiqEntity>.Get(out List<RiqEntity> currentBeatEntities))
|
|
{
|
|
currentBeatEntities = Beatmap.Entities.FindAll(c => c.beat == Beatmap.Entities[currentEvent].beat);
|
|
foreach (RiqEntity entity in currentBeatEntities)
|
|
{
|
|
if (EventCaller.FXOnlyGames().Contains(eventCaller.GetMinigame(entity.datamodel.Split('/')[0])))
|
|
{
|
|
fxEntities.Add(entity);
|
|
}
|
|
else
|
|
{
|
|
entitiesAtSameBeat.Add(entity);
|
|
}
|
|
}
|
|
}
|
|
|
|
SortEventsByPriority(fxEntities);
|
|
SortEventsByPriority(entitiesAtSameBeat);
|
|
|
|
// FX entities should ALWAYS execute before gameplay entities
|
|
foreach (RiqEntity entity in fxEntities)
|
|
{
|
|
eventCaller.CallEvent(entity, true);
|
|
currentEvent++;
|
|
}
|
|
|
|
foreach (RiqEntity entity in entitiesAtSameBeat)
|
|
{
|
|
// if game isn't loaded, preload game so whatever event that would be called will still run outside if needed
|
|
if (entity.datamodel.Split('/')[0] != currentGame)
|
|
{
|
|
eventCaller.CallEvent(entity, false);
|
|
}
|
|
else
|
|
{
|
|
eventCaller.CallEvent(entity, true);
|
|
}
|
|
|
|
// Thank you to @shshwdr for bring this to my attention
|
|
currentEvent++;
|
|
}
|
|
|
|
ListPool<RiqEntity>.Release(entitiesAtSameBeat);
|
|
ListPool<RiqEntity>.Release(fxEntities);
|
|
}
|
|
}
|
|
|
|
if (currentSection == null)
|
|
{
|
|
sectionProgress = 0;
|
|
}
|
|
else
|
|
{
|
|
double currectSectionStart = cond.GetSongPosFromBeat(currentSection.beat);
|
|
|
|
if (nextSection == null)
|
|
sectionProgress = (cond.songPosition - currectSectionStart) / (cond.GetSongPosFromBeat(endBeat) - currectSectionStart);
|
|
else
|
|
sectionProgress = (cond.songPosition - currectSectionStart) / (cond.GetSongPosFromBeat(nextSection.beat) - currectSectionStart);
|
|
}
|
|
}
|
|
|
|
private void LateUpdate()
|
|
{
|
|
OverlaysManager.instance.TogleOverlaysVisibility(Editor.Editor.instance == null || Editor.Editor.instance.fullscreen || ((PersistentDataManager.gameSettings.overlaysInEditor) && (!Editor.Editor.instance.fullscreen)) || HeavenStudio.Editor.GameSettings.InPreview);
|
|
}
|
|
|
|
public void ToggleInputs(bool inputs)
|
|
{
|
|
canInput = inputs;
|
|
}
|
|
|
|
#region Play Events
|
|
|
|
public void Play(double beat, float delay = 0f)
|
|
{
|
|
bool paused = Conductor.instance.isPaused;
|
|
Debug.Log("Playing at " + beat);
|
|
canInput = true;
|
|
if (!paused)
|
|
{
|
|
inputOffsetSamples.Clear();
|
|
averageInputOffset = 0;
|
|
|
|
totalInputs = 0;
|
|
totalPlayerAccuracy = 0;
|
|
|
|
TimingAccuracyDisplay.instance.ResetArrow();
|
|
SkillStarManager.instance.Reset();
|
|
skillStarCollected = false;
|
|
|
|
GoForAPerfect.instance.perfect = true;
|
|
GoForAPerfect.instance.Disable();
|
|
|
|
SectionMedalsManager.instance.Reset();
|
|
clearedSections.Clear();
|
|
}
|
|
|
|
StartCoroutine(PlayCo(beat, delay));
|
|
onBeatChanged?.Invoke(beat);
|
|
}
|
|
|
|
private IEnumerator PlayCo(double beat, float delay = 0f)
|
|
{
|
|
yield return new WaitForSeconds(delay);
|
|
bool paused = Conductor.instance.isPaused;
|
|
|
|
if (paused)
|
|
{
|
|
Util.SoundByte.UnpauseOneShots();
|
|
}
|
|
else
|
|
{
|
|
Conductor.instance.SetBpm(Beatmap.TempoChanges[0]["tempo"]);
|
|
Conductor.instance.SetVolume(Beatmap.VolumeChanges[0]["volume"]);
|
|
Conductor.instance.firstBeatOffset = Beatmap.data.offset;
|
|
SetCurrentEventToClosest(beat);
|
|
KillAllSounds();
|
|
|
|
Minigame miniGame = currentGameO?.GetComponent<Minigame>();
|
|
if (miniGame != null)
|
|
miniGame.OnPlay(beat);
|
|
}
|
|
|
|
Conductor.instance.Play(beat);
|
|
}
|
|
|
|
public void Pause()
|
|
{
|
|
Conductor.instance.Pause();
|
|
Util.SoundByte.PauseOneShots();
|
|
canInput = false;
|
|
}
|
|
|
|
public void Stop(double beat, bool restart = false, float restartDelay = 0f)
|
|
{
|
|
Minigame miniGame = currentGameO.GetComponent<Minigame>();
|
|
if (miniGame != null)
|
|
miniGame.OnStop(beat);
|
|
|
|
Conductor.instance.Stop(beat);
|
|
SetCurrentEventToClosest(beat);
|
|
onBeatChanged?.Invoke(beat);
|
|
|
|
// I feel like I should standardize the names
|
|
SkillStarManager.instance.KillStar();
|
|
TimingAccuracyDisplay.instance.StopStarFlash();
|
|
GoForAPerfect.instance.Disable();
|
|
SectionMedalsManager.instance.OnRemixEnd();
|
|
|
|
// pass this data to rating screen + stats
|
|
Debug.Log($"== Playthrough statistics of {Beatmap["remixtitle"]} (played at {System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}) ==");
|
|
Debug.Log($"Average input offset for playthrough: {averageInputOffset}ms");
|
|
Debug.Log($"Accuracy for playthrough: {(PlayerAccuracy * 100): 0.00}");
|
|
Debug.Log($"Cleared {clearedSections.FindAll(c => c).Count} sections out of {Beatmap.SectionMarkers.Count}");
|
|
if (SkillStarManager.instance.IsCollected)
|
|
Debug.Log($"Skill Star collected");
|
|
else
|
|
Debug.Log($"Skill Star not collected");
|
|
if (GoForAPerfect.instance.perfect)
|
|
Debug.Log($"Perfect Clear!");
|
|
|
|
KillAllSounds();
|
|
if (playOnStart || restart)
|
|
{
|
|
Play(0, restartDelay);
|
|
}
|
|
// when rating screen gets added playOnStart will instead move to that scene
|
|
}
|
|
|
|
private IEnumerator WaitReadyAndPlayCo(double beat)
|
|
{
|
|
WaitUntil yieldOverlays = new WaitUntil(() => OverlaysManager.OverlaysReady);
|
|
WaitUntil yieldBeatmap = new WaitUntil(() => Beatmap != null && Beatmap.Entities.Count > 0);
|
|
WaitUntil yieldAudio = new WaitUntil(() => AudioLoadDone || (ChartLoadError && !GlobalGameManager.IsShowingDialog));
|
|
|
|
// wait for overlays to be ready
|
|
yield return yieldOverlays;
|
|
// wait for first game to be loaded
|
|
yield return yieldBeatmap;
|
|
//wait for audio clip to be loaded
|
|
yield return yieldAudio;
|
|
|
|
SkillStarManager.instance.KillStar();
|
|
TimingAccuracyDisplay.instance.StopStarFlash();
|
|
GoForAPerfect.instance.Disable();
|
|
SectionMedalsManager.instance?.OnRemixEnd();
|
|
|
|
GlobalGameManager.UpdateDiscordStatus(Beatmap["remixtitle"].ToString(), false, true);
|
|
|
|
Play(beat, 1f);
|
|
yield break;
|
|
}
|
|
|
|
public void KillAllSounds()
|
|
{
|
|
Debug.Log("Killing all sounds");
|
|
SoundObjects.Clear();
|
|
Util.SoundByte.KillOneShots();
|
|
}
|
|
|
|
#endregion
|
|
|
|
#region List Functions
|
|
|
|
public void SortEventsList()
|
|
{
|
|
Beatmap.Entities.Sort((x, y) => x.beat.CompareTo(y.beat));
|
|
Beatmap.TempoChanges.Sort((x, y) => x.beat.CompareTo(y.beat));
|
|
Beatmap.VolumeChanges.Sort((x, y) => x.beat.CompareTo(y.beat));
|
|
Beatmap.SectionMarkers.Sort((x, y) => x.beat.CompareTo(y.beat));
|
|
|
|
eventBeats = Beatmap.Entities.Select(c => c.beat).ToList();
|
|
tempoBeats = Beatmap.TempoChanges.Select(c => c.beat).ToList();
|
|
volumeBeats = Beatmap.VolumeChanges.Select(c => c.beat).ToList();
|
|
sectionBeats = Beatmap.SectionMarkers.Select(c => c.beat).ToList();
|
|
|
|
allGameSwitches = EventCaller.GetAllInGameManagerList("gameManager", new string[] { "switchGame" });
|
|
}
|
|
|
|
void SortEventsByPriority(List<RiqEntity> entities)
|
|
{
|
|
string[] xDatamodel;
|
|
string[] yDatamodel;
|
|
entities.Sort((x, y) =>
|
|
{
|
|
xDatamodel = x.datamodel.Split('/');
|
|
yDatamodel = y.datamodel.Split('/');
|
|
|
|
Minigames.Minigame xGame = eventCaller.GetMinigame(xDatamodel[0]);
|
|
Minigames.GameAction xAction = eventCaller.GetGameAction(xGame, xDatamodel[1]);
|
|
Minigames.Minigame yGame = eventCaller.GetMinigame(yDatamodel[0]);
|
|
Minigames.GameAction yAction = eventCaller.GetGameAction(yGame, yDatamodel[1]);
|
|
|
|
return yAction.priority.CompareTo(xAction.priority);
|
|
});
|
|
|
|
}
|
|
|
|
public static double GetClosestInList(List<double> list, double compareTo)
|
|
{
|
|
if (list.Count > 0)
|
|
return list.Aggregate((x, y) => Math.Abs(x - compareTo) < Math.Abs(y - compareTo) ? x : y);
|
|
else
|
|
return double.MinValue;
|
|
}
|
|
|
|
public static int GetIndexAfter(List<double> list, double compareTo)
|
|
{
|
|
list.Sort();
|
|
if (list.Count > 0)
|
|
{
|
|
foreach (double item in list)
|
|
{
|
|
if (item >= compareTo)
|
|
{
|
|
return Math.Max(list.IndexOf(item), 0);
|
|
}
|
|
}
|
|
return list.Count;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
public static int GetIndexBefore(List<double> list, double compareTo)
|
|
{
|
|
list.Sort();
|
|
if (list.Count > 0)
|
|
{
|
|
foreach (double item in list)
|
|
{
|
|
if (item >= compareTo)
|
|
{
|
|
return Math.Max(list.IndexOf(item) - 1, 0);
|
|
}
|
|
}
|
|
return list.Count - 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
public void SetCurrentEventToClosest(double beat)
|
|
{
|
|
SortEventsList();
|
|
onBeatChanged?.Invoke(beat);
|
|
if (Beatmap.Entities.Count > 0)
|
|
{
|
|
currentEvent = GetIndexAfter(eventBeats, beat);
|
|
currentPreEvent = GetIndexAfter(eventBeats, beat);
|
|
currentPreSequence = GetIndexAfter(eventBeats, beat);
|
|
|
|
var gameSwitchs = Beatmap.Entities.FindAll(c => c.datamodel.Split("/")[1] == "switchGame");
|
|
|
|
string newGame = Beatmap.Entities[Math.Min(currentEvent, eventBeats.Count - 1)].datamodel.Split(0);
|
|
|
|
if (gameSwitchs.Count > 0)
|
|
{
|
|
int index = GetIndexBefore(gameSwitchs.Select(c => c.beat).ToList(), beat);
|
|
currentPreSwitch = index;
|
|
var closestGameSwitch = gameSwitchs[index];
|
|
if (closestGameSwitch.beat <= beat)
|
|
{
|
|
newGame = closestGameSwitch.datamodel.Split(2);
|
|
}
|
|
else if (closestGameSwitch.beat > beat)
|
|
{
|
|
if (index == 0)
|
|
{
|
|
newGame = Beatmap.Entities[0].datamodel.Split(0);
|
|
}
|
|
else
|
|
{
|
|
if (index - 1 >= 0)
|
|
{
|
|
newGame = gameSwitchs[index - 1].datamodel.Split(2);
|
|
}
|
|
else
|
|
{
|
|
newGame = Beatmap.Entities[Beatmap.Entities.IndexOf(closestGameSwitch) - 1].datamodel.Split(0);
|
|
}
|
|
}
|
|
}
|
|
// newGame = gameSwitchs[gameSwitchs.IndexOf(gameSwitchs.Find(c => c.beat == Mathp.GetClosestInList(gameSwitchs.Select(c => c.beat).ToList(), beat)))].datamodel.Split(2);
|
|
}
|
|
|
|
if (!GetGameInfo(newGame).fxOnly)
|
|
{
|
|
SetGame(newGame);
|
|
}
|
|
|
|
List<RiqEntity> allEnds = EventCaller.GetAllInGameManagerList("gameManager", new string[] { "end" });
|
|
if (allEnds.Count > 0)
|
|
endBeat = allEnds.Select(c => c.beat).Min();
|
|
else
|
|
endBeat = Conductor.instance.SongLengthInBeatsAsDouble();
|
|
}
|
|
else
|
|
{
|
|
SetGame("noGame");
|
|
endBeat = Conductor.instance.SongLengthInBeatsAsDouble();
|
|
}
|
|
|
|
if (Beatmap.TempoChanges.Count > 0)
|
|
{
|
|
currentTempoEvent = 0;
|
|
|
|
//for tempo changes, just go over all of em until the last one we pass
|
|
for (int t = 0; t < tempoBeats.Count; t++)
|
|
{
|
|
// Debug.Log("checking tempo event " + t + " against beat " + beat + "( tc beat " + tempoChanges[t] + ")");
|
|
if (tempoBeats[t] > beat)
|
|
{
|
|
break;
|
|
}
|
|
currentTempoEvent = t;
|
|
}
|
|
// Debug.Log("currentTempoEvent is now " + currentTempoEvent);
|
|
}
|
|
|
|
if (Beatmap.VolumeChanges.Count > 0)
|
|
{
|
|
currentVolumeEvent = 0;
|
|
|
|
for (int t = 0; t < volumeBeats.Count; t++)
|
|
{
|
|
if (volumeBeats[t] > beat)
|
|
{
|
|
break;
|
|
}
|
|
currentVolumeEvent = t;
|
|
}
|
|
}
|
|
|
|
currentSection = default(RiqEntity);
|
|
nextSection = default(RiqEntity);
|
|
if (Beatmap.SectionMarkers.Count > 0)
|
|
{
|
|
currentSectionEvent = 0;
|
|
|
|
for (int t = 0; t < sectionBeats.Count; t++)
|
|
{
|
|
if (sectionBeats[t] > beat)
|
|
{
|
|
break;
|
|
}
|
|
currentSectionEvent = t;
|
|
}
|
|
}
|
|
onSectionChange?.Invoke(currentSection);
|
|
|
|
SeekAheadAndPreload(beat);
|
|
}
|
|
|
|
#endregion
|
|
|
|
public void SwitchGame(string game, double beat, bool flash)
|
|
{
|
|
if (game != currentGame)
|
|
{
|
|
if (currentGameSwitchIE != null)
|
|
StopCoroutine(currentGameSwitchIE);
|
|
currentGameSwitchIE = StartCoroutine(SwitchGameIE(game, beat, flash));
|
|
}
|
|
}
|
|
|
|
IEnumerator SwitchGameIE(string game, double beat, bool flash)
|
|
{
|
|
if (flash)
|
|
{
|
|
HeavenStudio.StaticCamera.instance.ToggleCanvasVisibility(false);
|
|
}
|
|
|
|
SetGame(game, false);
|
|
|
|
Minigame miniGame = currentGameO.GetComponent<Minigame>();
|
|
if (miniGame != null)
|
|
miniGame.OnGameSwitch(beat);
|
|
|
|
while (beat + 0.25 > Conductor.instance.songPositionInBeats)
|
|
{
|
|
if (!Conductor.instance.isPlaying)
|
|
{
|
|
HeavenStudio.StaticCamera.instance.ToggleCanvasVisibility(true);
|
|
SetAmbientGlowToCurrentMinigameColor();
|
|
StopCoroutine(currentGameSwitchIE);
|
|
}
|
|
yield return null;
|
|
}
|
|
|
|
HeavenStudio.StaticCamera.instance.ToggleCanvasVisibility(true);
|
|
SetAmbientGlowToCurrentMinigameColor();
|
|
}
|
|
|
|
private void SetGame(string game, bool useMinigameColor = true)
|
|
{
|
|
Destroy(currentGameO);
|
|
|
|
currentGameO = Instantiate(GetGame(game));
|
|
currentGameO.transform.parent = eventCaller.GamesHolder.transform;
|
|
currentGameO.name = game;
|
|
|
|
SetCurrentGame(game, useMinigameColor);
|
|
|
|
ResetCamera();
|
|
}
|
|
|
|
public void PreloadGameSequences(string game)
|
|
{
|
|
var gameInfo = GetGameInfo(game);
|
|
//load the games' sound sequences
|
|
// TODO: this blocks the main thread, and sound sequences sould be stored in a ScriptableObject
|
|
if (gameInfo != null && gameInfo.LoadedSoundSequences == null)
|
|
gameInfo.LoadedSoundSequences = GetGame(game).GetComponent<Minigame>().SoundSequences;
|
|
}
|
|
|
|
public GameObject GetGame(string name)
|
|
{
|
|
var gameInfo = GetGameInfo(name);
|
|
if (gameInfo != null)
|
|
{
|
|
if (gameInfo.fxOnly)
|
|
{
|
|
var gameInfos = Beatmap.Entities
|
|
.Select(x => x.datamodel.Split(0))
|
|
.Select(x => GetGameInfo(x))
|
|
.Where(x => x != null)
|
|
.Where(x => !x.fxOnly)
|
|
.Select(x => x.LoadableName);
|
|
name = gameInfos.FirstOrDefault() ?? "noGame";
|
|
}
|
|
else
|
|
{
|
|
if (gameInfo.usesAssetBundle)
|
|
{
|
|
//game is packed in an assetbundle, load from that instead
|
|
// this is fucked!! figure out a way to make this async
|
|
return gameInfo.GetCommonAssetBundle().LoadAsset<GameObject>(name);
|
|
}
|
|
name = gameInfo.LoadableName;
|
|
}
|
|
}
|
|
return Resources.Load<GameObject>($"Games/{name}");
|
|
}
|
|
|
|
public Minigames.Minigame GetGameInfo(string name)
|
|
{
|
|
return eventCaller.minigames.Find(c => c.name == name);
|
|
}
|
|
|
|
public void SetCurrentGame(string game, bool useMinigameColor = true)
|
|
{
|
|
currentGame = game;
|
|
if (GetGameInfo(currentGame) != null)
|
|
{
|
|
CircleCursor.InnerCircle.GetComponent<SpriteRenderer>().color = Colors.Hex2RGB(GetGameInfo(currentGame).color);
|
|
if (useMinigameColor) HeavenStudio.StaticCamera.instance.SetAmbientGlowColour(Colors.Hex2RGB(GetGameInfo(currentGame).color), true);
|
|
//else HeavenStudio.StaticCamera.instance.SetAmbientGlowColour(HeavenStudio.GameCamera.currentColor, false);
|
|
else HeavenStudio.StaticCamera.instance.SetAmbientGlowColour(Color.black, false);
|
|
}
|
|
else
|
|
{
|
|
CircleCursor.InnerCircle.GetComponent<SpriteRenderer>().color = Color.white;
|
|
//HeavenStudio.StaticCamera.instance.SetAmbientGlowColour(HeavenStudio.GameCamera.currentColor, false);
|
|
HeavenStudio.StaticCamera.instance.SetAmbientGlowColour(Color.black, false);
|
|
}
|
|
}
|
|
|
|
private void SetAmbientGlowToCurrentMinigameColor()
|
|
{
|
|
if (GetGameInfo(currentGame) != null)
|
|
HeavenStudio.StaticCamera.instance.SetAmbientGlowColour(Colors.Hex2RGB(GetGameInfo(currentGame).color), true);
|
|
}
|
|
|
|
private bool SongPosLessThanClipLength(float t)
|
|
{
|
|
if (Conductor.instance.musicSource.clip != null)
|
|
return Conductor.instance.GetSongPosFromBeat(t) < Conductor.instance.musicSource.clip.length;
|
|
else
|
|
return true;
|
|
}
|
|
|
|
public void ResetCamera()
|
|
{
|
|
HeavenStudio.GameCamera.ResetAdditionalTransforms();
|
|
}
|
|
}
|
|
} |