Commit graph

1034 commits

Author SHA1 Message Date
AstrlJelly 3f27d4b248
Merge branch 'megaminerjenny:master' into merge 2023-01-23 23:01:03 -05:00
Saraistupid 891daf869a
Seperate build actions (#229)
* Update main.yml

* Create macos.yml

* Create linux.yml

* Rename main.yml to windows.yml

* Update README.md
2023-01-23 19:06:08 -05:00
Rapandrasmus 1f7c992ee6
Playable lockstep + Mr. Upbeat fix! (Lockstep is missing recolorable switchsteppers, many of them, and bach portraits) (#227)
* Added sfx, sprites and folders neccesary. And also made an empty game object for working dough

* Started work on the background

* Implemented all unanimated sprites

* Added Init

* Added Prefabs

* Added Jumping and Idle Animatins for the Dough Dudes

* SmallFix

* Start Interval Event Implemented

* Added Audio and Small and Big Ball events

* Code Improvement + starting making the balls

* Added bezier curves

* Added First Rendition of Balls

* Added NPC Balls and starting doing small transporting animations

* SmallFixes

* SmallSoundChanges

* Implemented Audio and prefunction, not done with it though

* In process of fixing set interval

* Added more prefunction stuff and also started working on player input

* Tried adding player balls, not done, many bugs to fix

* Reverted trying to make the playerenterdoughball handle inputs, gonna do it through the main script instead

* Sat up input code for later

* Input works now! Need to add barely and wrong input animations and fix bugs

* Tiny fix

* Added first draft of wronginput animations

* Finished all input anims, trying to fix bugs

* Added finished Spaceship animations

* Added Mr Game and Watch WIP and lifting dough dudes

* Finished GANDW, fixed some bugs and still fixing bugs, almost done!

* DONE

* Begun development on tambourine

* Working Dough Polish

* Added many animations for tambourine

* Added Events

* Inputs added, near completion

* Miss Anims

* Animation changes

* DONE

* fix

* FIXED???

* FIXED FOR REAL

* Begun fixing lockstep, just needs small fixes and features

* Smol fix-ish

* Started work on mr upbeat

* MrUpbeat fixed, finishing up lockstep

* Added BG to lockstep

* Added bg colour change

* Done with my part
2023-01-23 17:48:05 -05:00
AstrlJelly 86c7fe86a6 trying to get different sfx working for each item
really i just established some structure code. i don't understand it too well, so there are a few things commented out.
2023-01-23 15:33:52 -05:00
AstrlJelly 46e5a7f77c
Merge branch 'megaminerjenny:master' into merge 2023-01-23 12:21:52 -05:00
ev 7707874e9b
Random Sprite and Animation Fixes!!!!! (#225)
* Editor Ui Redraw

-redrew every ui icon
-colors changed

-some ui elements (like pause, stop, play, undo, redo, and the line showing the beat youre on in the timeline) are the wrong color in-editor compared to unity

* fix colours

- update credits

* Tambourine Fixed Animations

Monkey and player animations reanimated to be more accurate to the original.

* Final Touch-Ups

Tweaked the Monkey Smack and Player Smack animations, everything should be as close to the original as possible

* Random Sprite and Animation Fixes!!!!!

-Space Soccer animations and spritesheet tweaked (Slight things in the animation and lines on the legs not lining up on the spritesheet)

-Tambourine spritesheet tweaked (REMOVED THE DOT ON THE HAND THE GAME IS PLAYABLE NOW)

-Tap Trial animations tweaked (Monkey shouldnt jitter in place

-Working Dough animations reanimated (More like the original)

Co-authored-by: minenice55 <star.elementa@gmail.com>
2023-01-23 09:59:48 -05:00
Saraistupid 84ac8429af
Compress the prebuilt binaries as tar (#226)
* Update main.yml

* I'M SO SO SO FUCKING STUPID

* Update README.md

* Add installing git instructions

* Update BUILD.md

* Update BUILD.md

* Update README.md

* Just in case because I don't trust Mac users

* Add unity installation instrucitons

* Update README.md
2023-01-23 09:58:58 -05:00
AstrlJelly 40fbc0e5bf doesn't look like much. but
I GOT ANIMATIONS WORKING.
(god, i suck at C#)

* bop animations, on every beat (will soon make it a toggle)
* bird fly in and out, flies in when not on screen and out when on screen
* did more work on "throwObject.cs" but not anything applicable yet
* also found out how assigning scripts to a prefab works. ugh. so, got all those holders and objects assigned
2023-01-23 03:09:55 -05:00
AstrlJelly 92a77ead29 Merge remote-tracking branch 'upstream/master' 2023-01-22 18:46:20 -05:00
minenice55 299d898a15
only destroy queued inputs while conductor is stopped (#224) 2023-01-22 16:50:48 -05:00
AstrlJelly bab0c61780 blehhh
figuring out git some more
2023-01-22 16:40:46 -05:00
minenice55 cff0842084
Working Dough Fixes (#223)
* make intervals be set at the correct time

clear queued balls lists while playback is stopped
queue sounds in advance to prevent mistiming

* clear tambourine queued inputs while playback is stopped

* clear queued inputs OnDestroy
2023-01-22 14:22:39 -05:00
ev 44391050a2
Tweaked Tambourine Animations (#221)
* Editor Ui Redraw

-redrew every ui icon
-colors changed

-some ui elements (like pause, stop, play, undo, redo, and the line showing the beat youre on in the timeline) are the wrong color in-editor compared to unity

* fix colours

- update credits

* Tambourine Fixed Animations

Monkey and player animations reanimated to be more accurate to the original.

* Final Touch-Ups

Tweaked the Monkey Smack and Player Smack animations, everything should be as close to the original as possible

Co-authored-by: minenice55 <star.elementa@gmail.com>
2023-01-21 21:17:19 -05:00
Rapandrasmus 9ae3833dba
I never wanna work on a Call and respone game ever again (#220)
* Added sfx, sprites and folders neccesary. And also made an empty game object for working dough

* Started work on the background

* Implemented all unanimated sprites

* Added Init

* Added Prefabs

* Added Jumping and Idle Animatins for the Dough Dudes

* SmallFix

* Start Interval Event Implemented

* Added Audio and Small and Big Ball events

* Code Improvement + starting making the balls

* Added bezier curves

* Added First Rendition of Balls

* Added NPC Balls and starting doing small transporting animations

* SmallFixes

* SmallSoundChanges

* Implemented Audio and prefunction, not done with it though

* In process of fixing set interval

* Added more prefunction stuff and also started working on player input

* Tried adding player balls, not done, many bugs to fix

* Reverted trying to make the playerenterdoughball handle inputs, gonna do it through the main script instead

* Sat up input code for later

* Input works now! Need to add barely and wrong input animations and fix bugs

* Tiny fix

* Added first draft of wronginput animations

* Finished all input anims, trying to fix bugs

* Added finished Spaceship animations

* Added Mr Game and Watch WIP and lifting dough dudes

* Finished GANDW, fixed some bugs and still fixing bugs, almost done!

* DONE

* Begun development on tambourine

* Working Dough Polish

* Added many animations for tambourine

* Added Events

* Inputs added, near completion

* Miss Anims

* Animation changes

* DONE

* fix

* FIXED???

* FIXED FOR REAL
2023-01-21 21:17:10 -05:00
patataofcourse 9d36c156c8 Merge master 2023-01-21 23:08:06 +01:00
AstrlJelly d71de6e6b2 i need to work out conflicts
really this is just pushing all my stuff so i don't lose it, tambourine is giving my fork conflicts for some reason 💀
2023-01-21 16:40:05 -05:00
Rapandrasmus 62fbf65f51
Third times the charm (#218)
* Added sfx, sprites and folders neccesary. And also made an empty game object for working dough

* Started work on the background

* Implemented all unanimated sprites

* Added Init

* Added Prefabs

* Added Jumping and Idle Animatins for the Dough Dudes

* SmallFix

* Start Interval Event Implemented

* Added Audio and Small and Big Ball events

* Code Improvement + starting making the balls

* Added bezier curves

* Added First Rendition of Balls

* Added NPC Balls and starting doing small transporting animations

* SmallFixes

* SmallSoundChanges

* Implemented Audio and prefunction, not done with it though

* In process of fixing set interval

* Added more prefunction stuff and also started working on player input

* Tried adding player balls, not done, many bugs to fix

* Reverted trying to make the playerenterdoughball handle inputs, gonna do it through the main script instead

* Sat up input code for later

* Input works now! Need to add barely and wrong input animations and fix bugs

* Tiny fix

* Added first draft of wronginput animations

* Finished all input anims, trying to fix bugs

* Added finished Spaceship animations

* Added Mr Game and Watch WIP and lifting dough dudes

* Finished GANDW, fixed some bugs and still fixing bugs, almost done!

* DONE

* Begun development on tambourine

* Working Dough Polish

* Added many animations for tambourine

* Added Events

* Inputs added, near completion

* Miss Anims

* Animation changes

* DONE

* fix

* FIXED???
2023-01-21 16:29:28 -05:00
AstrlJelly 1b6f92a299
Merge branch 'megaminerjenny:master' into master 2023-01-21 15:37:21 -05:00
Rapandrasmus 4921109d87
Tambourine fix? (#217)
* Added sfx, sprites and folders neccesary. And also made an empty game object for working dough

* Started work on the background

* Implemented all unanimated sprites

* Added Init

* Added Prefabs

* Added Jumping and Idle Animatins for the Dough Dudes

* SmallFix

* Start Interval Event Implemented

* Added Audio and Small and Big Ball events

* Code Improvement + starting making the balls

* Added bezier curves

* Added First Rendition of Balls

* Added NPC Balls and starting doing small transporting animations

* SmallFixes

* SmallSoundChanges

* Implemented Audio and prefunction, not done with it though

* In process of fixing set interval

* Added more prefunction stuff and also started working on player input

* Tried adding player balls, not done, many bugs to fix

* Reverted trying to make the playerenterdoughball handle inputs, gonna do it through the main script instead

* Sat up input code for later

* Input works now! Need to add barely and wrong input animations and fix bugs

* Tiny fix

* Added first draft of wronginput animations

* Finished all input anims, trying to fix bugs

* Added finished Spaceship animations

* Added Mr Game and Watch WIP and lifting dough dudes

* Finished GANDW, fixed some bugs and still fixing bugs, almost done!

* DONE

* Begun development on tambourine

* Working Dough Polish

* Added many animations for tambourine

* Added Events

* Inputs added, near completion

* Miss Anims

* Animation changes

* DONE

* fix
2023-01-21 15:37:09 -05:00
AstrlJelly 5064de50ac
Merge branch 'megaminerjenny:master' into master 2023-01-21 15:34:03 -05:00
Rapandrasmus 652b76f396
Added Tambourine, only missing HD frog sprites. Also fixed Tambourine + Working Dough Icons (#216)
* Added sfx, sprites and folders neccesary. And also made an empty game object for working dough

* Started work on the background

* Implemented all unanimated sprites

* Added Init

* Added Prefabs

* Added Jumping and Idle Animatins for the Dough Dudes

* SmallFix

* Start Interval Event Implemented

* Added Audio and Small and Big Ball events

* Code Improvement + starting making the balls

* Added bezier curves

* Added First Rendition of Balls

* Added NPC Balls and starting doing small transporting animations

* SmallFixes

* SmallSoundChanges

* Implemented Audio and prefunction, not done with it though

* In process of fixing set interval

* Added more prefunction stuff and also started working on player input

* Tried adding player balls, not done, many bugs to fix

* Reverted trying to make the playerenterdoughball handle inputs, gonna do it through the main script instead

* Sat up input code for later

* Input works now! Need to add barely and wrong input animations and fix bugs

* Tiny fix

* Added first draft of wronginput animations

* Finished all input anims, trying to fix bugs

* Added finished Spaceship animations

* Added Mr Game and Watch WIP and lifting dough dudes

* Finished GANDW, fixed some bugs and still fixing bugs, almost done!

* DONE

* Begun development on tambourine

* Working Dough Polish

* Added many animations for tambourine

* Added Events

* Inputs added, near completion

* Miss Anims

* Animation changes

* DONE
2023-01-21 14:41:57 -05:00
Saraistupid 1da8357a26
Create Build Instructions (#215)
* Platform-Specific notes in the appropriate place

Add a link to the BUILD.MD

* Create BUILD.MD

* Rename BUILD.MD to BUILD.md

* Update README.md
2023-01-21 12:32:17 -05:00
AstrlJelly 9e0429e32d not much progress rn, getting into the harder stuff
* added more sfx
 - it's from rhre3, if somebody can find a clean rip that would be great, cause i can't)
* made a bop animation
 - still trying to figure out how to get it to play every beat :/
* replaced throw sfx, was using whiff sfx before
* extended background using a slice of the sky gradient and color picked blocks
* some code added to dogninja.cs and throwobject.cs is... bad. it's just torn from other games.
2023-01-21 00:38:38 -05:00
AstrlJelly ef6f3d6849
Merge branch 'megaminerjenny:master' into master 2023-01-20 21:59:50 -05:00
Saraistupid 002fa19971
Fix audio on MacOS (#214)
* JoyShockLibrary

Fix PlayerInput.cs errors on MacOS
Fix libraries not being added to the final build

* how did i do this

* both !

* Fix Audio on MacOS (and fix JSL again)

* Extra notes
2023-01-20 21:35:00 -05:00
Saraistupid d41463ed82
JoyShockLibrary (#213)
Fix PlayerInput.cs errors on MacOS
Fix libraries not being added to the final build
2023-01-20 20:39:58 -05:00
minenice55 26ff58a407
make icon masks use linear colour space (#212) 2023-01-20 18:15:32 -05:00
AstrlJelly 323bc4a44a
Merge branch 'megaminerjenny:master' into master 2023-01-20 15:22:27 -05:00
Rapandrasmus 55a5b91514
Working Dough Polish and QoL + Tambourine Initilization (#211)
* Added sfx, sprites and folders neccesary. And also made an empty game object for working dough

* Started work on the background

* Implemented all unanimated sprites

* Added Init

* Added Prefabs

* Added Jumping and Idle Animatins for the Dough Dudes

* SmallFix

* Start Interval Event Implemented

* Added Audio and Small and Big Ball events

* Code Improvement + starting making the balls

* Added bezier curves

* Added First Rendition of Balls

* Added NPC Balls and starting doing small transporting animations

* SmallFixes

* SmallSoundChanges

* Implemented Audio and prefunction, not done with it though

* In process of fixing set interval

* Added more prefunction stuff and also started working on player input

* Tried adding player balls, not done, many bugs to fix

* Reverted trying to make the playerenterdoughball handle inputs, gonna do it through the main script instead

* Sat up input code for later

* Input works now! Need to add barely and wrong input animations and fix bugs

* Tiny fix

* Added first draft of wronginput animations

* Finished all input anims, trying to fix bugs

* Added finished Spaceship animations

* Added Mr Game and Watch WIP and lifting dough dudes

* Finished GANDW, fixed some bugs and still fixing bugs, almost done!

* DONE

* Begun development on tambourine

* Working Dough Polish
2023-01-20 10:48:30 -05:00
AstrlJelly 0dfc0782b0 keeping trying
* cues have sfx now
 - the "throw object" cues are not accurate yet
* animations adjusted to not keep bird on screen
2023-01-20 03:32:47 -05:00
AstrlJelly 07ff8bf0a4 getting there
i'm so close to getting the "Cut Everything!" block to work. i'm trying to figure out how to not play it as the default when the game is rendered

* added sfx
* added bird animations
* looked at double date for like 2 minutes
* have been editing blue bear's "treat" block to fit dog ninja for a while now

(im gonna try doing these commit notes from now on)
2023-01-20 01:30:37 -05:00
AstrlJelly e4cd0b1247 temp icon w/ mask + bezier curves!!
the icon is temporary, but i did add a mask. i think it looks pretty good :) especially for  what it is. also bezier curves. i just figured those out, now i just need to figure out how to implement them into the object.
2023-01-19 17:22:22 -05:00
AstrlJelly 56e642563f
Merge branch 'megaminerjenny:master' into master 2023-01-19 12:40:56 -05:00
Rapandrasmus ecabbd8966
Add Working Dough (Finished), Missing HD Assets and Updated Icon only. (#210)
* Added sfx, sprites and folders neccesary. And also made an empty game object for working dough

* Started work on the background

* Implemented all unanimated sprites

* Added Init

* Added Prefabs

* Added Jumping and Idle Animatins for the Dough Dudes

* SmallFix

* Start Interval Event Implemented

* Added Audio and Small and Big Ball events

* Code Improvement + starting making the balls

* Added bezier curves

* Added First Rendition of Balls

* Added NPC Balls and starting doing small transporting animations

* SmallFixes

* SmallSoundChanges

* Implemented Audio and prefunction, not done with it though

* In process of fixing set interval

* Added more prefunction stuff and also started working on player input

* Tried adding player balls, not done, many bugs to fix

* Reverted trying to make the playerenterdoughball handle inputs, gonna do it through the main script instead

* Sat up input code for later

* Input works now! Need to add barely and wrong input animations and fix bugs

* Tiny fix

* Added first draft of wronginput animations

* Finished all input anims, trying to fix bugs

* Added finished Spaceship animations

* Added Mr Game and Watch WIP and lifting dough dudes

* Finished GANDW, fixed some bugs and still fixing bugs, almost done!

* DONE
2023-01-19 12:18:55 -05:00
AstrlJelly 73fe86b774 initialization and sprite trimming done
reference is from angrytapper2's video

Throw Object,
Cut Everything!, and
Here We Go!

were the cues added, in that order.
2023-01-19 08:57:18 -05:00
AstrlJelly f4510b7c56 starting on dog ninja
waiting for bread2unity to get merged, and i'm still probably gonna keep working on dog ninja until it's done even if it does.
2023-01-19 00:31:37 -05:00
AstrlJelly c4c51c3a3e
Merge branch 'megaminerjenny:master' into master 2023-01-18 21:44:01 -05:00
kkuhn317 526d5ce6ec
Catchy Tune: fixed bop issue (#208)
* catchy tune setup work, animations

* more catchy tune progress

* catchy tune: gameplay implemented, animation adjustments

* more animation work catchy tune

* more animation work catchy tune

* adjust icon metadata

* code cleanup

left remarks for minigame developer

* Catchy Tune new sprites

* Catchy Tune miss animations, fix bugs

* barely animation

* Catchy Tune several things

* barely sounds
* miss animation for pineapple
* background for catchy tune 2
* new game action for switching bg

* Catchy Tune cleanup, asset bundle

* catchy tune fix tree layering, barely right sound

* Catchy Tune fix weird bop issue

* Catchy Tune remove WIP label

Co-authored-by: minenice55 <star.elementa@gmail.com>
2023-01-18 21:31:20 -05:00
minenice55 c037901d34
Configurable Event Priority & Bugfixes (#209)
* add event priority

fix crop stomp queuing inputs while chart is paused
fix rhythm tweezers not killing queued inputs when switching veggies

* file cleanup

* remove debug print

* remove more files
2023-01-18 21:31:08 -05:00
AstrlJelly 25b56f76da replace sounds, extend some stuff
replaced the rhre3 sounds and added a few things to make camera movements not look so out-of-bounds janky. still working on it, but it's coming along good so far
2023-01-17 00:52:39 -05:00
AstrlJelly 7cf55d1f80
Merge branch 'megaminerjenny:master' into master 2023-01-17 00:16:00 -05:00
RaffyTaffy14 8d707ecd4e
Lockstep Initialization (#203)
* Lockstep

fansodnason

* More Lockstep

Implemented the new sprites (still needs work). Added new Icon.

* More lockstep stuff

i have no clue

* Animation Tweaking

I fiddled around with numbers weeeeeeeeeeeeeeee
2023-01-16 23:29:05 -05:00
AstrlJelly cd79f1966b
Merge branch 'megaminerjenny:master' into master 2023-01-16 21:54:07 -05:00
kkuhn317 b8adc70fce
Catchy Tune: quick fixes (#207)
* catchy tune setup work, animations

* more catchy tune progress

* catchy tune: gameplay implemented, animation adjustments

* more animation work catchy tune

* more animation work catchy tune

* adjust icon metadata

* code cleanup

left remarks for minigame developer

* Catchy Tune new sprites

* Catchy Tune miss animations, fix bugs

* barely animation

* Catchy Tune several things

* barely sounds
* miss animation for pineapple
* background for catchy tune 2
* new game action for switching bg

* Catchy Tune cleanup, asset bundle

* catchy tune fix tree layering, barely right sound

Co-authored-by: minenice55 <star.elementa@gmail.com>
2023-01-16 20:51:53 -05:00
kkuhn317 ab30f1a88e
Catchy Tune: New sprites, animations, bug fixes (#204)
* catchy tune setup work, animations

* more catchy tune progress

* catchy tune: gameplay implemented, animation adjustments

* more animation work catchy tune

* more animation work catchy tune

* adjust icon metadata

* code cleanup

left remarks for minigame developer

* Catchy Tune new sprites

* Catchy Tune miss animations, fix bugs

* barely animation

* Catchy Tune several things

* barely sounds
* miss animation for pineapple
* background for catchy tune 2
* new game action for switching bg

* Catchy Tune cleanup, asset bundle

Co-authored-by: minenice55 <star.elementa@gmail.com>
2023-01-16 20:15:06 -05:00
KrispyDotlessI 4a92db679a
Karate Man - Object through sound changed from GBA to Fever/Megamix (#178)
* Karate Man - Object through sound changed from GBA to Fever/Megamix

it bothers me

* Marching Orders - Face Turn Inputs and More

i said it will be back in action in around november, it's less than 10 days close to november anyway, plus the inputs are easy peasy

* Fixing March Animations

slight error

Co-authored-by: minenice55 <star.elementa@gmail.com>
2023-01-15 22:08:37 -05:00
minenice55 dd0531f48f
Second PlayerActionEvent Pass (#206)
* fix crop stomp input scheduling bugs

* update space soccer to use PlayerActionEvent

* update spaceball to use PlayerActionEvent

make PlayerActionEvents clean themselves up on game switch

* update rhythm rally to use PlayerActionEvent

* update rhythm tweezers to use PlayerActionEvent

* update mahou tsukai to use PlayerActionEvent

* reduce logging level
2023-01-15 22:05:25 -05:00
AstrlJelly a2e2ce1012
Merge branch 'megaminerjenny:master' into master 2023-01-14 23:38:36 -05:00
minenice55 330c538947
First PlayerActionEvent Pass (#202)
* update blue bear to use PlayerActionEvent

* update built to scale DS to use PlayerActionEvent

* update clappy trio to use PlayerActionEvent

* update crop stomp to use PlayerActionEvent

* update drumming practice to use PlayerActionEvent

* update fork lifter to use PlayerActionEvent

* update minigame icons

* update wizard waltz' icon
2023-01-14 23:33:37 -05:00
Bhaos 0115333d8b
Kitties! (Initialization) (#200)
* Kitties! (Initialization)

* Kitties Sprites Set-up

* Kitties (Placeholder Icon)
2023-01-14 15:31:50 -05:00