Commit Graph

504 Commits

Author SHA1 Message Date
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 33d49103a0 Fan Club: tone down WIP marker 2022-03-16 17:47:11 -04: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
Jenny Crowe 48af382417 Crop Stomp: HD textures! + animation tweaks 2022-03-16 02:40:53 -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 9fb849fbe7 Merge branch 'master' of https://github.com/megaminerjenny/HeavenStudio 2022-03-14 07:21:16 -07:00
Jenny Crowe 9f7b8ee278 The biggest of boi refactors 2022-03-14 07:21:05 -07:00
saladplainzone 27ff1478ce High Quality Textures for Drum Practice & Rhythm Rally 2022-03-13 20:57:05 -07:00
saladplainzone e43746ba26 High Quality Fireworks SFX 2022-03-13 19:26:13 -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 ad4a47f45d Fireworks: Basic scene setup 2022-03-13 06:26:06 -07:00
Jenny Crowe 8ebcf0b1c9 Fireworks: City sprite import 2022-03-13 04:13:31 -07:00
Jenny Crowe c8feaa0a73 Fireworks: Sprite import 2022-03-13 03:56:57 -07:00
Jenny Crowe 3a6df6035b Stomp: Fixed issues associated with specific cue setups. 2022-03-13 03:25:41 -07:00
minenice55 0a44f55e63 Fan Club: editor icon 2022-03-12 23:28:57 -05: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
Jenny Crowe 191ad42328
Merge pull request #50 from patataofcourse/karatemanfix
Fix Karate Joe's texture sheet shenanigans
2022-03-12 18:31:56 -07:00
saladplainzone bb67037588 Fixed Space Soccer Dispense Sound 2022-03-12 17:13:10 -08:00
patataofcourse f9a166eff8 Fix Karate Joe's texture sheet shenanigans 2022-03-13 02:03:46 +01: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 07074783af correct descriptions 2022-03-11 13:27:35 -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 504713bcf1 No more I am going to bed if a sprite has an odd number in it then who cares 2022-03-11 06:20:06 -07:00
Jenny Crowe 77e6e5bf72 Make it stop 2022-03-11 06:19:09 -07:00
Jenny Crowe c0460c2e7c I missed one 2022-03-11 06:15:18 -07:00
Jenny Crowe b93006cded Do you know how it feels to split sprites for 2 hours straight? 2022-03-11 06:12:33 -07: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 37604d3e8b BTSDS: Zoom effect appears again. 2022-03-10 05:50:52 -07:00
Jenny Crowe 32b647a4d4 BTSDS: Outlines via Post Processing 2022-03-10 05:45:21 -07:00
Jenny Crowe e7d6796c08 Rally: Changed net color to white (as it is in Megamix) 2022-03-10 02:22:54 -07:00
Jenny Crowe a9c452a5ee Editor: Timeline now scales to fit song length 2022-03-09 21:24:06 -07:00
Jenny Crowe 0f80dce062 A comment 2022-03-09 21:00:57 -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 0462781aad Fixed error 2022-03-07 21:27:36 -08: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 5e99329e1d Oh yeah the editor UI too 2022-03-07 09:17:53 -07:00
Jenny Crowe c0999d7d03 Editor: Game icons look better in-editor 2022-03-07 09:14:10 -07:00
Jenny Crowe a6f2353a92 Flash now renders in fullscreen 2022-03-07 08:58:34 -07:00
Jenny Crowe 9bacb2c4b3
Merge pull request #44 from CarsonKompon/fix-mr-upbeat-animations
Cleaned up Mr. Upbeat's animations
2022-03-07 08:24:11 -07:00
Jenny Crowe 07211a4594 URP drank all my Pepsi and called me a bitch 2022-03-07 08:23:28 -07:00
Carson Kompon 8d353e797a Cleaned up Mr. Upbeat's animations 2022-03-07 10:15:40 -05: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 2ab3c8b8cc Fixed some errors 2022-03-07 02:41:07 -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
Jenny Crowe 5711a1508b Added TidalWAV plugin to make wav loops (for future use) 2022-03-07 01:30:15 -07:00
Carson Kompon 48e81d4df9 Added "Set Mii" to Drumming Practice 2022-03-07 00:26:59 -05:00
Carson Kompon 8c33d1a416 Added Drumming Practice Game Icon 2022-03-07 00:06:27 -05:00
Carson Kompon 87b474b1ba Working Drumming Practice 2022-03-07 00:00:54 -05:00
Slaith 2d328229c9 Gave sound objects a little more functionality 2022-03-06 19:56:45 -08: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 ec4ab9dc74 Added new spritesheet 2022-03-04 22:42:58 -05:00
Carson Kompon 8bc93dbcbc Added smear fx to Mr. Upbeat 2022-03-04 22:18:06 -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 d1bdc2671d Mr Upbeat scene setup 2022-03-04 15:18:01 -05:00
Carson Kompon ed3989e847 Mr Upbeat Sprite Definitions 2022-03-04 14:54:24 -05:00
Carson Kompon 4835aac135 Mr Upbeat Spritesheet 2022-03-04 14:54:04 -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 ec062b9307 Shortened "plant flower" in Wizard's Waltz 2022-03-03 22:43:11 -05:00
Carson Kompon f70cade117 Added game icon for Wizard's Waltz 2022-03-03 22:36:11 -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 120aa2e4fb
Merge pull request #34 from CarsonKompon/editor-controls-update
Added WASD to Editor, Made Autoplay P as a result
2022-03-03 02:34:08 -07:00
Carson Kompon 1bf0df5855 Added WASD to Editor, Made Autoplay P as a result 2022-03-02 23:40:59 -05: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 8700daed51 Crop: Better curve for GEUH 2022-03-02 20:07:33 -07:00
Jenny Crowe eee0d01021 Stomp: Better pivot for GEUH 2022-03-02 19:55:03 -07: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 197332c2a5
Merge pull request #32 from CarsonKompon/editor-tooltip-pass-1
Editor bottom-left tooltip pass
2022-03-01 23:07:33 -07: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
Carson Kompon 8704daf8f9 Added tooltips for all existing parameters 2022-03-01 16:37:17 -05:00
Carson Kompon 6a43469056 Bottom right tooltip now matches hover tooltip if there is one 2022-03-01 16:11:19 -05:00
Jenny Crowe 7636888858 Crop Stomp: Curve movement tweaked. 2022-03-01 14:08:27 -07:00
Jenny Crowe b7b207f59b Crop Stomp: Veggie pick curve tweaks 2022-03-01 14:05:21 -07:00
Jenny Crowe d5dbad0f34 Crop Stomp: Veggie picking goodness 2022-03-01 13:57:37 -07:00
Carson Kompon 7b36b8a73c Added Ring background fx to Karate Man 2022-03-01 15:37:06 -05:00
Carson Kompon 55f31b4501 Added "ooh" toggle to DJ School 2022-03-01 14:44:55 -05:00
Jenny Crowe 77cb7f7a42 Merge branch 'master' of https://github.com/megaminerjenny/HeavenStudio 2022-03-01 12:36:45 -07:00
Jenny Crowe 8d0ec00aaa Crop Stomp: Offset body to line up better with legs in animations. 2022-03-01 12:36:35 -07:00
Carson Kompon 862b3a7a30 Clappy Trio Event Merge 2022-03-01 14:30:07 -05:00
Carson Kompon 93f7f31ca8 Fork Lifter Event Merge 2022-03-01 14:27:08 -05:00
Carson Kompon 36dd972a02 Count-in Event Merge
LFG
2022-03-01 14:21:23 -05:00
Carson Kompon 1284e7ca1c im sorry im dumb
i fixed it for real idk why unity wasnt saving these changes
2022-03-01 13:05:33 -05:00
Carson Kompon 734a4713bb im sorry im dumb
i fixed it for real idk why unity wasnt saving these changes
2022-03-01 12:52:47 -05:00
Carson Kompon 4142c09a4c Karate Man Events have been merged also I forgot the toggle in the last update lol 2022-03-01 12:40:59 -05:00
Carson Kompon 3f84054779
Merge branch 'megaminerjenny:master' into karate-man-event-merging 2022-03-01 12:23:25 -05:00
Jenny Crowe 8994266320 Crop Stomp: Some pivot changes 2022-03-01 01:41:48 -07:00
Carson Kompon 42b7d724be Started work on merging the karate man events
This breaks enum dropdowns but I'll fix that tomorrow
2022-03-01 03:17:06 -05:00
Carson Kompon 687f2b53f4 Added Checkbox Parameter + Toggle Inputs Event
So now you can disable inputs if you need to :)
2022-03-01 02:27:49 -05:00