Commit graph

342 commits

Author SHA1 Message Date
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
Jenny Crowe
daf19fae54 Crop Stomp: Implementation progress 2022-02-28 23:38:38 -07:00
Jenny Crowe
6c13d0efa2 Crop Stomp: More animations 2022-02-28 19:30:36 -07:00
Jenny Crowe
3bf3b5b4ab Pelly moment 2022-02-28 18:18:06 -07:00
Carson Kompon
5d99596c67 Added Change Lion Count event to Clappy Trio
1-8 lions thats crazy
2022-02-28 20:11:01 -05:00
Carson Kompon
48b83faa68 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
b0e08acfd2
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
c234a7165e
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
f5013c31df
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
0334a48344
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
44c58e9175 Added camera zoom 2022-02-28 15:43:32 -05:00
Carson Kompon
1ba9a3c1dc 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
d07dabf1c5 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
94f0c09d71 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
9c30238ba6
Merge branch 'megaminerjenny:master' into tap-trial-real-inputs 2022-02-28 10:36:24 -05:00
Carson Kompon
f6c906346e Added Tap Trial miss sound 2022-02-28 10:36:05 -05:00
Carson Kompon
4d25bd6a31 Karate Man shadows no longer fade to white 2022-02-28 10:26:25 -05:00
Jenny Crowe
77af919722 Editor: Tempo Finder button tooltip 2022-02-28 01:38:43 -07:00
Jenny Crowe
5871716bd1 Crop Stomp: Basic stomping 2022-02-28 01:33:11 -07:00
Jenny Crowe
4ea1e3f1ff Crop Stomp: Scrolling stops when paused. 2022-02-28 00:08:33 -07:00
Carson Kompon
be5a950dfe Simple tap 2022-02-28 02:05:57 -05:00
Carson Kompon
21e8207894 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
8b4b1cac1a Crop Stomp: He go 2022-02-27 22:11:18 -07:00
Jenny Crowe
ed8b401e0e
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
8af14eac5f 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
70137addd6 Typo in the group chat 2022-02-27 18:46:32 -05:00
Jenny Crowe
f9adef8529 Crop Stomp basic setup 2022-02-27 16:26:03 -07:00
Jenny Crowe
dbe1e011c9 Space Soccer: Backwards compatibility with levels using old swing system. 2022-02-27 15:12:17 -07:00
Jenny Crowe
5a7268c3dc
Merge pull request #17 from Slaith12/main
Fixed event caller
2022-02-27 14:51:17 -07:00
Slaith
10572ab35d 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
4f26283665 Make length of bgcolor event match rhythm tweezers 2022-02-27 13:54:46 -05:00
Carson Kompon
263c28b532 Remove debug log 2022-02-27 13:49:52 -05:00
Slaith
8501e4805c 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
26def1bc7b
Merge branch 'megaminerjenny:master' into karate-man-background-color 2022-02-27 12:06:38 -05:00
Carson Kompon
c920261ac7 Added custom shadow colours
And specific shadow colours for preset background types
2022-02-27 12:02:46 -05:00
Jenny Crowe
b488cc329d Begone test comment 2022-02-27 04:01:24 -07:00
Jenny Crowe
e96a10ced3 Test commit 2022-02-27 02:15:18 -07:00
Jenny Crowe
f134e75d86
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
7768cbd355
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
e3a5e55d54 Shadow colours are much more accurate 2022-02-26 22:28:15 -05:00
Slaith
93448a018f Some clean up 2022-02-26 15:38:27 -08:00
Carson Kompon
69cb7a729b Added coloured shadows to Karate Man
This is very pogchamp!
2022-02-26 18:10:22 -05:00
Carson Kompon
406f6a54b2 Reset Song when pressing "New"
Song was not removed prior to this
2022-02-26 14:06:52 -05:00
Carson Kompon
a4985675c4 Code Clean Up 2022-02-26 13:57:09 -05:00
Carson Kompon
c745bb5389 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
1358a7f5b4 Fixed the sigh sfx in Fork Lifter 2022-02-26 02:57:09 -05:00
Slaith
52cee6f511 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
40dbb70bb5 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
526269805d
Merge pull request #8 from CarsonKompon/karate-man-coloured-bulbs
Karate man coloured bulbs
2022-02-26 00:16:45 -07:00
Jenny Crowe
07f280a8b9
Merge pull request #10 from CarsonKompon/editor-autoplay-hotkey
Added Autoplay and Metronome Hotkeys
2022-02-26 00:15:02 -07:00
Carson Kompon
4e02c380e9 Added Autoplay and Metronome Hotkeys
A - Autoplay
M - Metronome
2022-02-26 02:03:33 -05:00
Carson Kompon
f35e015bbc Whoops I never added CTRL+N 2022-02-26 01:54:00 -05:00
Carson Kompon
26b9497114 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
c557c62b32 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
e2ee02775a 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
027a6cddbe 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
Slaith
fd748e8309 Fixed tempo change bug
Tempo changes that were deleted would still exist in some places and break the check that determines if a new change should be placed.
2022-02-24 23:01:41 -08:00
Slaith
a8e1ce0ef0 Some small stuff
Changed the window title to the new name and added some full count-ins
2022-02-24 22:59:18 -08:00
Jenny Crowe
4738692323 Fixed minor song offset/song pitch compatibility issue 2022-02-24 21:37:04 -07:00
Jenny Crowe
74e1ea2e91 Eh it's playable enough 2022-02-24 21:33:51 -07:00
Jenny Crowe
68bb30ae2a Editor: Tempo finder tweaks 2022-02-24 21:30:02 -07:00
pixlblade
5bec083aa3 f merge conflicts (part 2) 2022-02-24 20:12:22 -05:00
pixlblade
3573f55881 f merge conflicts 2022-02-24 20:02:05 -05:00