Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-12-04 21:31:15 -05:00
Code Issues Projects Releases Packages Wiki Activity
4288 commits 30 branches 20 tags 3 GiB
Commit graph

66 commits

Author SHA1 Message Date
Cameron Taylor
737a679196 merge conflict fixins 2024-08-29 15:26:35 -04:00
Cameron Taylor
825327e1c8 Merge branch 'rewrite/master' into feature/charSelect 2024-08-29 15:13:58 -04:00
EliteMasterEric
200b3c963b Updated compile defines to use feature flag system 2024-08-26 18:01:36 -04:00
CheemsAndFriends
8a2d8a9941 Committing all the additional stuff (Lowering FPS 
For my PC lol)
 2024-08-19 13:41:29 +02:00
EliteMasterEric
3786b0a23a Fix build issue on release builds. 2024-04-29 18:31:20 -04:00
Cameron Taylor
46dcd4c8ea homemade flixel tracker button 2024-04-27 01:17:15 -04:00
Cameron Taylor
678dbc0ab7 Merge branch 'rewrite/master' into a-bot-bars 2024-04-19 15:11:28 -04:00
Cameron Taylor
bc0af9ae9f temp enabling fps 2024-04-14 03:01:07 -04:00
EliteMasterEric
6a131555f8 Merge branch 'rewrite/master' into feature/chart-editor-gamepad-support 2024-03-28 20:15:32 -04:00
Cameron Taylor
a695fb2b39 Merge branch 'rewrite/master' into formatting-fixes 2024-03-22 19:00:29 -07:00
EliteMasterEric
3a35be916b A bunch of checkstyle fixes 2024-03-16 22:20:22 -04:00
Cameron Taylor
82383018f6 funkin soundtray 2024-03-14 19:27:07 -07:00
EliteMasterEric
c901763ad8 Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-gamepad-support 2024-02-13 03:12:57 -05:00
EliteMasterEric
86488a0964 Ensure the CrashHandler ALWAYS initializes first so we have stack traces. 2024-02-12 18:09:36 -05:00
Cameron Taylor
ba0660c2c0 ansi 2024-01-16 08:58:31 -05:00
EliteMasterEric
c6b3499897 Finished up hold note placement on gamepad, implemented note preview playhead 2024-01-08 21:26:24 -05:00
EliteMasterEric
a3123cd64c Measure numbers next to ticks and support for initial time signature. 2024-01-05 02:35:41 -05:00
Cameron Taylor
e4c248896a Merge branch 'rewrite/master' into feature/chart-editor-haxeui-update 2023-11-14 17:08:38 -05:00
Cameron Taylor
124a400e8b Merge branch 'rewrite/master' into rewrite/bugfix/chart-editor-event-placement 2023-11-14 17:05:07 -05:00
Cameron Taylor
12d5cf796b Merge branch 'rewrite/master' into feature/chart-editor-haxeui-update 2023-11-14 16:10:35 -05:00
EliteMasterEric
ce97a002cb Reorganize a whole bunch of classes and perform syntax cleanup. 2023-11-07 04:04:22 -05:00
EliteMasterEric
73107dbc07 Update HaxeUI cursor handling, and remove Funkin components 2023-10-31 14:43:01 -04:00
EliteMasterEric
ffd0a98393 FNFC file rework (includes command line quicklaunch) 2023-10-21 01:04:50 -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
Eric
21f44edf1d New crash handler + Additional null safety for ChartEditorState (#130) 
* A bunch of smaller syntax tweaks.

* New crash handler catches and logs critical errors!

* Chart editor now has null safety enabled.

* Fix -W build issue.

* Actually update hmm.json to use the crash handling branch

* Fix issues causing crash handler to trigger
 2023-08-28 15:03:29 -04:00
EliteMasterEric
68ccc3bceb Fixed UI scaling issue (thanks Ian!!!) 2023-08-01 13:07:16 -04:00
EliteMasterEric
6d5c5f5acb Refactor InitState plus fix a couple crash bugs 2023-06-26 20:39:47 -04:00
EliteMasterEric
634258535c Applied new code style to source/ and assets/data/ 2023-01-22 22:25:45 -05:00
Eric Myllyoja
20ac91bbd9 WIP on splash screen 2022-11-24 19:09:47 -05:00
Eric Myllyoja
848874eaac Fix merge conflicts 2022-09-14 22:28:37 -04:00
Eric Myllyoja
51a7282d40 Merge remote-tracking branch 'origin/note-redux' into feature/chart-editor 2022-09-14 22:28:04 -04:00
Eric Myllyoja
eb3ad49a30 Work in progress on HaxeUI chart editor 2022-09-07 19:07:08 -04:00
Cameron Taylor
8f4855852e BASE PROTOTYPE WORKING W/ HaxeUI 2022-08-24 05:44:22 -04:00
Eric Myllyoja
4172fd861d First prototype of can logic 2022-07-14 19:03:42 -04:00
Eric Myllyoja
b6da0b5e20 Fixed Week 4 boppers and car. 2022-04-18 19:36:09 -04:00
Eric Myllyoja
404b2b648e Modified every file in the codebase to solve a single bug. 2022-03-08 03:13:53 -05:00
Eric Myllyoja
b19478cd1e Scripted stages are done (weeks 1-7) 2022-03-06 02:37:38 -05:00
Cameron Taylor
9f3a11a01a dynamic chart difficulties in progress 2022-01-31 14:16:28 -05:00
Eric Myllyoja
8479b0b671 A memory usage counter ingame to complement the FPS counter 2022-01-27 22:20:38 -05:00
Eric Myllyoja
eda3a2b809 Added translation via FireTongue. Fixed symbols in AtlasText. 2022-01-26 00:41:14 -05:00
Eric Myllyoja
023ab8bded Merge remote-tracking branch 'origin/master' into feature/polymod 2022-01-22 20:40:04 -05:00
Cameron Taylor
7e1ea55ca9 darnell spray paint and also 300fps lol 2022-01-20 22:15:32 -05:00
Eric Myllyoja
bfad5b3352 Properly implemented Polymod for mod loading. 2022-01-20 17:47:42 -05:00
MtH
d0800fcd39 titlestate spring cleaning, move shit into new initstate 
this is a huge ass commit so cam pls dont merge until u thoroughly check it and know what changed and moved and whatever. got rid of a lot of ludum dare era commented out shit as well. feel free to ask for clarification or add shit back if it's better suited here
 2021-09-07 23:09:34 +02:00
Cameron Taylor
a5ed25fc31 darnell and other stuf in progress lol 2021-09-06 14:50:04 -04:00
Cameron Taylor
21e05b72c6 outline shader thing in progress 2021-08-16 23:20:00 -06:00
Cameron Taylor
bd6936734a polymooooood shoutouts laaarsssss 2021-05-15 12:00:21 -04:00
Cameron Taylor
dd41cc19e1 polymod IN PROGRESS 2021-05-15 10:30:09 -04:00
Cameron Taylor
fb7ad03083 FPS counter toggle 2021-03-30 20:51:17 -07:00
Cameron Taylor
388a3f8aab oops more bullshit 2021-03-13 13:37:59 -05:00