Commit Graph

414 Commits

Author SHA1 Message Date
Jenny Crowe 2749f9a782
Merge branch 'master' into master 2022-05-07 14:28:49 -07:00
Jenny Crowe 7d2bc548a5
Merge pull request #76 from Pengu12345/alternate_input_system
Separation of input detection in it's own class + Addition of Coin Toss
2022-05-07 14:19:15 -07:00
Jenny Crowe b437b5b392
Merge pull request #77 from freeformfunposting/master
(minor) Fix for a sound error with Autoplay in Spaceball
2022-05-07 14:18:04 -07:00
Stef Jenkins bdc5642710
Fixed a sound error with Autoplay 2022-05-06 15:14:01 -07:00
Pengu123 d4c2fe669a Clean up the debug messages 2022-05-06 22:30:17 +02:00
Pengu123 06c4bf0c16 Background control in Coin Flip 2022-05-06 22:23:52 +02:00
Pengu123 286b778676 Cleanup + new Shedule methods 2022-05-06 22:05:19 +02:00
Pengu123 34e29efae8 More comments, new method to detect expected inputs
IsExpectingInputNow() detects wether the player is expected to input something at the closest InputEvent
2022-05-04 20:37:52 +02:00
Pengu123 6384d28295 Added a list to keep track of all the scheduled inputs of a minigame
...Along with an Util function to return the closest scheduled input
2022-05-04 20:05:51 +02:00
Pengu123 f056b0d4b6 noAutoplay and autoplayOnly settings
Would be especially useful for menial optional inputs like the offbeat parts of flockstep
2022-05-04 19:21:11 +02:00
Pengu123 8911581873 Added Support for specific direction inputs
Added some comments on the PlayerInput class too for clarity
2022-05-04 18:42:06 +02:00
Pengu123 846e4c5c4c Fixed Input bugs + Optimizations
-- On the PlayerInput class --
FIXED: Bug where Directions input were still recorded even with autoplay on
OPTIMIZED: Moved the conditions wether player had control in it's own method so we can re-use the same condition on new methods
2022-05-04 18:05:05 +02:00
Pengu123 f41d9d9cf0 ScheduleInput Method added, tests awaiting 2022-05-03 22:36:55 +02:00
minenice55 85ba13b21b Fan Club: fast kamone plays when scene is unloaded 2022-05-02 16:16:00 -04:00
minenice55 1fb8271d1e Fan Club: unarranged sequel feature-complete 2022-05-02 13:43:47 -04:00
minenice55 33eb285385 Fan Club: particle stuff, unarranged crouch / kiss 2022-05-02 11:45:48 -04:00
minenice55 e58feee0db Fan Club: arranged landing, corrected texture atlas colours 2022-05-01 20:08:48 -04:00
Pengu123 94b688dbc6 Bug Fixing 2022-05-02 00:24:07 +02:00
Pengu123 70dd10c646 Coin Toss Done. Needs HD Textures and more customization 2022-05-01 23:49:55 +02:00
Pengu123 72b4ef1aeb Coin Toss Functionnal (Needs Miss and Blank animation) 2022-05-01 22:10:00 +02:00
Pengu123 fdfcbe8948 Throw and Catch animation 2022-05-01 20:22:00 +02:00
minenice55 c041b37031 Fan Club: cont. unarranged sequel work 2022-04-30 01:20:19 -04:00
minenice55 f3b7b851f5 Fan Club: more work on unarranged sequel 2022-04-30 00:36:47 -04:00
minenice55 6979e454f6 Fan Club: initial support for "unarranged" sequel 2022-04-28 17:56:00 -04:00
minenice55 6be3b47559 Fan Club: various adjustments
address input lockout (still has one minor issue I need to check)
make certain forced animations make more sense
2022-04-28 16:01:07 -04:00
minenice55 ad05ecf6f2 Fan Club: add fast kamone 2022-04-27 18:02:53 -04:00
minenice55 74a83c46c5 Trick on the Class: new minigame definition 2022-04-13 10:14:13 -04:00
minenice55 64897819a8 Merge branch 'master' into game-mobTrick 2022-04-13 10:12:47 -04:00
minenice55 d7ff6e23b4 Internal: fixed duplicated game defs 2022-04-12 17:49:00 -04:00
minenice55 be41ff3014 Internal: separate minigame definitions 2022-04-12 12:14:46 -04:00
minenice55 1775923118 Trick on the Class: refactor object sound 2022-04-11 10:57:27 -04:00
minenice55 995d20d522 Trick on the Class: prep bop entity 2022-04-11 09:56:37 -04:00
adianfiuef f6dd5e28a9 Tram&Pauline 2022-04-11 02:05:43 -07:00
minenice55 27dd45148e Trick on the Class: basic gameplay with placeholders 2022-04-10 21:05:33 -04:00
minenice55 c3ef726ef8 Trick on the Class: object rotation 2022-04-10 19:15:59 -04:00
minenice55 beeb309e26 Trick on the Class: flying objects 2022-04-10 18:29:31 -04:00
minenice55 51c529a16f Trick on the Class: object paths 2022-04-10 17:37:37 -04:00
minenice55 a193cf8909 Trick on the Class: initial setup
hell
2022-04-04 10:48:37 -04:00
Jenny Crowe f7d1aaea63
Merge pull request #66 from minenice55/more-ntrIdol-2
Fan Club: bugfixes and additions
2022-03-28 11:55:18 -07:00
minenice55 158d0ab2f3 Correct compilation errors from merge 2022-03-28 09:45:16 -04:00
minenice55 04328464f7 Merge branch 'master' into more-ntrIdol-2 2022-03-28 09:43:55 -04:00
Slaith e6373b5d26 Fixed barrel break not working 2022-03-27 18:23:59 -07:00
minenice55 8ca290cc3f Fan Club: more animations 2022-03-27 19:05:08 -04:00
Slaith 030837d3c9 Allowed lion count and mii faces to be set before game switches and fixed some bugs from last pr
I went through every single game script to look for bugs in intialization, there shouldn't be anything else that was caused by the pr (there is a bug in Spaceball where a ball cue won't trigger correctly if it's on the same beat as the switch, but i'm not sure how to fix it)
2022-03-27 11:13:13 -07:00
Jenny Crowe d72aa964b2 Blue Bear: Crumbs! (Also fixed animation bugs associated with a recent PR) 2022-03-27 05:08:26 -07:00
minenice55 f179122dfa Fan Club: idol squatting animation 2022-03-27 00:11:32 -04:00
Slaith 2f974e0e61 fixing another bug with clappy trio 2022-03-26 17:53:34 -07:00
Slaith e28862c99e i'm dumb lol 2022-03-26 17:42:50 -07:00
Jenny Crowe 4321e2c719
Merge pull request #63 from Slaith12/main
Prevented out of order initialization
2022-03-25 21:48:51 -07:00
minenice55 6e3ba6ba9f Fan Club: arisa jump 2022-03-25 22:45:54 -04:00
Slaith ebeea121ed Moved all minigame initialization to Awake()
I just moved everything that was in start to awake. There are a few other changes I made, like using init functions rather than awake in scripts that depended on something that was initialized in another script's awake (to make sure things always happen in the right order), as well as some other stuff in some specific minigames
2022-03-25 19:08:46 -07:00
minenice55 7d2160d221 Fan Club: root motion 2022-03-25 18:59:18 -04:00
minenice55 c3db3ac3d7 Fan Club: fix references 2022-03-25 18:51:43 -04:00
minenice55 bef788eae8 Fan Club: note to self 2022-03-22 15:49:29 -04:00
minenice55 44f298e104 Merge branch 'master' into more-ntrIdol-2 2022-03-22 15:28:44 -04:00
minenice55 a51104f77e Fan Club: prepare Arisa jumping 2022-03-22 15:23:55 -04:00
minenice55 f6df1644bc Conductor: property that returns secPerBeat scaled to song pitch
NEEDS TESTING
2022-03-22 14:29:15 -04:00
minenice55 77edc1f624 Fan Club: fix forcing idol anims during responses 2022-03-21 11:29:24 -04:00
minenice55 0004961f90 Fan Club: address issue with double clap -> I suppose stack 2022-03-21 11:23:42 -04:00
minenice55 f37f2af665 oops forgot a small thing
includes example using a fan club sound
2022-03-20 19:58:37 -04:00
Jenny Crowe 41f572b692
Merge pull request #57 from Slaith12/main
Fixed space soccer ball spawning when it shouldn't be
2022-03-18 18:42:31 -07:00
Slaith d6a6265458 Fixed space soccer ball spawning when it shouldn't be
The soccer ball that is part of the prefab no longer defaults to the Dispensing state (when i refactored the ball script a while ago, i dealt with this problem by just disabling that ball, but this solution should work even with the ball enabled)
2022-03-17 18:44:58 -07:00
minenice55 a84b8858d6 Fan Club: landing sound 2022-03-17 17:01:26 -04:00
minenice55 f6269d1acb Fan Club: add cues continuing from transition, muted cues 2022-03-17 16:43:35 -04:00
minenice55 523926a692 Fan Club: make forced animations properly restart 2022-03-17 15:18:40 -04:00
minenice55 7d6fe11243 Fan Club: refactoring, fixes 2022-03-17 15:13:48 -04:00
minenice55 82824638d8 Fan Club: remove unused file 2022-03-17 12:20:11 -04:00
Jenny Crowe 22b946496b
Merge pull request #55 from minenice55/game-ntrIdol
Minigame: Fan Club
2022-03-16 16:22:10 -07:00
minenice55 4f3604e794 Fan Club: fix forced "peace no sync" animation 2022-03-16 17:45:12 -04:00
minenice55 bc1e8856a5 Fan Club: add particle effect to forced clap 2022-03-16 17:43:37 -04:00
minenice55 5ae6b8a267 Fan Club: finish all basic functionality
todo: other "special" animations
2022-03-16 17:41:46 -04:00
Jenny Crowe 3771eac08f Crop Stomp: Minor visual tweaks 2022-03-16 02:53:30 -07:00
Carson Kompon f8d85c3e23 Added Streaks and Set Background Color to Drumming Practice 2022-03-15 19:15:54 -04:00
minenice55 b58030e018 Fan Club: actual functionality (input still bugged) 2022-03-15 18:43:13 -04:00
minenice55 9c640ea3d2 Fan Club: like 50% of the game lmao 2022-03-14 20:54:54 -04:00
minenice55 8421379078 Fan Club: update script to new namespace 2022-03-14 10:36:19 -04:00
minenice55 10f840aa26 Merge branch 'master' into game-ntrIdol 2022-03-14 10:35:33 -04:00
minenice55 77662a3ced Fan Club: more idol stuff 2022-03-14 10:35:04 -04:00
Jenny Crowe 9f7b8ee278 The biggest of boi refactors 2022-03-14 07:21:05 -07:00
minenice55 2ae8919657 Fan Club: idol setup part 1 2022-03-13 18:23:38 -04:00
minenice55 ee8e9fc059 Merge branch 'master' into game-ntrIdol 2022-03-13 12:50:17 -04:00
Jenny Crowe 95a04168ec Fireworks: More setup 2022-03-13 07:35:22 -07:00
Jenny Crowe 3a6df6035b Stomp: Fixed issues associated with specific cue setups. 2022-03-13 03:25:41 -07:00
minenice55 cd652e4107 Fan Club: start scene setup 2022-03-12 23:24:37 -05:00
Jenny Crowe 5a9cf5507a
Merge pull request #49 from CarsonKompon/mr-upbeat-repositioning
Proper Mr. Upbeat Positioning
2022-03-12 18:32:12 -07:00
saladplainzone bb67037588 Fixed Space Soccer Dispense Sound 2022-03-12 17:13:10 -08:00
Carson Kompon ad151c3d07 Proper Mr. Upbeat Positioning 2022-03-12 11:57:46 -05:00
Jenny Crowe caf2394c47 Blue Bear: Basic gameplay setup 2022-03-12 07:14:41 -07:00
Jenny Crowe 147332cff2 Fork Lifter: Minor script tweak for readability. 2022-03-11 21:20:33 -07:00
Jenny Crowe 30d2931762 Organization refactor 2022-03-11 21:10:13 -07:00
Jenny Crowe 64a5bd6674 Blue Bear: Extremely basic scene setup 2022-03-11 20:15:15 -07:00
Carson Kompon 8ebcf18501 Mr. Upbeat now starts on the go no matter what 2022-03-11 20:54:05 -05:00
minenice55 b506c8f452 de-hardcode conditional 2022-03-11 13:24:24 -05:00
minenice55 5cf2255022 Drumming Practice: individually set each mii
note: had to add a third integer value to the Beatmap parameters, may wanna consider using some kind of array in the future
2022-03-11 13:20:24 -05:00
Jenny Crowe 344a5b37d6 Rhythm Rally: Darkened table shadow. Crop Stomp: Commented out unneeded debug call. General: Moved model stuff to new "Models" folder. 2022-03-11 03:52:11 -07:00
Jenny Crowe 32b647a4d4 BTSDS: Outlines via Post Processing 2022-03-10 05:45:21 -07:00
Jenny Crowe 1a90ba28d9 Jukebox/Sound code cleanup 2022-03-09 20:59:48 -07:00
Jenny Crowe 84c4e8fc9f BTSDS: Piano notes will now stop properly even if the game switches during them. 2022-03-09 20:50:19 -07:00
Jenny Crowe 5a56ecf261
Merge pull request #46 from Slaith12/main
Implemented Inactive Functions and made OnGameSwitch functional
2022-03-08 17:12:52 -07:00
Jenny Crowe a90d7fc833
Merge pull request #45 from CarsonKompon/fix-sfx-cleanup
SFX Cleanup (Mr. Upbeat and Drumming Practice)
2022-03-08 17:12:21 -07:00
Slaith 2f5233d76c Merge branch 'master' of https://github.com/megaminerjenny/HeavenStudio into megaminerjenny-master 2022-03-07 20:53:30 -08:00
Slaith fca105259c Implemented inactive functions for all game count ins
Also made some changes to how SwitchGame(), OnGameSwitch, and the jukebox work.
2022-03-07 20:46:49 -08:00
Jenny Crowe ad5dd56de3 Flash now relegated to its own layer 2022-03-07 17:21:27 -07:00
Carson Kompon f971cba1be Added generic Applause sound
Cleaned up Mr. Upbeat and Drumming Practice sounds as a result
2022-03-07 12:10:50 -05:00
Jenny Crowe a6f2353a92 Flash now renders in fullscreen 2022-03-07 08:58:34 -07:00
Jenny Crowe c7149f0737 Goodbye tidalwav we hardly knew ye (+ BTSDS piano reacts to song pitch) 2022-03-07 05:54:36 -07:00
Jenny Crowe 34819ed791 BTSDS: Piano does not pierce ears as much 2022-03-07 02:34:38 -07:00
Jenny Crowe 2ac602dbe6 BTSDS: Piano!!! 2022-03-07 02:16:31 -07:00
Carson Kompon 48e81d4df9 Added "Set Mii" to Drumming Practice 2022-03-07 00:26:59 -05:00
Carson Kompon 87b474b1ba Working Drumming Practice 2022-03-07 00:00:54 -05:00
Carson Kompon 48c0f0994c Started prepping Drumming Practice 2022-03-06 22:17:46 -05:00
Slaith12 c4b2ea97fd
Merge branch 'megaminerjenny:master' into main 2022-03-06 19:00:57 -08:00
Jenny Crowe 1514f8d16a
Merge pull request #42 from CarsonKompon/mr-upbeat-2
Fully functional and animated Mr. Upbeat
2022-03-06 19:53:57 -07:00
Slaith12 0360d07b5d
Merge branch 'megaminerjenny:master' into main 2022-03-06 18:37:51 -08:00
Slaith 896f4a450a clean up 2022-03-06 18:37:27 -08:00
Carson Kompon 8dc36b1cb9 Added Ding/Applause SFX to Mr. Upbeat 2022-03-06 14:48:39 -05:00
Carson Kompon 3f2cc123cb Fully functional and animated Mr. Upbeat 2022-03-06 14:37:50 -05:00
Carson Kompon bc9bac4ab5 Added Mr. Upbeat fall animation 2022-03-06 12:34:54 -05:00
Carson Kompon 688c594ef1 Smol fix for Wizard's Waltz 2022-03-06 11:39:05 -05:00
Carson Kompon f3032f2410 Wizard's Waltz height fix + position based on start interval
Based on megaminerjenny's suggestions :)
2022-03-06 11:35:23 -05:00
Jenny Crowe 6bc221d185
Merge pull request #40 from CarsonKompon/wizards-waltz-more
Wizard's Waltz - New SFX and better FOV
2022-03-05 12:30:19 -07:00
Jenny Crowe 44891347f4 Rhythm Rally: Feature complete! 2022-03-05 12:30:05 -07:00
Carson Kompon 3d00cc2a3b Fixed Wizard's Waltz FOV/Fake 3D 2022-03-05 12:46:10 -05:00
Jenny Crowe bbae26e6a6 Merge branch 'master' of https://github.com/megaminerjenny/HeavenStudio 2022-03-05 10:42:05 -07:00
Jenny Crowe 2480feef5e Rally: Ball tweaks 2022-03-05 10:41:54 -07:00
Carson Kompon 61d31f47f6 Added better SFX to Wizard's Waltz 2022-03-05 01:02:46 -05:00
Jenny Crowe 39e8707e44
Merge pull request #39 from CarsonKompon/wizards-waltz-new-sprites
New spritesheet for Wizard's Waltz
2022-03-04 21:42:09 -07:00
Carson Kompon 9d36d62a06 Added wand and sparkle FX to Wizard's Waltz 2022-03-04 23:28:56 -05:00
Carson Kompon 8b2ee6cac5 Slightly functional Mr. Upbeat 2022-03-04 22:10:10 -05:00
Carson Kompon 063c144e44 Mr Upbeat Programming progress
Autoplay works but it doesn't work otherwise
2022-03-04 17:03:57 -05:00
Carson Kompon 035fbc818b Mr Upbeat Animation Setup 2022-03-04 15:47:40 -05:00
Carson Kompon 05269d509c Added a new placeholder spritesheet for Wizard's Waltz 2022-03-04 01:37:33 -05:00
Carson Kompon 045423c44d Added the girl to Wizard's Waltz 2022-03-04 00:16:38 -05:00
Carson Kompon 6e0d3963f3 Added animations to the Wizard in Wizard's Waltz 2022-03-03 23:08:55 -05:00
Carson Kompon ef300057a7 Wizard's Waltz is feature complete
Just missing 90% of the visual assets
2022-03-03 22:30:08 -05:00
Carson Kompon a97fd43ec3 He rotate 2022-03-03 19:15:56 -05:00
Carson Kompon a2e6379528 Began adding Wizard's Waltz 2022-03-03 18:33:22 -05:00
Carson Kompon bc80b578f0 Removed star particles when hitting pots in a combo 2022-03-03 16:25:20 -05:00
Carson Kompon 98f4dfe331 Added Hit Two and Hit Three Alt (from RHDS) to Karate Man 2022-03-03 16:16:06 -05:00
Jenny Crowe 9fcd30ccb4 Crop Stomp: Dots bg 2022-03-03 04:18:16 -07:00
Jenny Crowe 2b0a2fb676 Crop Stomp: Feature complete! Karate Man: Stopped "hit" voice spam while scrubbing. 2022-03-03 03:43:01 -07:00
Jenny Crowe eba80da200
Merge pull request #33 from CarsonKompon/karate-man-new-hits
Added Cooking Pot, Alien, and Pot hit stars to Karate Man
2022-03-02 21:29:27 -07:00
Carson Kompon 7cc7ffd691 Karate Joe hits Cooking Pot with right hand + code cleanup
Also Taco Bell now plays the rock hit sound on top of the bell sound :)
2022-03-02 23:23:20 -05:00
Carson Kompon 752307fa64 Added Cooking Pot, Alien, and Pot hit stars 2022-03-02 23:04:11 -05:00
Jenny Crowe 7ec9872204 GEUH 2022-03-02 19:50:08 -07:00
Jenny Crowe d5b460f936 Stomp: Fixed issues with starting a march at the same time as a game switch. 2022-03-02 19:19:45 -07:00
Slaith 7e291e0bfa Added inactive functions
I'm going to flesh it out more in the next commit
2022-03-02 13:59:35 -08:00
Jenny Crowe c57da86162
Merge pull request #31 from CarsonKompon/karate-man-bg-fx-rings
Added Ring Background FX to Karate Man
2022-03-01 23:07:26 -07:00
Jenny Crowe 8323eb197f
Merge pull request #30 from CarsonKompon/editor-event-cleanup-pass-1
Editor Event Cleanup Pass
2022-03-01 23:07:19 -07:00
Jenny Crowe d5dbad0f34 Crop Stomp: Veggie picking goodness 2022-03-01 13:57:37 -07:00