Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-27 10:05:41 -05:00
Code Issues Projects Releases Packages Wiki Activity
2447 commits 30 branches 20 tags 3 GiB
Commit graph

58 commits

Author SHA1 Message Date
EliteMasterEric
c4522fe177 Merge branch 'rewrite/master' into rewrite/weekend-1-gameplay-shaderdev 2024-02-13 02:17:06 -05:00
Cameron Taylor
41e94f951e Merge branch 'rewrite/master' of https://github.com/funkincrew/funkin-secret into feature/freeplay-pico-character 2024-02-13 00:48:26 -05:00
Cameron Taylor
8c54a62ed6 Merge branch 'rewrite/master' into feature/freeplay-pico-character 2024-02-13 00:41:03 -05:00
Cameron Taylor
6e0f577d54 debugger fixes 2024-02-13 00:29:46 -05:00
Cameron Taylor
92f52b2c3f flixel debugging on test builds 2024-02-12 23:15:18 -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
31cd5b3414 Rework Conversation data parsing 2024-02-07 18:45:13 -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
EliteMasterEric
608d9b6968 Add new Offsets window, work in progress 2024-01-20 14:07:31 -05:00
EliteMasterEric
80c7bcdfdf Rewrite Stage data handling to use the Registry pattern, and add support for solid colors. 2024-01-16 17:08:25 -05:00
EliteMasterEric
edc6f85e21 Finish up event editing (selecting an existing event now shows its data in the event data toolbox) 2024-01-03 21:10:14 -05:00
EliteMasterEric
bbaa9aa4af Work in progress on context menus and song event editing. 2024-01-03 19:53:17 -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
efd29dafbf Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-haxeui-update 2023-11-04 23:51:15 -04:00
EliteMasterEric
eec3ac3ced Clean up several messy chunks of code, and add support for dragging notes and events. 2023-10-26 05:46:22 -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
EliteMasterEric
f4bc682ea1 Remove funkin.play.song.SongData and refactor app to match. 2023-09-08 17:46:44 -04:00
Eric
bb09cc19e7 HTML5: Several fixes to asset loading (#136) 
* Update Polymod to fix async script loading.

* Got into the Main Menu but playstate doesn't work

* Got into PlayState but GF script breaks!

---------

Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
 2023-09-04 22:18:45 -04:00
EliteMasterEric
3f99e0e3da Move TitleState into its own package. 2023-08-08 15:41:25 -04:00
EliteMasterEric
3c218ec01c Done with BPM change fixes, currently working on rendering efficiency 2023-07-22 20:16:43 -04:00
EliteMasterEric
ba53957191 Fixed an issue where dialogue scripts were not being reloaded 2023-07-13 20:26:56 -04:00
EliteMasterEric
b615fbf82a WIP on hold covers 2023-07-04 16:38:10 -04:00
EliteMasterEric
100565f9fc Messing with transitions. 2023-06-27 21:29:58 -04:00
EliteMasterEric
6d5c5f5acb Refactor InitState plus fix a couple crash bugs 2023-06-26 20:39:47 -04:00
EliteMasterEric
0fac918428 Reworked anti-aliasing code (sprites now default to true) 2023-06-25 12:36:00 -04:00
EliteMasterEric
28ddadffff Week 6 dialogue support + bug fixes 2023-06-16 17:37:56 -04:00
EliteMasterEric
1d3c4d61a6 Syntax fixes to get the branch to build 2023-06-06 17:38:31 -04:00
EliteMasterEric
c9fb6bc51f Further typo fixes 2023-06-02 15:25:13 -04:00
EliteMasterEric
09318c258b Remove old story menu state 2023-06-01 15:59:56 -04:00
EliteMasterEric
482de2a122 Added Nightmare difficulty (stub) 2023-05-22 20:55:53 -04:00
EliteMasterEric
a599dbea11 Reworked Story Menu (data driven) 2023-05-17 16:42:58 -04:00
EliteMasterEric
cdd8cd2ed2 Basic working tankman sprites and cutscenes 2023-02-21 20:58:15 -05:00
EliteMasterEric
634258535c Applied new code style to source/ and assets/data/ 2023-01-22 22:25:45 -05:00
EliteMasterEric
e922c026a9 Merge branch 'feature/chart-editor-events' 2023-01-22 20:03:08 -05:00
EliteMasterEric
6d7913786e Working events in chart editor 2023-01-22 19:55:30 -05:00
Cameron Taylor
341d8726b2 PAUSE AND STEPPING WORKING WITH MUSIC 2023-01-06 03:21:54 -05:00
EliteMasterEric
6b3c15348b Autosave and save-on-quit for chart editor 2023-01-02 17:40:53 -05:00
Eric Myllyoja
ee89815981 Several QOL features for chart editor, custom cursor logic 2022-11-08 16:32:00 -05:00
Eric Myllyoja
6e8feecef1 Many improvements to chart system and song format logic 2022-10-26 01:14:29 -04:00
Eric Myllyoja
679ca4aafb Tweaks to song events 2022-09-24 15:02:10 -04:00
Eric Myllyoja
9ebb566b2a WIP on conductor rework 2022-09-22 06:34:03 -04: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
194d8e6ce6 WIP on song data loading 2022-09-13 01:09:30 -04:00
Eric Myllyoja
ee3e1750df Work in progress on Week 8 stuff (animation offsets, death animation) 2022-07-06 21:49:42 -04:00
Cameron Taylor
b5d85c3fd6 latency stuff in progress maybe? 2022-07-05 14:24:02 -04:00