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

531 commits

Author SHA1 Message Date
Cameron Taylor
7766ddf9bd camera movement lerp fix for high framerates 2021-03-24 22:41:41 -04:00
Cameron Taylor
2fdea58951 mod menu thingie 2021-03-24 19:19:08 -04:00
Cameron Taylor
180c3db3c4 outline bullshit in progress 2021-03-24 18:41:54 -04:00
Cameron Taylor
985bd5374b converting shit to new options menu 2021-03-24 16:44:58 -04:00
Voltrex
65ec185c6b feat(performance): Use switch statement 
Use a `switch` statement instead of a huge `if .. else if` chains.
 2021-03-24 18:43:17 +04:30
Cameron Taylor
6def44b83c lol fixed dumbass shader thinge oops 2021-03-23 21:33:17 -04:00
George FunBook
c5888e44ed Merge branch 'master' into sans_discord 2021-03-23 18:07:02 -05:00
Cameron Taylor
dd14af7499 Merge pull request #2 from ninjamuffin99/options 
Options
 2021-03-23 18:48:03 -04:00
Cameron Taylor
9397334792 outline shader in progress 2021-03-23 18:43:08 -04:00
George FunBook
d5d484bfb2 fix remove defaultCamera refs 2021-03-23 17:30:58 -05:00
George FunBook
e6c48ed56f fix back bug 2021-03-23 17:28:05 -05:00
George FunBook
3476796cc6 Merge branch 'master' into options 2021-03-22 23:05:46 -05:00
George FunBook
e6a5064845 fix camera 2021-03-22 22:41:37 -05:00
George FunBook
b8ef4952cd fix type 2021-03-22 22:41:27 -05:00
George FunBook
c545a6e090 fix AtlasText bug 2021-03-22 21:39:50 -05:00
George FunBook
9c6b3bf51d finalize options menu 2021-03-22 21:39:35 -05:00
George FunBook
8a515b63f5 allow run without discord stuff 2021-03-22 09:09:46 -05:00
George FunBook
34cb7f9982 more ui work 2021-03-22 08:40:32 -05:00
George FunBook
0ed0093fdd more work on controls menu 2021-03-22 07:48:52 -05:00
MtH
532e2f18ae Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-22 01:55:17 +01:00
Cameron Taylor
dd49ae7990 note color bullshit and also disabled 'stuns'?? 2021-03-21 16:29:47 -04:00
Cameron Taylor
75ed1d5231 color swap shit in progress 2021-03-21 14:45:46 -04:00
Cameron Taylor
c80d8cc09e shader bullshit 2021-03-20 15:20:00 -04:00
Cameron Taylor
671046a6d5 SHADERRRR 2021-03-20 14:55:29 -04:00
MtH
daef9e0759 DECIMAL BPM support for da charters out there, 
also changes to HealthIcon to better work in ChartingState
 2021-03-20 17:33:29 +01:00
MtH
80cac358c2 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-20 12:56:53 +01:00
Cameron Taylor
42991c5fdf shader dumbshit in progress IGNORE FOR NOW! 2021-03-20 04:33:44 -04:00
Cameron Taylor
2b61c81ff5 arrows stuff 2021-03-20 01:03:42 -04:00
Cameron Taylor
01065e54d5 new note spritesheets 2021-03-20 00:48:17 -04:00
MtH
db9d497460 hair blowing idle loop for week4 2021-03-19 19:02:42 +01:00
MtH
7e52a76329 quickAnimAdd() for all, fixes looping anims 
dad, pico looping idle fixed, they now dance on beat instead
also adds animation.finish() after initial anims, so their anims on create don't get in the way of anims during countdown
commented-out idea for senpai idle, as it's currently 2 beats long but not properly on beat
 2021-03-19 18:13:41 +01:00
Cameron Taylor
be5907ba12 pixel icon bullshits 2021-03-19 00:03:29 -04:00
Cameron Taylor
fdd8e0445e icon code redo for more modularity 2021-03-18 21:08:44 -04:00
Cameron Taylor
99407f07ab small organization/cleanup of Discord things 2021-03-18 20:26:17 -04:00
Cameron Taylor
619f7c8a22 Merge branch 'master' of https://github.com/ninjamuffin99/funkin 2021-03-18 19:12:39 -04:00
Cameron Taylor
dbce0bffd8 Merge pull request #496 from Jakkzero/master 
Discord RPC (custom status)
 2021-03-18 19:08:55 -04:00
