1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-09-12 05:07:06 +00:00
Commit graph

3376 commits

Author SHA1 Message Date
Cameron Taylor 7826c79871 assets update for submodule 2024-04-19 15:11:20 -04:00
Cameron Taylor 57df7db5f1 add small #if web define 2024-04-19 15:10:43 -04:00
Cameron Taylor e87830c117 Merge pull request #498 from FunkinCrew/polish/popup-combo-fixes-rebased
Polish/popup combo fixes rebased
2024-04-19 15:01:59 -04:00
Cameron Taylor 9500722a72 Merge branch 'rewrite/master' into polish/popup-combo-fixes-rebased 2024-04-19 15:00:37 -04:00
Cameron Taylor 49a81189c4 use funkinaction in controls.hx 2024-04-19 15:00:12 -04:00
Cameron Taylor b3869f6504 assets update for submodule 2024-04-19 14:16:57 -04:00
FabsTheFabs 351cb8cbaa popupstuff changes + make combopopup able to be edited outside of playstate 2024-04-19 14:14:33 -04:00
FabsTheFabs 3fa60cd228 update assets submodule 2024-04-19 14:14:29 -04:00
Cameron Taylor a0c061e93b Merge pull request #489 from FunkinCrew/bugfix/blazin-death-confirm
Blazin' Death confirm fix
2024-04-19 14:06:19 -04:00
Cameron Taylor 5d8c28ca2b Merge branch 'rewrite/master' into bugfix/blazin-death-confirm 2024-04-19 14:05:52 -04:00
Cameron Taylor 30d052f6ee assets update for submodule 2024-04-19 14:05:38 -04:00
Cameron Taylor f8240e926e Merge pull request #481 from FunkinCrew/bugfix/draw-crash
Fix crash caused when game tries to render disposed sprites during a Sticker transition.
2024-04-19 14:04:20 -04:00
Cameron Taylor 035db7f00a Merge branch 'rewrite/master' into bugfix/draw-crash 2024-04-19 14:03:58 -04:00
Cameron Taylor 9af0ebd240 assets update for submodule 2024-04-19 14:02:14 -04:00
Cameron Taylor 9c8f6ba600 Merge branch 'bugfix/weekend-1-bug-fixes' into rewrite/master 2024-04-19 14:01:37 -04:00
Cameron Taylor f385379935 assets update for submodule 2024-04-19 14:01:19 -04:00
Cameron Taylor cbba7bade3 Merge pull request #270 from FunkinCrew/feature/chart-editor-gamepad-support
Chart Editor: Gamepad support
2024-04-19 13:59:08 -04:00
Cameron Taylor 366bebc94c assets submod 2024-04-19 13:58:35 -04:00
Cameron Taylor 22e411d43f Merge branch 'rewrite/master' into feature/chart-editor-gamepad-support 2024-04-19 13:57:42 -04:00
Cameron Taylor cdc0c18531 Merge pull request #475 from FunkinCrew/bugfix/weekend-1-bug-fixes
Bugfix/weekend 1 bug fixes
2024-04-19 13:55:34 -04:00
Cameron Taylor 93ae7692c8 Merge branch 'rewrite/master' into bugfix/weekend-1-bug-fixes 2024-04-19 13:55:01 -04:00
Cameron Taylor 9a284c34e9 assets update for submodule 2024-04-19 13:45:36 -04:00
Cameron Taylor c3e777154e fix letter sort regex, and tiny LetterSort.hx cleanin 2024-04-18 11:32:11 -04:00
Cameron Taylor 1adef48995 some cleanins with letter sorts 2024-04-18 11:32:11 -04:00
Cameron Taylor bb7b863272 Fix an issue where changing focus would pause some sounds but not others (#491)
Repro: Start a song then switch to another window. Instrumental and opponent pause but player doesn't.
2024-04-17 20:08:26 -04:00
Cameron Taylor fd2356aed4 Fix a crash in the Results state. also nudge GF over to the spot shes in in the FLA (#490) 2024-04-17 20:07:47 -04:00
Cameron Taylor 0f858708c9 Properly fix the menu background to use the correct line colors. (#493) 2024-04-17 20:06:42 -04:00
EliteMasterEric b982484856 Properly fix the menu background to use the correct line colors. 2024-04-16 20:19:20 -04:00
Cameron Taylor 1405e21e3d Merge branch 'rewrite/master' into a-bot-bars 2024-04-16 20:02:08 -04:00
EliteMasterEric 80a558ac08 Fix an issue where changing focus would pause some sounds but not others. 2024-04-16 19:57:19 -04:00
EliteMasterEric d346c9387c Fix a crash in the Results state. also nudge GF over to the spot she's in in the FLA 2024-04-16 19:42:52 -04:00
EliteMasterEric bc0a27c985 Fix references to missing graphics in Freeplay 2024-04-16 18:43:11 -04:00
EliteMasterEric 2210f8bc18 Made Blazin' death a separate asset to fix blend modes. 2024-04-16 18:42:43 -04:00
Cameron Taylor dd64091a99 Merge pull request #483 from FunkinCrew/bugfix/remove-kickstarter-backers
Remove Kickstarter link from credits.
2024-04-16 13:33:38 -04:00
Cameron Taylor 2d5153cdbf Merge branch 'rewrite/master' into bugfix/remove-kickstarter-backers 2024-04-16 13:33:02 -04:00
Cameron Taylor fab6412bc6 Merge pull request #486 from FunkinCrew/bugfix/main-menu-color
Fix the saturation on the main menu background.
2024-04-16 13:25:46 -04:00
Cameron Taylor b9a57b845e Merge pull request #487 from FunkinCrew/bugfix/lingering-hold-cover
Ensure playNoteHoldCover doesn't call if note is judged as 'miss'
2024-04-16 13:25:12 -04:00
Cameron Taylor e6dc795d2a Merge branch 'rewrite/master' into bugfix/lingering-hold-cover 2024-04-16 13:25:00 -04:00
Eric b553dbd517 Remove janky animation on Freeplay menu. (#488) 2024-04-16 13:24:41 -04:00
EliteMasterEric 43ec72fb9d Ensure playNoteHoldCover doesn't call if note is judged as 'miss' 2024-04-15 20:36:38 -04:00
EliteMasterEric 4d1f60434a Fix the saturation on the main menu background. 2024-04-15 19:21:55 -04:00
Hazel 7644ce1019 feat: ci parallelization, linux builds, ci refactoring (#484)
* first linux build attempt

* linux deps!

* hxcodec dependencies

* build timeouts

* reup hxcpp cache every time

by default gh actions will not update caches on cache hit.
since the hxcpp cache grows with compiles, that's not what we want here.
since we *do* need the files newly compiled.

* ci speed test

* group runners by purpose

* REFACTOR CI. IT WAS NEEDED

* smol changies

* second attempt at libc

* fix any format issues

* it's 1:50am

* migrate away from gacts/run-and-post-run@v1

* apt does not have a stable cli interface. use with caution in scripts

* first attempt at libffi6

* second attempt at libffi6

* fuck that

* sigh

* html5 also needs new libc

* make sure rerunning ln -s doesn't fail the build

* desperate attempt

* arc attempt

* arc, ii

* ci

* apt-GET

* who needs safeguards anyway

* clean ci build

* debug time

* lots of connectivity debugging

* 🥺

* natesales/q

* i'm not very smart

* debug hard?

* whose traceroute?

* pls

* ...

* we go even newer

* merge moment

* haxelib maybe

* debug info

* 🥺

* lower mtu runner?

* libffi my beloved

* no multiline env?

* smol buggy

* non docker-aware vars

* i love bash

* builds hopefully go nyoom

* forgor native dep

* [skip ci] meow

* convenient typo

* sigh

* [skip ci] waow

* [skip ci] docker is hard

* i don't understand docker tbh

* debuggering

* docking

* small amount of dumb but still doesn't explain why curl doesn't curl

* just vsc things

* ca certs issue?

* please this has to be the one

* find -type d fail, laugh at this user

* too eepy

* im not that smart am i

* attempt to run containerized from docker base image

* [skip-ci] some more docking

* might as well try

* :pleaading_face:

* ?

* !

* idea

* sigh

* i give in

* aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

* 🥺

* hopefully fix hxcpp cache

* [skip ci] a little dx never hurt anyone

* try removing things until it breaks

* welp that was easy

* not-docker-friendly paths in non-docker env, etc. you get the point

* more sane default cache size

* finishing touches

* welp

* mounted volume

* no systemd, got it

* more failproof dockerfile

* does this not have ossh

* haxelib master

* hopefully final docker build

* bob the builder

* docking :3

* image cleanup

* github moment

* okay mayb

* gotta set it up first

* i have an idea

* hope we ready

* 🥺

* fuck

* sigh

* trigger build on new image

* no comment

* global hxcpp, first idea

* yikes

* hxcpp oopsy

* code dupe

* more code dupe

* lint

* increase hxcpp cache size on native builds as well

* buttons :3

* oops

* forgor to export env variable

* aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
2024-04-14 17:49:41 -04:00
Cameron Taylor bc0af9ae9f temp enabling fps 2024-04-14 03:01:07 -04:00
Cameron Taylor 658fd392fa Merge branch 'rewrite/master' into a-bot-bars 2024-04-14 02:57:05 -04:00
EliteMasterEric 5e7b417d6f Remove Kickstarter link from credits. 2024-04-12 14:44:01 -04:00
EliteMasterEric 6f5c3a043f Fix crash caused when game tries to render disposed sprites during a Sticker transition. 2024-04-10 14:45:07 -04:00
Cameron Taylor 1ec8015841 Merge pull request #474 from FunkinCrew/bugfix/blazin-stuck-blocking
Bugfix/blazin stuck blocking
2024-04-09 23:53:01 -04:00
Cameron Taylor c8d8227790 Merge branch 'rewrite/master' into bugfix/blazin-stuck-blocking 2024-04-09 23:52:37 -04:00
Cameron Taylor 5e7d21d43a Merge pull request #473 from FunkinCrew/bugfix/additional-fixins
Bugfix/additional fixins
2024-04-09 23:50:23 -04:00
Cameron Taylor 5f48ca82bd Merge branch 'rewrite/master' into bugfix/additional-fixins 2024-04-09 23:50:05 -04:00