Commit graph

318 commits

Author SHA1 Message Date
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
Jenny Crowe
80d0f28b37 Merge pull request #16 from CarsonKompon/karate-man-background-color
Karate Man - Background Colours & Shadow Colours
2022-02-27 14:50:26 -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
2e0a5766ea Begone 32 bit 2022-02-27 04:03:43 -07:00
Jenny Crowe
abbe37e1ab OK fine I'll do that in github sheesh 2022-02-27 04:02:23 -07:00
Jenny Crowe
cdc7d2f120 Begone test comment 2022-02-27 04:01:24 -07:00
Jenny Crowe
d7068dabd2 Begone 32 bit 2022-02-27 04:00:12 -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
Jenny Crowe
cb8242ea1e Merge pull request #12 from CarsonKompon/fix-editor-new-song-clear-music
Reset Song when pressing "New"
2022-02-27 01:48:46 -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
Jenny Crowe
ebc32f106f Merge pull request #9 from CarsonKompon/fix-editor-ctrl-n
Whoops I never added CTRL+N (Button worked but shortcut didn't)
2022-02-26 00:14:47 -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
Jenny Crowe
78825c9216 Merge pull request #3 from huantianad/master
Setup GitHub Actions CI for automatic builds.
2022-02-25 22:37:54 -07:00
Jenny Crowe
d351e2f9a0 Merge pull request #7 from CarsonKompon/fix-editor-button-new
Added New (CTRL+N) Button
2022-02-25 22:37:21 -07: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
Jenny Crowe
f5b754c440 Merge pull request #5 from Slaith12/master
Fixed tempo change tool not working
2022-02-25 04:30:56 -07:00
Slaith
a43a81a566 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
e829d30f25 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
df909a2781 Fixed minor song offset/song pitch compatibility issue 2022-02-24 21:37:04 -07:00
Jenny Crowe
5a76904f70 Eh it's playable enough 2022-02-24 21:33:51 -07:00
Jenny Crowe
867f8f75cc Editor: Tempo finder tweaks 2022-02-24 21:30:02 -07:00
Jenny Crowe
fa6a57dbb1 Merge pull request #4 from pixlblade/master
Add tempo finder
2022-02-24 20:21:12 -07:00
pixlblade
d45521af90 f merge conflicts (part 2) 2022-02-24 20:12:22 -05:00
pixlblade
775eed31e0 f merge conflicts 2022-02-24 20:02:05 -05:00
Jenny Crowe
47a9c807bb Better timeline handling for song offset 2022-02-24 17:09:14 -07:00
Jenny Crowe
e5e25fa2ab Swing variable added to entities. 2022-02-24 07:12:19 -07:00