Cameron Taylor
744f6cc3f0 Merge branch 'shart' 2021-03-18 16:29:35 -04:00
Cameron Taylor
ea6b7de62d fixed compiler conditional thingie 2021-03-18 16:26:39 -04:00
Cameron Taylor
2419af49d6 Merge branch 'shart' of https://github.com/ninjamuffin99/funkin-secret into shart 2021-03-18 16:24:58 -04:00
Cameron Taylor
dc3098c3e1 Merge branch 'nitpix' 2021-03-18 16:22:53 -04:00
Cameron Taylor
eefae64c0c TANKMAN GAMEOVER SHIT 2021-03-18 14:15:54 -04:00
MtH
ab1a89783c bf pixel die offset fix & manual sparrow fix 2021-03-18 14:04:28 +01:00
MtH
6e23041d8c title tweaks: 
fix crash when spamming enter,
force logo bump,
compensate for missed beats with intro text (ex. when window being dragged)
 2021-03-18 12:49:37 +01:00
MtH
87ec716ade Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-17 19:15:18 +01:00
MtH
3107d62053 make pause actually use the pause control 2021-03-17 19:15:00 +01:00
MtH
91409b67c9 mitigate countdown dancing issues (might still fuck up on higher bpm) 2021-03-17 18:33:26 +01:00
Cameron Taylor
48411894e2 offsets and adjustemnts 2021-03-17 05:29:04 -04:00
Cameron Taylor
d8f0297675 bf holding gf 2021-03-17 05:20:25 -04:00
George FunBook
a75e6ecb38 add input groups 2021-03-16 10:20:40 -05:00
George FunBook
9c1866dbdb add rebind key prompt 2021-03-16 09:56:08 -05:00
Cameron Taylor
eba2639638 tnakmen in progres lol 2021-03-16 01:51:23 -04:00
MtH
49d060d9f2 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-14 20:49:28 +01:00
MtH
1467335ac7 remove check if philly train sound playing 2021-03-14 20:48:02 +01:00
MtH
c3710025e1 fix oppenent freezing when !mustHitSection and no notes, dance only on downbeat 2021-03-14 20:46:44 +01:00
George FunBook
9ffa28dd21 Merge branch 'master' into options 2021-03-13 22:41:29 -06:00
Cameron Taylor
a55dcdc69c offsets for bf and gf 2021-03-13 23:02:14 -05:00
George FunBook
307150d3e2 fix camera 2021-03-13 21:41:12 -06: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
15f7b5e2d2 offset bullshit and pico 2021-03-13 20:53:57 -05:00
MtH
367cb8b1cc make main menu bg not go offscreen when selecting options, add offsets for menu items 2021-03-13 22:31:49 +01:00
MtH
9885b03b7d portraits before box to fix thorns intro layering issue 2021-03-13 20:06:03 +01:00
MtH
53b5153c22 finger fadeout oops 2021-03-13 19:48:49 +01:00
MtH
30ef3e4955 freeplay monster icon 2021-03-13 19:43:11 +01:00
MtH
c653c69720 week6 dialogue finger 2021-03-13 19:40:54 +01:00
Cameron Taylor
388a3f8aab oops more bullshit 2021-03-13 13:37:59 -05:00
Cameron Taylor
f346cf096b guns slight changes and modding desktop conditionals 2021-03-10 20:17:26 -05:00
Cameron Taylor
caa95c8c00 conditionals for HTML5 2021-03-10 17:01:57 -05:00
Cameron Taylor
bfd6325c43 mod menu prototyping 2021-03-10 00:27:57 -05:00
Cameron Taylor
ab4fa026a1 Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret 2021-03-09 23:33:38 -05:00
Cameron Taylor
bfcb037b81 file and folder detection 2021-03-09 19:41:03 -05:00
MtH
d3c17bc42a gf sad offset TINY FIX 2021-03-09 12:29:00 +01:00
Cameron Taylor
d7aba46853 tankmen foreground in progress 2021-03-08 18:38:58 -05:00
Cameron Taylor
4fae6773c9 tank guy and quality of life shit 2021-03-07 15:34:21 -05:00
Cameron Taylor
7658fb245b assets, and switch statement so i dont get roasted 2021-03-07 01:59:22 -05:00
Cameron Taylor
956b5b94fd video stuff in progress 2021-03-04 19:36:56 -05:00
Cameron Taylor
0951b672e7 charts an shit and death counter 2021-03-04 14:30:35 -05:00
Cameron Taylor
6d002a8ef8 stuff for week 7 2021-03-04 03:00:48 -05:00
Cameron Taylor
9b5802e1d0 monster and shit 2021-03-02 04:30:25 -05:00
Cameron Taylor
d7f6407578 freeplay stuff in progress 2021-03-02 00:46:28 -05:00
Cameron Taylor
7cba3e72ea freeplay icon polish, and pause title touchups 2021-03-01 23:58:19 -05:00
Cameron Taylor
fee7a7746c pause screen polish shit 2021-03-01 23:00:02 -05:00
Cameron Taylor
eeda572c3e easier storymode menu adding onto 2021-03-01 22:56:12 -05:00
Cameron Taylor
be95f5a298 freeplay menu polish thingie 2021-03-01 22:56:12 -05:00
Cameron Taylor
15a57a34af song icon formatting 2021-03-01 22:56:12 -05:00
M&M
1506dc001a Merge branch 'master' into scoreoutline 2021-02-28 19:45:56 -08:00
WorstAquaPlayer
3dd24abf07 Added missing #if to RPC call 2021-02-28 18:50:06 -03:00
WorstAquaPlayer
5e7bbc3b66 Exiting through the pause menu updates RPC 2021-02-27 21:34:49 -03:00
WorstAquaPlayer
b1993259bf Changed RPC !html and added Debug Status 2021-02-27 21:06:30 -03:00
WorstAquaPlayer
34a5175ce5 Alt+Tab and Game Over updates RPC 2021-02-27 20:49:53 -03:00
WorstAquaPlayer
dee03abd3f Pausing and unpausing updates RPC 2021-02-27 20:23:50 -03:00
WorstAquaPlayer
700acb86a1 Now shows P2 icon and time left when song starts 2021-02-27 18:59:18 -03:00
WorstAquaPlayer
3d74f869d3 Added changePresence arguments 2021-02-27 16:58:07 -03:00
Jakkzero
1eb5ae69de Update FreeplayState.hx 2021-02-27 02:28:01 +00:00
M&M
c90b35011f girlfriend finally cheers 2021-02-26 15:45:06 -08:00
Jakkzero
bd2228f3f5 put the thread import in the right place 2021-02-26 13:25:55 +00:00
Jakkzero
ad0e707c57 forgot to comment out debug trace 2021-02-26 13:23:03 +00:00
Jakkzero
580f41f09d fixed endless discord updates 
I'm an idiot and had no idea what I was doing with haxe.Timer.delay() so I'm using Sys.sleep() and it seems to work fine.
 2021-02-26 12:52:40 +00:00
