Commit graph

58 commits

Author SHA1 Message Date
MtH
dd137dd0cc Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret into testtrack 2021-03-30 05:45:15 +02:00
MtH
934e45fa2a week score lerp fix INSPIRED BY PR #447 BY @jvc
https://github.com/ninjamuffin99/Funkin/pull/447
2021-03-29 17:18:25 +02:00
George FunBook
c5888e44ed Merge branch 'master' into sans_discord 2021-03-23 18:07:02 -05:00
George FunBook
3476796cc6 Merge branch 'master' into options 2021-03-22 23:05:46 -05:00
George FunBook
8a515b63f5 allow run without discord stuff 2021-03-22 09:09:46 -05:00
Cameron Taylor
dbce0bffd8 Merge pull request #496 from Jakkzero/master
Discord RPC (custom status)
2021-03-18 19:08:55 -04:00
George FunBook
95f8d65972 Merge branch 'master' into ng_login 2021-03-13 20:24:57 -06:00
George FunBook
43b0d5ac78 add options menu 2021-03-13 20:11:56 -06:00
Cameron Taylor
eeda572c3e easier storymode menu adding onto 2021-03-01 22:56:12 -05:00
WorstAquaPlayer
b1993259bf Changed RPC !html and added Debug Status 2021-02-27 21:06:30 -03:00
Jakkzero
cb8aa3d175 Adding updated source files 2021-02-26 12:27:32 +00:00
Cameron Taylor
3882de4ad8 freeplay fixin shit 2021-02-24 20:22:37 -05:00
George FunBook
e6b9ec2100 finalize prompts and uix 2021-02-19 20:11:33 -06:00
George FunBook
fb3ed180e1 Merge branch 'master' into deferred_loading 2021-02-12 09:46:22 -06:00
Cameron Taylor
b3ec450352 more seamless storymode transitions 2021-02-12 01:20:20 -05: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
07abc35f66 add Paths asset name helper 2021-02-08 15:34:48 -06:00
Cameron Taylor
385097941c idk campaign menu shit 2021-02-02 02:20:14 -05:00
Cameron Taylor
3382e4e974 mod guide in progress 2021-01-20 06:53:20 -05:00
Cameron Taylor
f1d9c06882 menu fix maybe oops 2021-01-20 06:14:38 -05:00
Cameron Taylor
a92739402c CHRISTMAS UPDATE 2021-01-20 05:31:43 -05:00
Cameron Taylor
44d8c8309f scripted thingie 2021-01-20 04:03:49 -05:00
Cameron Taylor
7b2c930808 MOD SHIT IN PROGRESS 2021-01-04 18:56:30 -05:00
Cameron Taylor
b051b18cf2 week unlockin shit 2020-12-27 05:57:45 -05:00
Cameron Taylor
b3ad4ab908 maybe ready to go??? 2020-12-27 05:37:04 -05:00
Cameron Taylor
88ada9d345 tutorial patch 2020-12-11 08:49:06 -05:00
Cameron Taylor
7874300986 week setup? 2020-12-11 04:15:24 -05:00
Lotusotho
438b3dd2c2 Update StoryMenuState.hx 2020-12-01 12:53:30 +01:00
lotusotho
f1cf48be10 Update StoryMenuState.hx 2020-11-26 20:14:35 +01:00
BuildTools
931aca8492 fixed spamming issue with the buttons on the story menu 2020-11-26 19:43:45 +01:00
Cameron Taylor
ef3fa33717 Merge branch 'master' into master 2020-11-25 00:22:22 -08:00
Brandon
9de490f296 game works again, twin-stick is fun 2020-11-07 16:13:41 -05:00
Brandon
77c9422088 haha , also highscore.hx breaks switch 2020-11-07 15:52:21 -05:00
Brandon
7dc874d622 caught up to cam 2020-11-06 21:17:27 -05:00
Cameron Taylor
5ed65c5ee5 score shit 2020-11-06 13:51:11 -08:00
Cameron Taylor
c2b17d4e3e WEEK SCORE SHIT 2020-11-06 02:56:45 -08:00
Cameron Taylor
36361ff0a4 Seperated tutorials 2020-11-06 02:21:29 -08:00
Cameron Taylor
35eee013d5 balanced normal, and usin newgrounds haxelib 2020-11-06 01:57:00 -08:00
Brandon
81db7718d2 ng release and blank controls 2020-11-01 14:16:22 -05:00
Cameron Taylor
cb11c78c26 RELEASE SHIIIT 2020-11-01 00:58:20 -07:00
Cameron Taylor
55d0d25c87 release 2020-11-01 00:01:00 -07:00
Cameron Taylor
c3d2179395 almost releaaaase 2020-10-31 21:55:00 -07:00
Cameron Taylor
4859d15057 POLIIIISH SHIIIIT 2020-10-31 21:34:17 -07:00
Cameron Taylor
ae50142583 easy charts 2020-10-31 20:22:49 -07:00
Brandon
1866069af2 latest halloween 2020-10-31 21:11:14 -04:00
Cameron Taylor
06b5366535 difficulty UI 2020-10-31 16:53:26 -07:00
Cameron Taylor
9596610408 sounds and polish shit 2020-10-31 12:53:58 -07:00
Cameron Taylor
74054b5ece polish polish polish polish 2020-10-31 03:07:22 -07:00
Cameron Taylor
4997cfddaf text shit cookin 2020-10-31 00:32:51 -07:00