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

203 commits

Author SHA1 Message Date
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
2c3e513d5b Fixed bugs with saving charts on Mac 
Added FILE_DROP_SUPPORTED compilation flag and edited UI text to match.
 2023-09-08 17:41:20 -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
e5f27d6798 Asset redirect fix (now disabled for Github Actions builds) 2023-08-15 14:38:15 -04:00
EliteMasterEric
d251d71daa Asset redirect 2023-07-17 21:54:58 -04:00
EliteMasterEric
28ddadffff Week 6 dialogue support + bug fixes 2023-06-16 17:37:56 -04:00
EliteMasterEric
2d04b1c5f1 Merge branch 'master' into bugfix/character-data 2023-06-09 15:34:56 -04:00
Cameron Taylor
27a9ef211e Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into bugfix/formatting-cleanup 2023-06-09 14:12:37 -04:00
EliteMasterEric
3f2558d26a Validated formatting of 338 XML files. 2023-06-08 16:34:06 -04:00
EliteMasterEric
57caeef802 Work on re-enabling cutscenes 2023-06-02 14:35:08 -04:00
EliteMasterEric
7ba150cda8 Enabled pretty error message reporting 2023-05-30 16:21:37 -04:00
EliteMasterEric
a599dbea11 Reworked Story Menu (data driven) 2023-05-17 16:42:58 -04:00
EliteMasterEric
20e6c7a2be Fix 5 or 6 issues with charting 2023-02-28 13:17:28 -05:00
Cameron Taylor
9ef5974e52 build fix? 2023-02-22 15:30:58 -05:00
EliteMasterEric
cdd8cd2ed2 Basic working tankman sprites and cutscenes 2023-02-21 20:58:15 -05:00
EliteMasterEric
6d7913786e Working events in chart editor 2023-01-22 19:55:30 -05:00
Eric Myllyoja
9db6f7f32a Merge remote-tracking branch 'origin/feature/week-4-gameplay' 2022-12-08 19:52:09 -05:00
Eric Myllyoja
6e8feecef1 Many improvements to chart system and song format logic 2022-10-26 01:14:29 -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
baab8e101f Stage builder improvements, Weekend 1 stage 2022-09-08 01:09:22 -04:00
Eric Myllyoja
e3857d789f Merge branch 'master' into feature/week-4-gameplay 2022-09-07 19:12:18 -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
ee3e1750df Work in progress on Week 8 stuff (animation offsets, death animation) 2022-07-06 21:49:42 -04:00
Eric Myllyoja
43dbce2be1 Merge remote-tracking branch 'origin/feature/scripted-modules' into feature/scripted-characters 2022-04-18 20:39:41 -04:00
Eric Myllyoja
b6da0b5e20 Fixed Week 4 boppers and car. 2022-04-18 19:36:09 -04:00
Eric Myllyoja
a7d338becb First iteration of stable custom characters, plus some other neat changes. 2022-03-21 00:19:05 -04:00
Eric Myllyoja
404b2b648e Modified every file in the codebase to solve a single bug. 2022-03-08 03:13:53 -05:00
MtH
3df79597b1 stage json fixes 2022-03-07 22:58:37 +01:00
Eric Myllyoja
6475a49bf4 Final cleanup before PR. 2022-03-06 03:33:12 -05:00
Eric Myllyoja
b19478cd1e Scripted stages are done (weeks 1-7) 2022-03-06 02:37:38 -05:00
Eric Myllyoja
7b8883d3dd Work in progress, basic stage done 2022-02-23 16:49:54 -05:00
George FunBook
3211303362 remove todo 2022-02-09 19:34:32 -06:00
George FunBook
fc2a20a1fd add song/week/dif compile directives 2022-02-09 19:24:33 -06:00
Cameron Taylor
fc209188f2 lerp polish chart editor lol! 2022-01-28 20:03:38 -05:00
Eric Myllyoja
71ca1f8d3a Added zIndex via macro. 2022-01-26 14:19:57 -05:00
Eric Myllyoja
eda3a2b809 Added translation via FireTongue. Fixed symbols in AtlasText. 2022-01-26 00:41:14 -05:00
Eric Myllyoja
bfad5b3352 Properly implemented Polymod for mod loading. 2022-01-20 17:47:42 -05:00
Eric Myllyoja
81f7a04916 Added support for breakpoint debugging. 2022-01-18 18:28:41 -05:00
Cameron Taylor
38e0e79bc7 Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret 2021-10-24 08:20:24 -04:00
Cameron Taylor
10b0d1851a mobile shit i guess lol 2021-10-24 08:19:58 -04:00
George FunBook
696835c90b polymod compiler checks instead of cpp 2021-09-11 00:33:50 -05:00
Cameron Taylor
a5ed25fc31 darnell and other stuf in progress lol 2021-09-06 14:50:04 -04:00
Cameron Taylor
720b428bcf animate atlas overhaul stuff 2021-09-01 15:34:20 -04:00
Cameron Taylor
a5b11bf880 ios shit in progres 2021-08-23 23:43:59 -04:00
Cameron Taylor
d77a983ff2 FlxActions/Controls.hx stuf for Android keys 2021-08-23 18:52:38 -04:00
Cameron Taylor
9cb1c6b0ea combo stuf in progress, lil cleanups 2021-07-14 19:00:22 -04:00
Cameron Taylor
abced42f8c some postbuild type beat 2021-06-24 01:59:33 -04:00
Cameron Taylor
6b595165be lil files cleanup 2021-06-14 19:36:56 -04:00
Cameron Taylor
30a6db615b middle click drag 2021-05-16 19:17:58 -04:00
Cameron Taylor
dd41cc19e1 polymod IN PROGRESS 2021-05-15 10:30:09 -04:00
Cameron Taylor
6f0b0fc6bb cheat code bullshit oops im on swf branch LOL! 2021-05-14 17:20:01 -04:00
MtH
fea40412ec swf shit 2021-04-22 17:19:55 +02:00
Cameron Taylor
56cbb276fa touchups and shit 2021-04-18 17:28:10 -04:00
Cameron Taylor
157769b41a that pussy be yankin 2021-04-18 13:23:09 -04:00
Cameron Taylor
08971e185d wtf cutscene shit 2021-04-18 06:53:23 -04:00
Cameron Taylor
c61529d40f sprite animation shit idk lol who cares loL! 2021-04-11 19:08:36 -04:00
Cameron Taylor
08074f56a5 camera bullshit for menus a lil cooler 2021-04-04 10:17:46 -07:00
Cameron Taylor
643ce8a350 bullshit for working mac build? lol 2021-03-31 10:08:55 -07:00
George FunBook
c5888e44ed Merge branch 'master' into sans_discord 2021-03-23 18:07:02 -05:00
George FunBook
5ccd073cad change discord to cpp 2021-03-23 14:17:04 -05:00
George FunBook
3476796cc6 Merge branch 'master' into options 2021-03-22 23:05:46 -05:00
George FunBook
9c6b3bf51d finalize options menu 2021-03-22 21:39:35 -05:00
Cameron Taylor
619f7c8a22 Merge branch 'master' of https://github.com/ninjamuffin99/funkin 2021-03-18 19:12:39 -04:00
George FunBook
9ffa28dd21 Merge branch 'master' into options 2021-03-13 22:41:29 -06:00
George FunBook
95f8d65972 Merge branch 'master' into ng_login 2021-03-13 20:24:57 -06:00
Cameron Taylor
bfd6325c43 mod menu prototyping 2021-03-10 00:27:57 -05:00
Cameron Taylor
db63d50100 took out openfl webm thing cuz it bullshit 2021-03-04 19:37:22 -05:00
Cameron Taylor
956b5b94fd video stuff in progress 2021-03-04 19:36:56 -05:00
Cameron Taylor
6d002a8ef8 stuff for week 7 2021-03-04 03:00:48 -05:00
WorstAquaPlayer
3dd24abf07 Added missing #if to RPC call 2021-02-28 18:50:06 -03:00
Jakkzero
17a18f080e Adding discord_rpc as a library 2021-02-26 12:34:31 +00:00
Cameron Taylor
10ecc85baf options menu in progress 2021-02-24 18:32:51 -05:00
Cameron Taylor
ebcceb1f20 Merge branch 'deferred_loading' of https://github.com/Geokureli/Funkin into Geokureli-deferred_loading 2021-02-23 23:34:08 -05:00
George FunBook
38496ea74d cheats on debug only 2021-02-23 18:57:49 -06:00
George FunBook
aef55f90c6 alphabet menu items + separate ngPrompt 2021-02-21 12:08:30 -06:00
George FunBook
e6b9ec2100 finalize prompts and uix 2021-02-19 20:11:33 -06:00
George FunBook
80e7539deb add prompt, finalize login UI 2021-02-18 13:58:16 -06:00
Cameron Taylor
12f8c57484 mobile bullshit cookin in progress??? 2021-02-16 01:53:25 -05:00
Cameron Taylor
a3ece662fe icon bullshit and somethin else gitaroo man 2021-02-16 00:21:11 -05:00
George FunBook
5b84e136fc Merge branch 'master' into deferred_loading 2021-02-15 15:30:29 -06:00
Cameron Taylor
0804f1a709 changelog good to go 2021-02-14 20:21:34 -05:00
Cameron Taylor
a5e3e2be41 readme stuff 2021-02-14 20:15:22 -05:00
Cameron Taylor
86955d6670 icons and changelog and newgrounds 2021-02-14 19:45:18 -05:00
Cameron Taylor
a41e14ecdf icons and cleanin 2021-02-14 03:32:24 -05:00
George FunBook
246c87240e fix preloaded versions 2021-02-11 13:14:02 -06:00
George FunBook
0d16b0ad5c sections and stuff 2021-02-10 14:28:05 -06:00
George FunBook
225ee24fc3 move files to weeks and load songs individually 2021-02-10 14:18:14 -06:00
George FunBook
baab5f9749 move songs to song folder and create libraries for each week 2021-02-09 12:07:05 -06:00
George FunBook
b3ebc4365f move files to libraries 2021-02-08 20:43:17 -06:00
Cameron Taylor
b8b5bb8888 RELEASE 2021-02-02 05:46:17 -05:00
Cameron Taylor
13ae7d65b6 FONT AND BULLSHIT 2021-02-01 01:50:30 -05:00
Cameron Taylor
2233242f64 weedeewfwdsfadf 2021-01-25 05:04:31 -05:00
Cameron Taylor
19f77fec97 so much win 2021-01-24 22:42:51 -05:00
Cameron Taylor
a92739402c CHRISTMAS UPDATE 2021-01-20 05:31:43 -05:00
Cameron Taylor
d8159efb4b HAIR AND MOD SUPPORT SHIT IN PROGRESS 2021-01-14 23:33:12 -05:00
Cameron Taylor
7b2c930808 MOD SHIT IN PROGRESS 2021-01-04 18:56:30 -05:00
Cameron Taylor
57520a407d oops no options lolol 2020-12-27 05:42:06 -05:00
Cameron Taylor
b07372aa8e CHARTS 2020-12-26 21:46:22 -05:00
Cameron Taylor
b5c77a060d colol workflow?? 2020-12-13 01:42:48 -05:00