cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-07-29 00:51:06 +00:00
Code Issues Releases Wiki Activity
6720 commits 38 branches 29 tags 4.1 GiB
Commit graph

353 commits

Author SHA1 Message Date
Eric f3ff8279c0 Update additional haxelibs 2025-01-06 22:29:31 -08:00
EliteMasterEric 1dd97ff9e2 Replace hxCodec with hxVLC 2025-01-06 22:29:31 -08:00
Cameron Taylor 1612005656 fix: volume properly muted when at 0 2024-11-26 15:56:22 -05:00
Cameron Taylor a5cee7c5ad update/merge latest changes from upstream openfl (and update our hmm.json here) 2024-11-26 15:49:22 -05:00
CheemsAndFriends 1ac91b35ca Bump funkin.vis version 2024-11-23 15:21:28 -05:00
CheemsAndFriends 97da5f0122 bump flxanimate 
NewgroundsCredentials.hx add to gitignore

hardcode images
 2024-11-04 15:05:33 -05:00
EliteMasterEric e9e639500a Newly revamped Newgrounds integration, with working medals and leaderboards 2024-11-04 15:05:33 -05:00
Cameron Taylor 9cf808b5d3 lime commit fixie 2024-11-01 16:19:04 -04:00
Cameron Taylor 3362f0bdd0 openfl, lime, and hxcpp hmm update 2024-11-01 15:28:14 -04:00
EliteMasterEric dff4135fc9 Update save data format and error handling. 2024-10-18 19:11:27 -04:00
EliteMasterEric f52472a476 fix: Exiting the chart editor doesn't crash the game anymore 2024-10-04 12:41:45 -04:00
Cameron Taylor 7a3d983bba Merge branch 'feature/discord-rpc-resurrected' into rewrite/master 2024-09-27 17:47:59 -04:00
Cameron Taylor ac3e2b2560 discord api mac 2024-09-27 17:45:54 -04:00
Cameron Taylor 252b87c451
Merge pull request #763 from FunkinCrew/feature/tracy 
Add Tracy support for performance profiling
 2024-09-23 15:03:33 -04:00
