Commit graph

496 commits

Author SHA1 Message Date
Slaith
a577544fac 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
dc46781d40 Fan Club: landing sound 2022-03-17 17:01:26 -04:00
minenice55
65918bd950 Fan Club: add cues continuing from transition, muted cues 2022-03-17 16:43:35 -04:00
minenice55
bce671dc85 Fan Club: make forced animations properly restart 2022-03-17 15:18:40 -04:00
minenice55
3e28dbcb0a Fan Club: refactoring, fixes 2022-03-17 15:13:48 -04:00
minenice55
cd00c13fa7 Fan Club: remove unused file 2022-03-17 12:20:11 -04:00
Jenny Crowe
f69e69c41a Merge pull request #55 from minenice55/game-ntrIdol
Minigame: Fan Club
2022-03-16 16:22:10 -07:00
minenice55
a3f9f54e2f Fan Club: tone down WIP marker 2022-03-16 17:47:11 -04:00
minenice55
4df6dcacd6 Fan Club: fix forced "peace no sync" animation 2022-03-16 17:45:12 -04:00
minenice55
b73135196c Fan Club: add particle effect to forced clap 2022-03-16 17:43:37 -04:00
minenice55
af6e60a247 Fan Club: finish all basic functionality
todo: other "special" animations
2022-03-16 17:41:46 -04:00
Jenny Crowe
e82f2096e9 Crop Stomp: Minor visual tweaks 2022-03-16 02:53:30 -07:00
Jenny Crowe
b849c9e426 Crop Stomp: HD textures! + animation tweaks 2022-03-16 02:40:53 -07:00
Carson Kompon
79ddcffdd8 Added Streaks and Set Background Color to Drumming Practice 2022-03-15 19:15:54 -04:00
minenice55
5f42dd4f00 Fan Club: actual functionality (input still bugged) 2022-03-15 18:43:13 -04:00
minenice55
57e075255b Fan Club: like 50% of the game lmao 2022-03-14 20:54:54 -04:00
minenice55
407ccdface Fan Club: update script to new namespace 2022-03-14 10:36:19 -04:00
minenice55
df068c3899 Merge branch 'master' into game-ntrIdol 2022-03-14 10:35:33 -04:00
minenice55
b7c814738d Fan Club: more idol stuff 2022-03-14 10:35:04 -04:00
Jenny Crowe
39e0357e51 Merge branch 'master' of https://github.com/megaminerjenny/HeavenStudio 2022-03-14 07:21:16 -07:00
Jenny Crowe
2d80cb05b1 The biggest of boi refactors 2022-03-14 07:21:05 -07:00
saladplainzone
f07b411ce8 High Quality Fireworks SFX 2022-03-13 19:26:13 -07:00
minenice55
0479cb39f8 Fan Club: idol setup part 1 2022-03-13 18:23:38 -04:00
minenice55
9d50231c2c Merge branch 'master' into game-ntrIdol 2022-03-13 12:50:17 -04:00
Jenny Crowe
a1e98409bc Fireworks: More setup 2022-03-13 07:35:22 -07:00
Jenny Crowe
34f3a8281b Fireworks: Basic scene setup 2022-03-13 06:26:06 -07:00
Jenny Crowe
0e8af91c76 Fireworks: City sprite import 2022-03-13 04:13:31 -07:00
Jenny Crowe
5c29228933 Fireworks: Sprite import 2022-03-13 03:56:57 -07:00
Jenny Crowe
9d733b6f2f Stomp: Fixed issues associated with specific cue setups. 2022-03-13 03:25:41 -07:00
minenice55
60a6932dc0 Fan Club: editor icon 2022-03-12 23:28:57 -05:00
minenice55
a1f71294ce Fan Club: start scene setup 2022-03-12 23:24:37 -05:00
Jenny Crowe
21b3f7c60c Merge pull request #49 from CarsonKompon/mr-upbeat-repositioning
Proper Mr. Upbeat Positioning
2022-03-12 18:32:12 -07:00
saladplainzone
80ea174edf Fixed Space Soccer Dispense Sound 2022-03-12 17:13:10 -08:00
Carson Kompon
e685e4eac2 Proper Mr. Upbeat Positioning 2022-03-12 11:57:46 -05:00
Jenny Crowe
5ecc776279 Blue Bear: Basic gameplay setup 2022-03-12 07:14:41 -07:00
Jenny Crowe
2f746c8e10 Fork Lifter: Minor script tweak for readability. 2022-03-11 21:20:33 -07:00
Jenny Crowe
fd037c4436 Organization refactor 2022-03-11 21:10:13 -07:00
Jenny Crowe
42c2d4cd3e Blue Bear: Extremely basic scene setup 2022-03-11 20:15:15 -07:00
Carson Kompon
c018f1c560 Mr. Upbeat now starts on the go no matter what 2022-03-11 20:54:05 -05:00
minenice55
2747d31902 correct descriptions 2022-03-11 13:27:35 -05:00
minenice55
87993cd439 de-hardcode conditional 2022-03-11 13:24:24 -05:00
minenice55
b364b0cc16 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
b12119cbb8 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
6df29f81dc Make it stop 2022-03-11 06:19:09 -07:00
Jenny Crowe
4345f92ba2 I missed one 2022-03-11 06:15:18 -07:00
Jenny Crowe
91ca50109d Do you know how it feels to split sprites for 2 hours straight? 2022-03-11 06:12:33 -07:00
Jenny Crowe
8c89153af9 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
5663c5e8af BTSDS: Zoom effect appears again. 2022-03-10 05:50:52 -07:00
Jenny Crowe
e6adef1f94 BTSDS: Outlines via Post Processing 2022-03-10 05:45:21 -07:00
Jenny Crowe
fe7a18ed6d Rally: Changed net color to white (as it is in Megamix) 2022-03-10 02:22:54 -07:00
Jenny Crowe
a570793803 Editor: Timeline now scales to fit song length 2022-03-09 21:24:06 -07:00
Jenny Crowe
b1e70bc64b A comment 2022-03-09 21:00:57 -07:00
Jenny Crowe
9aeef1a9c3 Jukebox/Sound code cleanup 2022-03-09 20:59:48 -07:00
Jenny Crowe
667a70b0ee BTSDS: Piano notes will now stop properly even if the game switches during them. 2022-03-09 20:50:19 -07:00
Jenny Crowe
66499f5db1 Merge pull request #46 from Slaith12/main
Implemented Inactive Functions and made OnGameSwitch functional
2022-03-08 17:12:52 -07:00
Jenny Crowe
8eef96f870 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
11b80f12de Fixed error 2022-03-07 21:27:36 -08:00
Slaith
c9ec6bd6e2 Merge branch 'master' of https://github.com/megaminerjenny/HeavenStudio into megaminerjenny-master 2022-03-07 20:53:30 -08:00
Slaith
531053cdd3 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
71d7f1323f Flash now relegated to its own layer 2022-03-07 17:21:27 -07:00
Carson Kompon
6f2f8b13bd 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
bc24be8a95 Oh yeah the editor UI too 2022-03-07 09:17:53 -07:00
Jenny Crowe
61df4ecf8a Editor: Game icons look better in-editor 2022-03-07 09:14:10 -07:00
Jenny Crowe
ec571a52fe Flash now renders in fullscreen 2022-03-07 08:58:34 -07:00
Jenny Crowe
49898d661a 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
f4b34563f9 URP drank all my Pepsi and called me a bitch 2022-03-07 08:23:28 -07:00
Carson Kompon
0262210452 Cleaned up Mr. Upbeat's animations 2022-03-07 10:15:40 -05:00
Jenny Crowe
f7838d1da2 Goodbye tidalwav we hardly knew ye (+ BTSDS piano reacts to song pitch) 2022-03-07 05:54:36 -07:00
Jenny Crowe
1d564b4910 Fixed some errors 2022-03-07 02:41:07 -07:00
Jenny Crowe
dd3bdaf87c BTSDS: Piano does not pierce ears as much 2022-03-07 02:34:38 -07:00
Jenny Crowe
c6f0da37a2 BTSDS: Piano!!! 2022-03-07 02:16:31 -07:00
Jenny Crowe
94bbed77cd Added TidalWAV plugin to make wav loops (for future use) 2022-03-07 01:30:15 -07:00
Carson Kompon
b229e612b3 Added "Set Mii" to Drumming Practice 2022-03-07 00:26:59 -05:00
Carson Kompon
8bb590825c Added Drumming Practice Game Icon 2022-03-07 00:06:27 -05:00
Carson Kompon
b4e8152d90 Working Drumming Practice 2022-03-07 00:00:54 -05:00
Slaith
1fcbaacb3c Gave sound objects a little more functionality 2022-03-06 19:56:45 -08:00
Carson Kompon
31c08e778e Started prepping Drumming Practice 2022-03-06 22:17:46 -05:00
Slaith12
01f8c7d93b Merge branch 'megaminerjenny:master' into main 2022-03-06 19:00:57 -08:00
Jenny Crowe
30858afbb4 Merge pull request #42 from CarsonKompon/mr-upbeat-2
Fully functional and animated Mr. Upbeat
2022-03-06 19:53:57 -07:00
Slaith12
ff8c031e42 Merge branch 'megaminerjenny:master' into main 2022-03-06 18:37:51 -08:00
Slaith
6c25344e9e clean up 2022-03-06 18:37:27 -08:00
Carson Kompon
564c8fe0a6 Added Ding/Applause SFX to Mr. Upbeat 2022-03-06 14:48:39 -05:00
Carson Kompon
b389cd7589 Fully functional and animated Mr. Upbeat 2022-03-06 14:37:50 -05:00
Carson Kompon
d5b800bb5b Added Mr. Upbeat fall animation 2022-03-06 12:34:54 -05:00
Carson Kompon
3adbc8a18d Smol fix for Wizard's Waltz 2022-03-06 11:39:05 -05:00
Carson Kompon
2eda6c0d45 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
a5164ddcbe 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
c0a6a39a66 Rhythm Rally: Feature complete! 2022-03-05 12:30:05 -07:00
Carson Kompon
cc5e0e4f3e Fixed Wizard's Waltz FOV/Fake 3D 2022-03-05 12:46:10 -05:00
Jenny Crowe
69cd51533b Merge branch 'master' of https://github.com/megaminerjenny/HeavenStudio 2022-03-05 10:42:05 -07:00
Jenny Crowe
482a6b532a Rally: Ball tweaks 2022-03-05 10:41:54 -07:00
Carson Kompon
91ad96cc91 Added better SFX to Wizard's Waltz 2022-03-05 01:02:46 -05:00
Jenny Crowe
1a3a0dcec7 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
da57253acc Added wand and sparkle FX to Wizard's Waltz 2022-03-04 23:28:56 -05:00
Carson Kompon
a0d4803901 Added new spritesheet 2022-03-04 22:42:58 -05:00
Carson Kompon
2ed99853a3 Added smear fx to Mr. Upbeat 2022-03-04 22:18:06 -05:00
Carson Kompon
5c3730cf9d Slightly functional Mr. Upbeat 2022-03-04 22:10:10 -05:00
Carson Kompon
d22009e79c Mr Upbeat Programming progress
Autoplay works but it doesn't work otherwise
2022-03-04 17:03:57 -05:00
Carson Kompon
6d4a283eff Mr Upbeat Animation Setup 2022-03-04 15:47:40 -05:00
Carson Kompon
2d7a559738 Mr Upbeat scene setup 2022-03-04 15:18:01 -05:00
Carson Kompon
5e2e80fb86 Mr Upbeat Sprite Definitions 2022-03-04 14:54:24 -05:00
Carson Kompon
1edb5fb16c Mr Upbeat Spritesheet 2022-03-04 14:54:04 -05:00
Carson Kompon
502678f6b4 Added a new placeholder spritesheet for Wizard's Waltz 2022-03-04 01:37:33 -05:00
Carson Kompon
c028882d5b Added the girl to Wizard's Waltz 2022-03-04 00:16:38 -05:00
Carson Kompon
ca48e23892 Added animations to the Wizard in Wizard's Waltz 2022-03-03 23:08:55 -05:00
Carson Kompon
3547010af0 Shortened "plant flower" in Wizard's Waltz 2022-03-03 22:43:11 -05:00
Carson Kompon
6958b7bbb7 Added game icon for Wizard's Waltz 2022-03-03 22:36:11 -05:00
Carson Kompon
b0f74c9f01 Wizard's Waltz is feature complete
Just missing 90% of the visual assets
2022-03-03 22:30:08 -05:00
Carson Kompon
edece5218a He rotate 2022-03-03 19:15:56 -05:00
Carson Kompon
2786cdca4c Began adding Wizard's Waltz 2022-03-03 18:33:22 -05:00
Carson Kompon
78d477fc01 Removed star particles when hitting pots in a combo 2022-03-03 16:25:20 -05:00
Carson Kompon
c73d490485 Added Hit Two and Hit Three Alt (from RHDS) to Karate Man 2022-03-03 16:16:06 -05:00
Jenny Crowe
71838124c9 Crop Stomp: Dots bg 2022-03-03 04:18:16 -07:00
Jenny Crowe
93bbbd0ee2 Crop Stomp: Feature complete! Karate Man: Stopped "hit" voice spam while scrubbing. 2022-03-03 03:43:01 -07:00
Jenny Crowe
c1a2679688 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
333c0c86dc Added WASD to Editor, Made Autoplay P as a result 2022-03-02 23:40:59 -05:00
Jenny Crowe
a1feb82d20 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
8228948d00 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
8a6eb8b74c Added Cooking Pot, Alien, and Pot hit stars 2022-03-02 23:04:11 -05:00
Jenny Crowe
5ac95bb018 Crop: Better curve for GEUH 2022-03-02 20:07:33 -07:00
Jenny Crowe
c37fd8e935 Stomp: Better pivot for GEUH 2022-03-02 19:55:03 -07:00
Jenny Crowe
ec8de5458b GEUH 2022-03-02 19:50:08 -07:00
Jenny Crowe
f6966d4e35 Stomp: Fixed issues with starting a march at the same time as a game switch. 2022-03-02 19:19:45 -07:00
Slaith
d2bc7d9871 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
273608ea6e 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
36d4d043b4 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
8a20ee67e5 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
187923d62a Added tooltips for all existing parameters 2022-03-01 16:37:17 -05:00
Carson Kompon
597908510b Bottom right tooltip now matches hover tooltip if there is one 2022-03-01 16:11:19 -05:00
Jenny Crowe
413d8fa8ba Crop Stomp: Curve movement tweaked. 2022-03-01 14:08:27 -07:00
Jenny Crowe
c1b9653e60 Crop Stomp: Veggie pick curve tweaks 2022-03-01 14:05:21 -07:00
Jenny Crowe
aae753d6a2 Crop Stomp: Veggie picking goodness 2022-03-01 13:57:37 -07:00
Carson Kompon
70b1bb2dbb Added Ring background fx to Karate Man 2022-03-01 15:37:06 -05:00
Carson Kompon
2d27b38f2d Added "ooh" toggle to DJ School 2022-03-01 14:44:55 -05:00
Jenny Crowe
f4047466a6 Merge branch 'master' of https://github.com/megaminerjenny/HeavenStudio 2022-03-01 12:36:45 -07:00
Jenny Crowe
463b4ecf27 Crop Stomp: Offset body to line up better with legs in animations. 2022-03-01 12:36:35 -07:00
Carson Kompon
e4875fc751 Clappy Trio Event Merge 2022-03-01 14:30:07 -05:00
Carson Kompon
fe546873ac Fork Lifter Event Merge 2022-03-01 14:27:08 -05:00
Carson Kompon
8fa4838d9a Count-in Event Merge
LFG
2022-03-01 14:21:23 -05:00
Carson Kompon
76dfb920f5 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
c0ef632f3d 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
d1a4c0464f 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
42dc3ec14c Merge branch 'megaminerjenny:master' into karate-man-event-merging 2022-03-01 12:23:25 -05:00
Jenny Crowe
061ff2e9d6 Crop Stomp: Some pivot changes 2022-03-01 01:41:48 -07:00
Carson Kompon
267d9f6bdd 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
4636b8a4bf Added Checkbox Parameter + Toggle Inputs Event
So now you can disable inputs if you need to :)
2022-03-01 02:27:49 -05:00
Jenny Crowe
25e90b0b39 Crop Stomp: Implementation progress 2022-02-28 23:38:38 -07:00
Jenny Crowe
8a2147ba70 Crop Stomp: More animations 2022-02-28 19:30:36 -07:00
Jenny Crowe
4c53e759f4 Pelly moment 2022-02-28 18:18:06 -07:00
Carson Kompon
ba8559c3cd Added Change Lion Count event to Clappy Trio
1-8 lions thats crazy
2022-02-28 20:11:01 -05:00