Commit graph

144 commits

Author SHA1 Message Date
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
Cameron Taylor
edd4fc5b58 changelog and update shit 2020-12-11 08:08:41 -05:00
Cameron Taylor
a11acc6688 removed bullshit from brandy!!! 2020-12-06 16:52:26 -05:00
Cameron Taylor
2aa92af923 high score manipulation 2020-12-04 12:32:35 -05:00
Cameron Taylor
869ad02b0d closes #13 and closes #10 2020-12-02 12:28:28 -05:00
Cameron Taylor
c7d0fbd2e9 fixed itch link lol 2020-12-02 11:28:26 -05:00
Cameron Taylor
ef3fa33717 Merge branch 'master' into master 2020-11-25 00:22:22 -08:00
Brandon
d6243b794e 11/24/2020 2020-11-24 22:53:48 -05:00
Cameron Taylor
5ecacb5a70 moved the intro texts to a txt file 2020-11-13 14:37:58 -08:00
Brandon
e30ed8e6e5 update to master 11/11/20 2020-11-11 05:00:13 -05:00
Cameron Taylor
e4b9be1f2a funny music :) 2020-11-07 22:26:05 -08:00
Brandon
fa7a560cb0 custom icon, multiple game directories 2020-11-07 19:56:29 -05:00
Brandon
1d972a1313 Update Project.xml 2020-11-07 16:51:55 -05:00
Brandon
99741f0a65 crash on story menu 2020-11-07 00:05:58 -05:00
Cameron Taylor
3979fab6b9 hard mode lol 2020-11-06 19:39:21 -08:00
Brandon
179492e9a1 uhhh 2020-11-06 21:24:03 -05:00
Brandon
e4f72e1979 caught up to cam again 2020-11-06 21:18:55 -05:00
Brandon
7dc874d622 caught up to cam 2020-11-06 21:17:27 -05:00
Cameron Taylor
08a7b2ae02 dont need markdown shitlolol 2020-11-06 18:14:13 -08:00
Cameron Taylor
5ed65c5ee5 score shit 2020-11-06 13:51:11 -08:00
Cameron Taylor
4ba3cfbfdb hotfix for da week 2 unlock 2020-11-06 11:56:41 -08:00
Cameron Taylor
48c482440c clarified changelog 2020-11-06 03:17:40 -08:00
Cameron Taylor
35eee013d5 balanced normal, and usin newgrounds haxelib 2020-11-06 01:57:00 -08:00
Brandon
de56282aec added debugs and cheats and we usin fmod 2020-11-05 05:08:40 -05:00
Cameron Taylor
87f67764a3 Merge branch 'master' into master 2020-11-02 15:37:55 -08:00
Cameron Taylor
bbba49139b we out here 2020-11-02 14:40:12 -08:00
Brandon
81db7718d2 ng release and blank controls 2020-11-01 14:16:22 -05:00
Cameron Taylor
97ba544409 scores in progress 2020-11-01 01:55:02 -08:00
Cameron Taylor
55d0d25c87 release 2020-11-01 00:01:00 -07:00
Cameron Taylor
0831aa257a more poliiiish 2020-10-31 22:29:49 -07:00
Cameron Taylor
ae50142583 easy charts 2020-10-31 20:22:49 -07:00
Cameron Taylor
06b5366535 difficulty UI 2020-10-31 16:53:26 -07:00
Cameron Taylor
4997cfddaf text shit cookin 2020-10-31 00:32:51 -07:00
Cameron Taylor
81496c4f5d ALMOST DIALOGUE 2020-10-30 23:30:35 -07:00
Cameron Taylor
0fcd92f6d9 intro messages 2020-10-30 21:25:23 -07:00
Brandon
be3adae29c Update Project.xml 2020-10-30 22:06:21 -04:00
Brandon
7dea03c934 bmp files cant have transparency :( 2020-10-30 21:05:10 -04:00
Brandon
61f74e7427 caught up 10/30/ 2020-10-30 19:47:19 -04:00
Cameron Taylor
9b53f111a2 UI and menu bullshit 2020-10-30 14:18:26 -07:00
Cameron Taylor
51be7b67f1 spookeez charted 2020-10-30 11:54:53 -07:00
Cameron Taylor
d918d21f13 polish bits here and there 2020-10-29 23:52:26 -07:00
Cameron Taylor
4cbab4f531 BPM BULLSHIT 2020-10-29 20:06:52 -07:00
Cameron Taylor
70e1e40174 lil bullshit in progress hehe 2020-10-28 02:26:33 -07:00
Cameron Taylor
9b08561db8 fix note miss bullshit 2020-10-28 01:24:56 -07:00
Brandon
32df13aedf switch setup start [REAL] 2020-10-26 19:06:42 -04:00
Cameron Taylor
6568affb02 UI BULLSHIT WIP 2020-10-11 20:52:21 -07:00
Cameron Taylor
6e72357f72 sections in progress 2020-10-11 17:24:34 -07:00
Cameron Taylor
186b981847 simple pause screen 2020-10-09 14:24:20 -07:00
Cameron Taylor
001dccb50a fixed build scripts and shit 2020-10-06 20:59:48 -07:00
Cameron Taylor
9965320307 we out here windows build 2020-10-06 18:56:33 -07:00
Cameron Taylor
96b068de55 bunch of polish bullshit 2020-10-05 11:24:51 -07:00
Cameron Taylor
8a37bf319d more performance shit 2020-10-05 03:53:10 -07:00
Cameron Taylor
97921c7a9b scores and dope shit 2020-10-03 12:32:15 -07:00
Cameron Taylor
38802b333c INIT COMMIT 2020-10-02 23:50:15 -07:00