Commit graph

471 commits

Author SHA1 Message Date
minenice55
ddc6b84063 Trick on the Class: object paths 2022-04-10 17:37:37 -04:00
minenice55
30d23ea309 Trick on the Class: initial setup
hell
2022-04-04 10:48:37 -04:00
Jenny Crowe
8c0a79255c Merge pull request #66 from minenice55/more-ntrIdol-2
Fan Club: bugfixes and additions
2022-03-28 11:55:18 -07:00
minenice55
dc3e7aadbd Correct compilation errors from merge 2022-03-28 09:45:16 -04:00
minenice55
24765c3d68 Merge branch 'master' into more-ntrIdol-2 2022-03-28 09:43:55 -04:00
Slaith
71e4e9c1f6 Fixed barrel break not working 2022-03-27 18:23:59 -07:00
minenice55
06980c2781 Fan Club: remove WIP 2022-03-27 19:06:00 -04:00
minenice55
6bbbabf7f6 Fan Club: more animations 2022-03-27 19:05:08 -04:00
Slaith
8960d9da55 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
a1527d58b6 Blue Bear: Crumbs! (Also fixed animation bugs associated with a recent PR) 2022-03-27 05:08:26 -07:00
minenice55
bf172ca17e Fan Club: idol squatting animation 2022-03-27 00:11:32 -04:00
Slaith
1c9331daf8 fixing another bug with clappy trio 2022-03-26 17:53:34 -07:00
Slaith
b9c02eb039 i'm dumb lol 2022-03-26 17:42:50 -07:00
Jenny Crowe
abf86b4258 Merge pull request #63 from Slaith12/main
Prevented out of order initialization
2022-03-25 21:48:51 -07:00
minenice55
7c591e0a11 Fan Club: arisa jump 2022-03-25 22:45:54 -04:00
Slaith
a653194e07 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
cfe79438bf Merge branch 'master' into scaled-secPerBeat 2022-03-25 18:59:57 -04:00
minenice55
831b019735 Fan Club: root motion 2022-03-25 18:59:18 -04:00
minenice55
61aaea72d9 Fan Club: fix references 2022-03-25 18:51:43 -04:00
minenice55
1e2f259c97 Merge branch 'master' into more-ntrIdol-2 2022-03-25 18:29:18 -04:00
minenice55
68b12ee34b Editor: disabled tempo change placing
UNTESTED
2022-03-24 13:17:49 -04:00
minenice55
173e9d80dd Fan Club: note to self 2022-03-22 15:49:29 -04:00
minenice55
d13d547c89 Merge branch 'master' into more-ntrIdol-2 2022-03-22 15:28:44 -04:00
minenice55
6d857e9d5c Fan Club: prepare Arisa jumping 2022-03-22 15:23:55 -04:00
minenice55
5d95c9ec16 Conductor: property that returns secPerBeat scaled to song pitch
NEEDS TESTING
2022-03-22 14:29:15 -04:00
minenice55
04535747f7 Fan Club: fix forcing idol anims during responses 2022-03-21 11:29:24 -04:00
minenice55
d768f48eae Fan Club: address issue with double clap -> I suppose stack 2022-03-21 11:23:42 -04:00
minenice55
7d580fb132 oops forgot a small thing
includes example using a fan club sound
2022-03-20 19:58:37 -04:00
minenice55
87bc5c9fff extend multisound with pitch, volume, looping, offset in seconds 2022-03-20 19:46:12 -04:00
Jenny Crowe
8d0895b86d Editor: Music volume! 2022-03-19 05:46:38 -07:00
Jenny Crowe
c406f30f77 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
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
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
2d80cb05b1 The biggest of boi refactors 2022-03-14 07:21:05 -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
9d733b6f2f Stomp: Fixed issues associated with specific cue setups. 2022-03-13 03:25:41 -07: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
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
e6adef1f94 BTSDS: Outlines via Post Processing 2022-03-10 05:45:21 -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
ec571a52fe Flash now renders in fullscreen 2022-03-07 08:58:34 -07: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
Carson Kompon
b229e612b3 Added "Set Mii" to Drumming Practice 2022-03-07 00:26:59 -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
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
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
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
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
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
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
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
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
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
Carson Kompon
f7b0eba8c0 Added support for variable lions in Clappy Trio
You can also just have 1 lion
2022-02-28 19:46:55 -05:00
Jenny Crowe
c002586488 Merge pull request #20 from CarsonKompon/fix-space-soccer-z-and-x
You can now Press and Release Z for high-kick-toe
2022-02-28 14:11:53 -07:00
Jenny Crowe
51c4e01889 Merge pull request #23 from CarsonKompon/fix-fork-lifter-maximum-peas-on-fork
Fork now only holds up to 4 peas in Fork Lifter
2022-02-28 14:11:29 -07:00
Jenny Crowe
c5934c587b Merge pull request #21 from CarsonKompon/fix-karate-man-shadows-fade-white
Karate Man shadows no longer fade to White
2022-02-28 14:11:14 -07:00