Commit graph

424 commits

Author SHA1 Message Date
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
Jenny Crowe
e31f50bfd5 Merge pull request #24 from CarsonKompon/rhythm-rally-camera-rotate-events
Added Camera Events to Rhythm Rally
2022-02-28 14:10:51 -07:00
Carson Kompon
594158cee3 Added camera zoom 2022-02-28 15:43:32 -05:00
Carson Kompon
ed57295e9d Rhythm Rally Camera Event
Rotate the camera with different easing functions and the option to add/remove from current rotation.
2022-02-28 14:31:28 -05:00
Carson Kompon
342715e460 Fork now only holds up to 4 peas in Fork Lifter
The commit looks a lot larger than it is. I just wrapped it all in an if statement
2022-02-28 12:32:08 -05:00
Carson Kompon
10f2db61d2 Added Tap, Double Tap, and Triple Tap to Tap Trial
All perfectly playable :)
Hopefully this is up to standards with the other games I just wanted to do this to prove to myself that I could LOL
2022-02-28 12:17:50 -05:00
Carson Kompon
749699e0c4 Merge branch 'megaminerjenny:master' into tap-trial-real-inputs 2022-02-28 10:36:24 -05:00
Carson Kompon
02d2b411fd Added Tap Trial miss sound 2022-02-28 10:36:05 -05:00
Carson Kompon
ca2371c743 Karate Man shadows no longer fade to white 2022-02-28 10:26:25 -05:00
Jenny Crowe
9d7620feb3 Editor: Tempo Finder button tooltip 2022-02-28 01:38:43 -07:00
Jenny Crowe
646bb82c04 Crop Stomp: Basic stomping 2022-02-28 01:33:11 -07:00
Jenny Crowe
e106c34041 Crop Stomp: Scrolling stops when paused. 2022-02-28 00:08:33 -07:00
Carson Kompon
c5a9c70e0e Simple tap 2022-02-28 02:05:57 -05:00
Carson Kompon
01ccc4e684 You can now Press and Release Z for high-kick-toe
(You can still use X in case you already had the muscle memory)
2022-02-28 01:58:47 -05:00
Jenny Crowe
34d8d9fc8d Crop Stomp: He go 2022-02-27 22:11:18 -07:00
Jenny Crowe
8d9170066b Merge pull request #18 from CarsonKompon/fix-karate-man-background-typo
Fixed a typo in the Karate Man Background names
2022-02-27 19:04:18 -07:00
Carson Kompon
538bc3cfa5 Added Placeholder animations for Tap Trial
Added Double Tap and Triple Tap placeholder animations so they can be used in a remix until they're made actually playable.
2022-02-27 19:17:12 -05:00
Carson Kompon
74dadc58d9 Typo in the group chat 2022-02-27 18:46:32 -05:00
Jenny Crowe
811f4ce292 Crop Stomp basic setup 2022-02-27 16:26:03 -07:00
Jenny Crowe
5c44ca09ec Space Soccer: Backwards compatibility with levels using old swing system. 2022-02-27 15:12:17 -07:00
Jenny Crowe
b8cbbbbd97 Merge pull request #17 from Slaith12/main
Fixed event caller
2022-02-27 14:51:17 -07:00
Slaith
a4af3adaea Actually fixed event system
Somehow I didn't notice while testing before that everything was wrong. I was already suspecting these lines of code would do something weird, and they certainly did.
2022-02-27 11:01:31 -08:00
Carson Kompon
ccac51d1a1 Make length of bgcolor event match rhythm tweezers 2022-02-27 13:54:46 -05:00
Carson Kompon
b4cdc321cb Remove debug log 2022-02-27 13:49:52 -05:00
Slaith
554a8833ec Made the call event function more reliable
I have no idea why the function was set up the way it was before but it should be fine now.
2022-02-27 10:49:06 -08:00
Carson Kompon
6a2ccf4b2c Merge branch 'megaminerjenny:master' into karate-man-background-color 2022-02-27 12:06:38 -05:00
Carson Kompon
4403a3dd26 Added custom shadow colours
And specific shadow colours for preset background types
2022-02-27 12:02:46 -05:00
Jenny Crowe
cdc7d2f120 Begone test comment 2022-02-27 04:01:24 -07:00
Jenny Crowe
dd81739566 Test commit 2022-02-27 02:15:18 -07:00
Jenny Crowe
5eaedda81b Merge pull request #14 from Slaith12/main
Fixed bug causing space soccer to spam sfx when starting in the middle of it.
2022-02-27 01:53:16 -07:00
Jenny Crowe
904af834c4 Merge pull request #11 from CarsonKompon/fix-fork-lifter-sigh-sfx
Fixed the "sigh" SFX in Fork Lifter
2022-02-27 01:48:56 -07:00
Carson Kompon
f7434c8a34 Shadow colours are much more accurate 2022-02-26 22:28:15 -05:00
Slaith
91a561ea05 Some clean up 2022-02-26 15:38:27 -08:00
Carson Kompon
ef27e83254 Added coloured shadows to Karate Man
This is very pogchamp!
2022-02-26 18:10:22 -05:00
Carson Kompon
609ce5cd6e Reset Song when pressing "New"
Song was not removed prior to this
2022-02-26 14:06:52 -05:00
Carson Kompon
ef710cc714 Code Clean Up 2022-02-26 13:57:09 -05:00
Carson Kompon
2a026d8dea Added "set background color" to Karate Man.
Seemingly stops working after a few background changes but works between game changes
2022-02-26 13:27:02 -05:00
Carson Kompon
39bd1436fa Fixed the sigh sfx in Fork Lifter 2022-02-26 02:57:09 -05:00
Slaith
41d0aff043 Fixed Space Soccer SFX spam glitch
You'll no longer be bombarded with sfx when starting the game far after a ball dispense cue. Some of the animations are still a bit rough and sometimes the ball is never dispensed, but those will be fixed in a future commit.
2022-02-25 23:33:10 -08:00
Slaith
c727bd62fd Refactored Space Soccer scripts
most of the refactoring is in the ball script, and the changes for the kicker and space soccer scripts are mostly in response to the refactoring.
2022-02-25 23:29:17 -08:00
Jenny Crowe
1123243215 Merge pull request #8 from CarsonKompon/karate-man-coloured-bulbs
Karate man coloured bulbs
2022-02-26 00:16:45 -07:00
Jenny Crowe
b681656cd6 Merge pull request #10 from CarsonKompon/editor-autoplay-hotkey
Added Autoplay and Metronome Hotkeys
2022-02-26 00:15:02 -07:00
Carson Kompon
66ab560817 Added Autoplay and Metronome Hotkeys
A - Autoplay
M - Metronome
2022-02-26 02:03:33 -05:00
Carson Kompon
bfa73ade05 Whoops I never added CTRL+N 2022-02-26 01:54:00 -05:00
Carson Kompon
70962f50a0 Implemented proper sprite, flickering, and dropdown menu
There's now a "type" dropdown menu that allows you to choose between "Normal", "Yellow", "Blue", and "Custom". Custom will use the color specified in the Custom Color field
2022-02-26 01:31:35 -05:00
Carson Kompon
5a89e9608d Added Light to the Light Bulb if colour is changed with right click
You can now right click on bulb in the editor to change the colour of the light emitted. If the colour is set to black then no light is drawn.
2022-02-25 23:57:18 -05:00
Carson Kompon
4ebcdd038d Preventing even more code re-use
Editor.NewRemix() from my last commit is now Editor.LoadRemix(json) and is called within Editor.LoadRemix(). The "New" button new calls Editor.LoadRemix("");
2022-02-25 22:48:44 -05:00
Carson Kompon
2a8da0a551 Added New (CTRL+N) Button
Allows you to call GameManager.LoadRemix("") to initialize a blank remix at bpm 120. The New button (or CTRL+N) calls Editor.NewRemix();
2022-02-25 22:41:32 -05:00