Cameron Taylor 58508755f9 revert extra flxtrail function 2024-09-22 10:57:00 -04:00
Cameron Taylor e978f5df76 fix for spirit's trail 2024-09-21 16:32:44 -04:00
Cameron Taylor 50de041251 Merge branch 'public-release/develop' into rewrite/master 2024-09-19 22:11:05 -04:00
EliteMasterEric bfee63f588 Update hmm.json 2024-09-19 11:15:56 -04:00
EliteMasterEric 8fd84f9d13 Functioning Discord Rich Presence! 2024-09-19 10:03:16 -04:00
EliteMasterEric 61d23b9985 Use branch of HXCPP 2024-09-17 20:56:54 -04:00
EliteMasterEric d710318830 Update HaxeUI 2024-09-16 21:54:24 -04:00
Eric 8cad10263e
Merge branch 'develop' into bugfix/animation-editor 2024-09-16 18:37:35 -04:00
EliteMasterEric a4bdeeaf5f Update polymod to fix a crash on missing imports 2024-09-12 17:13:40 -04:00
Cameron Taylor adb4bc96ca flxanimate version bump 2024-09-09 23:47:17 -04:00
Cameron Taylor e2c287e112 logarithmic volume control 2024-09-09 13:01:19 -04:00
Cameron Taylor d61357b80d hmm flxanimate bump 2024-09-09 11:40:17 -04:00
Cameron Taylor 51e5eb929c add hxjsonast to hmm.json to fix builds? 2024-09-08 11:22:24 -04:00
Cameron Taylor c45fa93786 update lime (ndlls) 2024-09-06 16:46:11 -04:00
Cameron Taylor 3e339916d2 flxanimate bump 2024-08-29 18:11:51 -04:00
Cameron Taylor 825327e1c8 Merge branch 'rewrite/master' into feature/charSelect 2024-08-29 15:13:58 -04:00
Cameron Taylor 364a5d5a55 hmm flxanimate version fix 2024-08-29 15:06:11 -04:00
Cameron Taylor 9b712ce2aa bump flixel 2024-08-27 16:13:52 -04:00
Cameron Taylor fd5d8aa196
Merge branch 'rewrite/master' into feature/project-hxp 2024-08-27 11:26:29 -04:00
EliteMasterEric 5caba54e19 Update HScript to use the organization's fork 2024-08-27 02:33:17 -04:00
Cameron Taylor 91e4043ce9 small hmm updates 2024-08-26 21:58:35 -04:00
EliteMasterEric 269f3ecfbe Updated haxelibs 2024-08-26 18:01:06 -04:00
Cameron Taylor f8b63c9968 update funkin.vis PR 2024-08-20 14:19:04 -04:00
Cameron Taylor 0e46f91a60 Merge branch 'rewrite/master' into feature/album-art-swap 2024-08-16 20:21:51 -04:00
Cameron Taylor c3d497a9d9 hxcpp bump 2024-08-07 19:01:46 -04:00
Cameron Taylor f4968b0ae5 openfl hmm commit to dev-funkin 2024-08-05 10:47:59 -04:00
EliteMasterEric 68b7610225 Update OpenFL to latest (requires a few fixes) 2024-07-29 17:26:49 -04:00
EliteMasterEric e4e4c66c6c Update Lime version 2024-07-29 16:24:29 -04:00
Cameron Taylor 5e04628480 lime shallow cairo 2024-07-29 16:24:29 -04:00
Cameron Taylor 195010c7ed hxcpp and lime hmm updates for arm64 mac 2024-07-29 16:24:24 -04:00
EliteMasterEric 3db0cf3e0a Update Polymod to support applying JSON patches in the _merge folder of mods. 2024-07-26 00:22:36 -04:00
Eric 1f1d467156
Merge branch 'rewrite/master' into haxelib/hxcpp 2024-07-25 07:46:45 -04:00
Cameron Taylor 4dfb469552 update hxcpp haxelib 2024-07-25 06:39:12 -04:00
Cameron Taylor aaab24850d flixel haxelib updates 2024-07-25 06:34:35 -04:00
EliteMasterEric 2ae6882241 Swappable album art and updated FlxAnimate 2024-07-10 17:25:52 -04:00
Cameron Taylor e7f39ea081 hxp hmm update 2024-06-25 13:57:26 -04:00
Cameron Taylor ef7612d1c2 discord RPC haxelib 2024-06-25 13:57:26 -04:00
Cameron Taylor 9b4f9db73e update thx related haxelibs 2024-06-25 13:53:55 -04:00
Cameron Taylor a5442b407e haxeui 2024-06-24 21:53:56 -04:00
Cameron Taylor de6ba0c741 flxpartialsound hmm update 2024-06-24 14:40:55 -04:00
gamerbross ba4677857a Few animation editor bugfixes 2024-06-15 20:23:55 +02:00
Cameron Taylor 7214e159e0 update grig 2024-06-06 20:50:53 -04:00
Cameron Taylor 4f0e77c974 update hmm 2024-06-06 20:20:54 -04:00
Cameron Taylor fa270aa6ca Merge branch 'rewrite/master' into fix/grig-viz 2024-06-06 20:17:25 -04:00
Cameron Taylor f2dd626ed9 rollback viz hmm 2024-06-04 22:37:51 -04:00
EliteMasterEric f961ac8e4e Actually fix a crash bug on Freeplay menu when selecting a mod 2024-06-02 02:11:06 -04:00
Cameron Taylor 4f34079b98 Merge branch 'audio-stream' into develop-0.4.0 2024-05-29 16:45:35 -04:00
Cameron Taylor 9aa2411b50 Merge branch 'rewrite/master' into audio-stream 2024-05-28 23:59:36 -04:00
Cameron Taylor 1f64c7fcc9 update hmm flxpartialsound 2024-05-28 23:54:23 -04:00
Cameron Taylor 01b6a11ddb flxpartialsound lock to current version 2024-05-28 22:57:01 -04:00
Cameron Taylor 6c0d998edd update funkVis in hmm 2024-05-28 01:18:18 -04:00
Cameron Taylor 85bfd00bad desktop vis testing 2024-05-24 16:38:35 -04:00
EliteMasterEric 0514e05328 Merge branch 'bugfix/html5-save-data' into develop-0.4.0 2024-05-22 15:15:56 -04:00
EliteMasterEric f3868c2ee8 An attempt at an HTML5 save data fix 2024-05-21 02:23:21 -04:00
Noobz4Life 42e69c1f73 bump hxcodec version 2024-05-12 18:51:21 -04:00
Noobz4Life 1f8954acad bump hxcodec version (fixes linux compilation) 2024-05-11 21:47:28 -04:00
Cameron Taylor 1b6febf01c initial freeplay songs loading 2024-05-09 01:15:01 -04:00
EliteMasterEric e2613fa8fb Fix an issue with an improper version of funkVis 2024-05-07 23:45:35 -04:00
Cameron Taylor c0b3f703c5 lime commit bump for web audio pos 2024-05-02 22:00:21 -04:00
Cameron Taylor bc7d804550 actual proper commit 2024-04-30 23:32:03 -04:00
Eric 9599536ffc Merge branch 'rewrite/master' into hxcodec-hmm 2024-04-29 15:55:45 -04:00
Hazel 3a7efeeca3 fix(ci): linux private repo issues (#524) 2024-04-29 20:04:01 +01:00
Cameron Taylor 450a232eb8 hxcodec version commit bump 2024-04-29 01:39:19 -04:00
Cameron Taylor 46dcd4c8ea homemade flixel tracker button 2024-04-27 01:17:15 -04:00
Hazel bebb16875e hardcode funkvis version 2024-04-24 23:31:00 +01:00
EliteMasterEric 5f26eaacd3 Fix issue where some FlxAnimate symbols wouldn't render on HTML5 2024-04-21 17:23:27 -04:00
Cameron Taylor 658fd392fa Merge branch 'rewrite/master' into a-bot-bars 2024-04-14 02:57:05 -04:00
EliteMasterEric 9a7a385af1 Fix segmentation fault on Linux by rebuilding Lime. 2024-04-06 01:11:27 -04:00
EliteMasterEric b39712d33f Prevent crashes when the game attempts to load bad save data. 2024-04-03 20:31:34 -04:00
Cameron Taylor b75c7c2361 funkVis html5 2024-03-28 23:08:50 -04:00
EliteMasterEric e5a10c6a25 Merge branch 'rewrite/master' into a-bot-bars 2024-03-28 20:26:13 -04:00
EliteMasterEric c9f4a0a86d Update polymod to fix several script-related crashes 2024-03-22 15:29:58 -04:00
EliteMasterEric efa0e103b0 Merge remote-tracking branch 'origin/rewrite/master' into a-bot-bars 2024-03-21 21:54:22 -04:00
Cameron Taylor 186fdfdead Merge branch 'a-bot-bars' of github.com:FunkinCrew/Funkin-secret into a-bot-bars 2024-03-19 13:05:12 -07:00
Cameron Taylor 4eea9b76e7 idk assets revert this if I busted shit here lol 2024-03-19 13:04:58 -07:00
EliteMasterEric 9eda84019d Merge branch 'rewrite/master' into a-bot-bars 2024-03-19 13:34:06 -04:00
EliteMasterEric a7780474fe Improve error handling for bad script superclasses 2024-03-19 00:28:25 -04:00
EliteMasterEric a8ebdc5ee8 Update Polymod to fix several bugs on web 2024-03-18 22:27:19 -04:00
EliteMasterEric c67e64a8f5 Update Flixel and assets submodule 2024-03-13 12:07:19 -04:00
EliteMasterEric 1808f08554 Merge branch 'rewrite/master' into a-bot-bars 2024-03-08 00:21:51 -05:00
Cameron Taylor d6608fe435 a-bot in progress 2024-03-07 14:19:26 -05:00
EliteMasterEric 9212ea9c90 Script fixes for 2hot explosions breaking Polymod 2024-03-05 02:29:44 -05:00
Cameron Taylor 35d0feceb8 assets submod 2024-03-01 00:15:30 -05:00
Cameron Taylor aab050d757 trolled use FunkinCrew for hxcodec in hmm.json 2024-02-29 13:44:53 -05:00
EliteMasterEric 0193c1ddea Update hxCodec to add autoFocus 2024-02-29 02:50:04 -05:00
Cameron Taylor 3764a5db3f Merge branch 'rewrite/master' of https://github.com/FunkinCrew/funkin-secret into a-bot-bars 2024-02-27 22:41:08 -05:00
Cameron Taylor 8a9a8bb179 abot bars in probress 2024-02-22 01:50:55 -05:00
EliteMasterEric d535a3f547 Update haxeui 2024-02-17 02:13:19 -05:00
Mike Welsh 91ab1cb520 Remove hmm dependency to fix HTML5 target 
Remove the `hmm` haxelib dependency from the build.

Linking to `hmm` caused `utest` to be transitively linked, which
eventually caused OpenFL to act strangely and instatiate the
application twice on the HTML5 target.

`hmm` was only used for `HaxelibVersions.getLibraryVersions` macro
call. Instead, manually parse the `hmm.json` ourselves to avoid
the dependency. This fixes the HTML5 target.

`hmm` is still used for package management, but no longer linked
in to the build itself.
 2024-02-15 00:23:24 -08:00
EliteMasterEric 5b20e00a7b Upgrade Polymod to no longer spam popups when the same function fails repeatedly. 2024-02-13 21:43:54 -05:00
EliteMasterEric bd4103fd11 Merge remote-tracking branch 'origin/rewrite/master' into feature/hashlink-hot-reload 2024-02-13 03:06:20 -05:00
EliteMasterEric fa4b896d9a Merge branch 'rewrite/master' into feature/hashlink-hot-reload 2024-02-13 02:23:14 -05:00
EliteMasterEric c4522fe177 Merge branch 'rewrite/master' into rewrite/weekend-1-gameplay-shaderdev 2024-02-13 02:17:06 -05:00
EliteMasterEric f0b5ef4491 Rest in peace, SwagCamera. 2024-02-13 01:38:11 -05:00
Cameron Taylor 1ad17aa904 flixel hmm update 2024-02-13 00:45:29 -05:00
Cameron Taylor 8c54a62ed6 Merge branch 'rewrite/master' into feature/freeplay-pico-character 2024-02-13 00:41:03 -05:00
EliteMasterEric 4346214dc8 Update Polymod to resolve a crash thrown when no mods are installed. 2024-02-12 18:18:50 -05:00
EliteMasterEric d0b3842d44 Merge branch 'feature/freeplay-pico-character' into rewrite/weekend-1-gameplay-shaderdev 2024-02-10 02:38:23 -05:00
EliteMasterEric 091f8eb724 Merge branch 'rewrite/master' into feature/freeplay-pico-character 2024-02-09 23:13:40 -05:00
EliteMasterEric 2d4ca436ec Update Polymod to drastically improve efficiency of openfl.utils.Assets.list() 2024-02-07 18:46:09 -05:00
EliteMasterEric fa556dc1f2 Rewrite conversation JSON parsing code. 2024-02-07 09:21:44 -05:00
EliteMasterEric e5fb1de4ba Fix a boatload of deprecation warnings and upgrade a few libraries. 2024-02-05 19:46:11 -05:00
Cameron Taylor 984c26c0e5 Merge branch 'rewrite/master' into feature/chart-editor-offset-toolbox 2024-02-05 13:06:25 -05:00
Cameron Taylor 30cb53d8c2 haxeui-core update 2024-02-05 13:02:23 -05:00
EliteMasterEric 8cef0c48d8 Update flixel-addons and assets submodule. 2024-02-02 22:03:32 -05:00
Cameron Taylor 90fc1b3962 haxeui hmm update to latest 2024-01-25 22:46:47 -05:00
EliteMasterEric c9163986d5 Initial attempt at rendering the waveform inside the offsets toolbox. 2024-01-25 20:23:18 -05:00
EliteMasterEric 0f8af2ca50 Switch branches for HaxeUI-Flixel 2024-01-18 22:08:01 -05:00
EliteMasterEric 19cd7da8ee Fix an FlxDrawItems crash tied to FlxAnimate 2024-01-17 01:01:13 -05:00
EliteMasterEric 3366240eb5 Fix "Edit Event" menu item when right clicking chart events 2024-01-15 18:21:49 -05:00
Cameron Taylor 0f03021c20 tooltip fix 2024-01-14 08:52:43 -05:00
EliteMasterEric 180e9eefc8 Fix an issue with parsing enums in HScript. 2024-01-14 06:47:17 -05:00
EliteMasterEric 444e5b7040 Several library updates to fix bugs. 2024-01-12 22:02:37 -05:00
Cameron Taylor e87c895131 Merge branch 'rewrite/master' into feature/chart-editor-drag-edit-holds 2024-01-12 08:13:30 -05:00
EliteMasterEric 025fd326bd Click and drag on a sustain to edit it. 2024-01-12 06:13:34 -05:00
EliteMasterEric eea9ac1883 Update to include linux fix (???) 2024-01-10 20:27:40 -05:00
EliteMasterEric 043fb553f6 Fix an issue causing an overflow error when using gamepad (WINDOWS ONLY) 2024-01-10 00:20:00 -05:00
EliteMasterEric a1002c4756 Merge remote-tracking branch 'origin/rewrite/master' into bugfix/conductor-rewrite 2024-01-02 14:14:26 -05:00
Cameron Taylor 11d21c1369 Merge branch 'rewrite/master' into bugfix/chart-editor-monday-fixes 2024-01-01 19:09:36 -05:00
EliteMasterEric a4c993f733 Update HaxeUI and Flixel 2023-12-23 16:25:50 -05:00
EliteMasterEric 711253a202 Update HaxeUI to latest 2023-12-19 16:12:25 -05:00
EliteMasterEric f01535e431 Don't forget to update hmm! 2023-12-19 01:28:24 -05:00
EliteMasterEric 8dd6f29e26 Move all haxelib forks to the FunkinCrew organization. 2023-12-15 04:34:59 -05:00
EliteMasterEric 3f2d1b4c1b Update haxelibs, add flixel-text-input to fix overlapping text 2023-12-14 17:34:02 -05:00
EliteMasterEric ba3bf4e846 Update HaxeUI again 2023-12-14 17:05:48 -05:00
Cameron Taylor 4193cd4ee2 proper dialog fading 2023-12-13 18:24:55 -05:00
EliteMasterEric a0ae30a7c1 Metronome slider and scroll anchor 2023-12-01 17:14:48 -05:00
EliteMasterEric 90fc00f9bb Additional web fixes, Github CI should be happy now. 2023-11-28 21:19:07 -05:00
EliteMasterEric 9a2f235bed Platform-specific fixes for HTML5 and MacOS 2023-11-28 20:52:45 -05:00
Eric 55779630f4 Update to latest HaxeUI (#221) 
* Update to latest HaxeUI

* Update HaxeUI again

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2023-11-20 11:18:25 -05:00
Eric 260f1bd265 [BUGFIX] Fix an issue where PlayState would crash after the second song. (#216) 
* Ignore blank lines in intro text

* Add a check when trying to render destroyed graphics.

* Persist noteSplash graphic so it isn't destroyed.
 2023-11-20 10:42:23 -05:00
EliteMasterEric a605f53e07 Updated git references for haxeui-core and 
haxeui-flixel
 2023-11-05 00:07:49 -04:00
EliteMasterEric 8042f6c5a8 Update HaxeUI again 2023-10-19 15:05:54 -04:00
EliteMasterEric fb4a307195 Update hmm and HaxeUI 2023-10-19 01:24:20 -04:00
Cameron Taylor afcb677fac index on rewrite/bugfix/pause-and-results-fixes: 9b8fc872 song diff menu sort 2023-10-17 00:38:28 -04:00
EliteMasterEric f652beb382 Fix several merge errors. 2023-10-09 20:04:21 -04:00