Jakkzero
cb8aa3d175 Adding updated source files 2021-02-26 12:27:32 +00:00
Cameron Taylor
b1b3df25b5 week metadata bullshit for free[;ay 2021-02-24 20:52:59 -05:00
Cameron Taylor
3882de4ad8 freeplay fixin shit 2021-02-24 20:22:37 -05:00
Cameron Taylor
3e65da6d9d bopeebo note thing 2021-02-24 19:06:41 -05:00
Cameron Taylor
10ecc85baf options menu in progress 2021-02-24 18:32:51 -05:00
Cameron Taylor
b62fbe935f Merge pull request #384 from ActualMandM/resyncvocals 
Resync by music instead of vocals
 2021-02-24 01:42:00 -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
Cameron Taylor
a6deae4796 bullshit lol 2021-02-23 23:32:53 -05:00
Cameron Taylor
811cc1f3ae Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2021-02-23 23:31:15 -05:00
Cameron Taylor
d2062f41b6 small shit characters dunno this shit weird lol 2021-02-23 23:14:18 -05:00
George FunBook
5b6862d6cf start new Controls menu 2021-02-23 18:59:36 -06:00
George FunBook
d3e17274a8 add grid nav controls 2021-02-23 18:59:09 -06:00
George FunBook
38496ea74d cheats on debug only 2021-02-23 18:57:49 -06:00
George FunBook
d9371cc8eb add AtlasText cuz Alpabet sux 2021-02-23 18:55:24 -06:00
George FunBook
aef55f90c6 alphabet menu items + separate ngPrompt 2021-02-21 12:08:30 -06:00
George FunBook
3936f739b2 move ngPrompt to new file 2021-02-19 22:10:16 -06:00
George FunBook
e6b9ec2100 finalize prompts and uix 2021-02-19 20:11:33 -06:00
MtH
b83bb877d0 fix several issues caused by sustain notes no longer being removed after correctly hit 2021-02-20 01:31:52 +01: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
d3a873037d flicker on accept 2021-02-15 16:04:08 -06:00
George FunBook
d6f6cc3ca9 Merge branch 'deferred_loading' into ng_login 2021-02-15 15:59:36 -06:00
George FunBook
7df55291a5 oices path 2021-02-15 15:49:13 -06:00
George FunBook
5b84e136fc Merge branch 'master' into deferred_loading 2021-02-15 15:30:29 -06:00
George FunBook
99f6ad9d50 wtf am i doing 2021-02-15 11:43:51 -06:00
Cameron Taylor
86955d6670 icons and changelog and newgrounds 2021-02-14 19:45:18 -05:00
Cameron Taylor
5d96dc44e0 Merge pull request #357 from lotusotho/senpaidialoguebug-fix 
Fixed bug that makes the whole game crash at the start of week 6
 2021-02-14 19:44:41 -05:00
Cameron Taylor
3d8a3a8f98 Gitaroo easter egg 2021-02-14 19:03:02 -05:00
Cameron Taylor
9585ae42e7 Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2021-02-14 03:32:29 -05:00
Cameron Taylor
a41e14ecdf icons and cleanin 2021-02-14 03:32:24 -05:00
MtH
7a70182697 better sustain notes & organizing 2021-02-13 23:39:31 +01:00
M&M
93b0fe153d Merge branch 'master' into resyncvocals 2021-02-12 23:21:51 -08: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
Cameron Taylor
a037a52a60 Merge pull request #402 from TheDrawingCoder-Gamer/patch-1 
Use haxe switch case 'or'
 2021-02-11 22:14:24 -05:00
MtH
a8a3c96e7b entirely phase out totalBeats/totalSteps in favor of the more reliable curStep/curBeat 2021-02-12 03:19:43 +01:00
MtH
f3462c2c99 totalSteps & totalBeats synced with bpm changes 2021-02-12 01:58:11 +01:00
MtH
674a08b381 actually huge overhaul OOPS lol. 
trims off unnecessary data, supports bpm changes proper and according to my proposed system, also just happens to fix other issues with the chart editor
 2021-02-11 23:13:50 +01:00
MtH
41efd4f3db BPM map, trim off useless song stuff, adjust MILF cam zoom 2021-02-11 23:06:26 +01:00
Bulby
260a024e5c Use haxe switch case 'or' 2021-02-11 14:54:16 -05:00
George FunBook
755e338c88 Merge branch 'master' into deferred_loading 2021-02-11 13:18:50 -06:00
George FunBook
8dd68b6360 remove TitleState.soundExt 2021-02-11 13:14:16 -06:00
George FunBook
246c87240e fix preloaded versions 2021-02-11 13:14:02 -06:00
MtH
ad233110f7 Merge branch 'master' of https://github.com/ninjamuffin99/Funkin 2021-02-11 11:09:23 +01: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
George FunBook
07abc35f66 add Paths asset name helper 2021-02-08 15:34:48 -06:00
M&M
646694bb79 Resync by music instead of vocals 2021-02-08 09:48:58 -08:00
MtH
8e251f5b4a tweak changeBPM functionality 2021-02-08 04:07:56 +01:00
M&M
8e0a286c01 Pause menu goes back to the mode you came from 2021-02-07 17:31:21 -08:00