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

916 commits

Author SHA1 Message Date
Cameron Taylor
819d6d570d fix layering jitter 2021-06-18 14:18:56 -04:00
Cameron Taylor
1927be79f8 animation fixing for FlxSymbol in progress 2021-06-17 01:42:31 -04:00
Cameron Taylor
4137687f26 proper layering 2021-06-15 21:15:06 -04:00
Cameron Taylor
e120578642 ANIMATION SHIT MORE IN PROGRESS LOL 2021-06-15 17:43:46 -04:00
Cameron Taylor
6b595165be lil files cleanup 2021-06-14 19:36:56 -04:00
Cameron Taylor
7ebc7e4ffb quick title screen optimize 2021-06-08 23:05:38 -04:00
Cameron Taylor
2db47b1ba9 memory optimizations 2021-06-07 21:14:50 -04:00
Cameron Taylor
2323000381 nice lil control shti 2021-06-05 00:58:10 -04:00
Cameron Taylor
7e213cb5cb different offset view shit 2021-06-05 00:46:03 -04:00
Cameron Taylor
44ba266b88 offset view thingie 2021-06-05 00:24:55 -04:00
Cameron Taylor
8aa50b9d47 remvoed animationdebug shit 2021-06-05 00:01:15 -04:00
Cameron Taylor
820ee969d0 AnimationDebug removed, replaced by DebugBoundingState 2021-06-05 00:00:30 -04:00
Cameron Taylor
4211bc7344 mouse movement for offset shit 2021-06-04 17:39:28 -04:00
Cameron Taylor
699a89198e onion skinning when pressing F 2021-06-04 16:45:08 -04:00
Cameron Taylor
1301cf3ab6 WASD controls for animation 2021-06-04 12:53:53 -04:00
Cameron Taylor
2a2fd39d1c new offset shit in progress 2021-06-04 03:06:15 -04:00
Cameron Taylor
78e205d60f offset moving shit 2021-06-04 02:57:43 -04:00
Cameron Taylor
accbae3c80 anim swapping easier 2021-06-04 02:43:05 -04:00
Cameron Taylor
52b0f17ac7 animation playing dropdown menu 2021-06-04 02:31:27 -04:00
Cameron Taylor
ae37e98cdf anim debug bullshit 2021-06-04 02:01:34 -04:00
Cameron Taylor
1fa00fab9b lil keyboard control shit 2021-06-02 21:12:23 -04:00
Cameron Taylor
58cede8706 undo of movements 2021-06-02 21:04:43 -04:00
Cameron Taylor
1f91c3bdef undo/redo selections 2021-06-02 20:41:06 -04:00
Cameron Taylor
65d187f511 cursor shit and tool shit i duno lol! 2021-06-01 02:39:30 -04:00
Cameron Taylor
6c47686ee8 the friday night funkin creepypasta 2021-05-27 22:45:23 -04:00
Cameron Taylor
bab7c0130d drag n drop layer type beat 2021-05-27 19:56:56 -04:00
Cameron Taylor
3f53371f30 dragging shit 2021-05-27 19:15:03 -04:00
Cameron Taylor
be4b35938b debug anim shit in progress 2021-05-26 19:22:15 -04:00
Cameron Taylor
a2360dde70 stage build drag and drop, and removed FAXE bullshiiiit 2021-05-23 23:20:57 -04:00
Cameron Taylor
20f627b98e Merge branches 'master' and 'master' of https://github.com/ninjamuffin99/funkin-secret 2021-05-22 12:54:33 -04:00
Cameron Taylor
30a6db615b middle click drag 2021-05-16 19:17:58 -04:00
MtH
123a7ae59b boopin boppers.. head lerp 2021-05-15 23:39:13 +02:00
MtH
d49858217e Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-05-15 23:28:17 +02:00
Cameron Taylor
bd6936734a polymooooood shoutouts laaarsssss 2021-05-15 12:00:21 -04:00
Cameron Taylor
dd41cc19e1 polymod IN PROGRESS 2021-05-15 10:30:09 -04:00
Cameron Taylor
47102b2431 cache shit idk lol 2021-05-14 18:21:34 -04:00
MtH
63cdbc84ee easteregg crash fix 2021-05-15 00:02:29 +02:00
Cameron Taylor
72e6a47716 NG logo easter egg shit 2021-05-14 17:53:34 -04:00
Cameron Taylor
9df52f2982 Merge branch 'master' of https://github.com/ninjamuffin99/funkin 2021-05-14 17:33:00 -04:00
Cameron Taylor
592204bfa7 Merge branch 'swf' 2021-05-14 17:21:50 -04:00
Cameron Taylor
6f0b0fc6bb cheat code bullshit oops im on swf branch LOL! 2021-05-14 17:20:01 -04:00
PurpleButNotALight
3d78fa2e7e Delete BeatBattle.hx 
this file was annoying me
 2021-05-08 17:15:29 +02:00
MtH
5891bb7f16 custom camera for lerp fix 2021-05-06 14:08:51 +02:00
MtH
ba19234176 improve rating & combo visibility 2021-05-06 12:55:33 +02:00
MtH
2bce5151ba test in freeplay if debug 2021-05-06 12:54:57 +02:00
MtH
a1b927175a just pushin b4 i switch branch 2021-04-23 19:15:40 +02:00
MtH
356a9ad337 dope sprite bounds 2021-04-23 13:30:39 +02:00
MtH
41e66b5d69 Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret 2021-04-22 22:02:02 +02:00
MtH
c5d33192a4 fix crash when going back to title 2021-04-22 21:36:56 +02:00
MtH
fea40412ec swf shit 2021-04-22 17:19:55 +02:00
MtH
5ee0ef8f4e big cleanup 2021-04-22 04:17:00 +02:00
MtH
d882d6568d move song end into debug block 2021-04-21 22:58:36 +02:00
MtH
adb41ce289 wocky slush 
debug shit, gf in animdebug, changesection
 2021-04-21 15:07:36 +02:00
MtH
b88ad022f2 fix susnotes after note miss changes oops 2021-04-20 22:25:38 +02:00
MtH
7c2cc40d7b smol move 2021-04-20 21:50:26 +02:00
MtH
1431b19e57 combo counter fixes & tweaks 2021-04-20 21:48:16 +02:00
MtH
788c4e6f1b combo counter fixes & tweaks 2021-04-20 20:38:07 +02:00
MtH
5aefe519e0 note miss stuff, clean up 'stunned' remnants 2021-04-20 17:55:42 +02:00
MtH
e6f115dbfe cam lerp on gameover 2021-04-19 19:11:30 +02:00
MtH
5dddfd7160 bf old icon switch switches back to proper player1 2021-04-19 18:19:40 +02:00
MtH
e005ac382c don't play game over music if already ending 2021-04-19 10:43:21 +02:00
MtH
ece27cd23a load songs from reload json button 2021-04-19 10:35:39 +02:00
Cameron Taylor
fe4c61124e they hate to see a girlboss winning 2021-04-19 02:46:02 -04:00
Cameron Taylor
56cbb276fa touchups and shit 2021-04-18 17:28:10 -04:00
Cameron Taylor
c60bd8b12f optimiiiizeeee 2021-04-18 16:54:21 -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
5bc6bebb67 Merge branch 'nitpix' of https://github.com/ninjamuffin99/funkin-secret 2021-04-18 05:26:52 -04:00
Cameron Taylor
6f840a9b40 MOVING ANIMATIONS LOL 2021-04-18 05:25:44 -04:00
Cameron Taylor
75fa0dcada number thing 2021-04-18 04:29:01 -04:00
Cameron Taylor
7c120efc66 loading screen interactivity 2021-04-18 04:28:50 -04:00
Cameron Taylor
e1a6325e02 cutscene shit in progress 2021-04-18 04:09:56 -04:00
Cameron Taylor
ac8a8aef42 seen video save data shit 2021-04-18 03:47:48 -04:00
Cameron Taylor
b501d620b8 tank rolling lol XD 2021-04-18 03:35:43 -04:00
Cameron Taylor
2f63837430 pico stage shader 2021-04-18 01:43:28 -04:00
Cameron Taylor
8f2b147d58 in-game animation cutscene type beat 2021-04-17 23:19:33 -04:00
Cameron Taylor
8db0a2cced SKEW SHIT I THINK 2021-04-15 23:13:52 -04:00
Cameron Taylor
3b4129921c guns and animation shit in progress 2021-04-15 11:57:59 -04:00
MtH
f7bb96c49c menu back sounds on all menus 2021-04-15 16:19:02 +02:00
MtH
366b6242c0 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-04-15 15:29:08 +02:00
MtH
76dbe40e11 sus cliprect frameWidth / Height 2021-04-15 04:24:32 +02:00
MtH
86e1aed2fa week6 cam center and move senpaiEvil 2021-04-15 03:56:42 +02:00
Cameron Taylor
75c1cbdbd3 animation playback wip 2021-04-14 21:52:43 -04:00
MtH
5cc9f5532b eggnog > winter-horrorland transiton FIX 2021-04-15 02:18:59 +02:00
Cameron Taylor
8524f244c7 animation rotations 2021-04-14 11:31:52 -04:00
MtH
b2cff72608 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-04-14 04:06:08 +02:00
MtH
84be474f15 framerate adjusted lerps for all menu shit that isnt cameras 2021-04-14 04:02:21 +02:00
Cameron Taylor
605c9066c1 Merge branch 'nitpix' of https://github.com/ninjamuffin99/funkin-secret 2021-04-11 19:08:46 -04:00
Cameron Taylor
c61529d40f sprite animation shit idk lol who cares loL! 2021-04-11 19:08:36 -04:00
MtH
b4274343c5 double gf on tutorial fix and inCutscene for week7 2021-04-12 00:53:37 +02:00
MtH
e4f21d9ba7 bf gf dead offsets 
also lets you enter anim debug from game over screen, and with player1 if holding shift
 2021-04-11 18:41:23 +02:00
Cameron Taylor
672e3d6970 ugh and stress animations 2021-04-10 18:23:56 -04:00
Cameron Taylor
8b1fa3fb31 colors wip 2021-04-10 11:21:04 -04:00
Cameron Taylor
0ed4f87bdb weird polish bullshit 2021-04-10 02:53:23 -04:00
Cameron Taylor
3df90b6777 recycling and groups i guess 2021-04-10 01:49:57 -04:00
Cameron Taylor
26f690a264 quieter trailer and GF doin shit 2021-04-09 22:49:25 -04:00
Cameron Taylor
3f1552be6e tankman shit maybe 2021-04-09 20:34:25 -04:00
Cameron Taylor
0e373a0d42 video, and load screenshit 2021-04-09 19:17:14 -04:00
Cameron Taylor
1f45a072c0 cutscenes, menu, story shit 2021-04-09 16:37:54 -04:00
Cameron Taylor
d9612ebb2b Merge branch 'nitpix' of https://github.com/ninjamuffin99/funkin-secret 2021-04-09 15:48:16 -04:00
Cameron Taylor
7fa9700664 jeff gameover censor 2021-04-09 11:38:09 -04:00
Cameron Taylor
80c6609ef9 load screen and censors 2021-04-09 03:03:27 -04:00
Cameron Taylor
7f80550598 tanky 2021-04-08 22:50:29 -04:00
Cameron Taylor
462734d87b tankman anims song 2 lil thing 2021-04-08 22:02:49 -04:00
Cameron Taylor
b06cc7b105 pico asset re export 2021-04-08 21:52:21 -04:00
Cameron Taylor
e85f883fa3 thingie LOL 2021-04-08 20:58:07 -04:00
MtH
f10a935a75 menu scroll sound on pause screen 2021-04-09 02:56:17 +02:00
MtH
af5abd27d1 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-04-09 02:52:41 +02:00
Cameron Taylor
f696c0909c pico offsets 2021-04-08 20:48:11 -04:00
Cameron Taylor
11d9998539 stress cunt cutscene stuff 2021-04-08 18:59:37 -04:00
Cameron Taylor
ea430156e2 cutscene polish in progress 2021-04-08 17:31:08 -04:00
MtH
662711b787 freeplay 2021-04-08 23:29:31 +02:00
MtH
ab6cd0e34e Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-04-08 18:51:01 +02:00
MtH
35516cb8f9 discord rpc ignore unfocus if autopause disabled 2021-04-08 18:45:59 +02:00
Cameron Taylor
7c75bfaf31 tank cutscene GUNS 2021-04-08 12:33:19 -04:00
MtH
cdd93d8e48 merge from PUBLIC 2021-04-08 14:44:13 +02:00
MtH
729d48707d don't try to resync vocals after vocals already ended or song fading out 2021-04-08 14:17:21 +02:00
MtH
10bb5d8a30 im dumb 2021-04-08 13:33:36 +02:00
MtH
ba62e4cb0e NEEDS TESTING: delay note miss by one frame to fix lag causing misses 2021-04-08 03:29:32 +02:00
Cameron Taylor
29a5802a5b cutscene shit in progress 2021-04-07 20:19:49 -04:00
Cameron Taylor
3db5184b71 cutscene character work in progress 2021-04-06 18:12:31 -04:00
Cameron Taylor
c99297cc14 lol mute debug thing! 2021-04-06 12:27:07 -04:00
Cameron Taylor
c72a238782 drag and drop (commented out, for use later) 2021-04-05 16:42:04 -04:00
Cameron Taylor
f474459ef9 Merge branch 'nitpix' of https://github.com/ninjamuffin99/funkin-secret 2021-04-04 22:33:37 -04:00
Cameron Taylor
6205470907 autopause bullshit 2021-04-04 20:37:23 -04:00
Cameron Taylor
08074f56a5 camera bullshit for menus a lil cooler 2021-04-04 10:17:46 -07:00
Cameron Taylor
6cd6f9b0f7 Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret 2021-04-03 21:38:00 -07:00
Cameron Taylor
3451be5943 bf holding GF dead offset shit in progress 2021-04-03 21:37:57 -07:00
Cameron Taylor
e45446bbe4 Merge pull request #3 from ninjamuffin99/mac_fixes 
fix errors on mac
 2021-04-03 09:43:40 -07:00
MtH
001794591f sort notes on countdown, fixes layering issue on thorns 2021-04-03 02:03:53 +02:00
Kade M
c07533c0c3 add the fucntioln 2021-04-02 14:37:58 -07:00
Kade M
76ebfef571 close the thing on the dead 2021-04-02 14:35:14 -07:00
Cameron Taylor
e25f528e24 dumbass sort maybe lol! 2021-04-01 19:28:20 -07:00
Cameron Taylor
7e17d2a673 gf speaker placement tanky 2021-04-01 18:43:53 -07:00
Cameron Taylor
d4abfcda6a placement shit for tnakstage again 2021-04-01 18:35:10 -07:00
Cameron Taylor
e3c473f65b tank assets placements 2021-04-01 16:39:03 -07:00
Cameron Taylor
1cde68cc91 smoke effects on tankstage 2021-03-31 12:41:45 -07:00
MtH
5e74a0ea44 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret 2021-03-31 19:11:42 +02:00
MtH
2d48435b3b downscroll susnotes positioning 2021-03-31 19:11:05 +02:00
Cameron Taylor
eae5b1888c Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret 2021-03-31 10:09:01 -07:00
Cameron Taylor
643ce8a350 bullshit for working mac build? lol 2021-03-31 10:08:55 -07:00
MtH
c6cc9a73de Merge branch 'nitpix' of github.com:ninjamuffin99/Funkin-secret 2021-03-31 14:43:43 +02:00
MtH
d2cd5e82ad clip rotated sus 2021-03-31 14:43:37 +02:00
Cameron Taylor
bd771261e1 pico note sort 2021-03-30 21:25:41 -07:00
Cameron Taylor
60e3facc22 lil options cleaning 2021-03-30 21:01:18 -07:00
Cameron Taylor
fb7ad03083 FPS counter toggle 2021-03-30 20:51:17 -07:00
MtH
6b979e50cb susnote clip for downscroll still looks like shit tho 2021-03-31 03:02:12 +02:00
Cameron Taylor
95e53ebc38 basically down scroll 2021-03-30 15:10:15 -07:00
MtH
5f8a3241ca Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-31 00:02:59 +02:00
MtH
01288631ff have notes show up properly on scroll speeds below 1 2021-03-31 00:02:09 +02:00
Cameron Taylor
fe91708b9b tankman/picospeaker better syncs 2021-03-30 13:58:05 -07:00
MtH
5b62681654 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-30 21:04:21 +02:00
MtH
9085eed598 tighten main menu security to prevent weird crashes during transitions 2021-03-30 20:52:24 +02:00
Cameron Taylor
32f1b509f4 moved animate bullshit into CoolUtil and gave up 2021-03-30 11:15:34 -07:00
MtH
b7a76bdc8e skip to end of dialogue if not finished 2021-03-30 18:59:14 +02:00
MtH
0370f77dfe fixed bugs where game would crash if pressing R during cutscene or state transition 2021-03-30 18:43:07 +02:00
MtH
720ae5d3cc resolve merge conflict with ActualMandM/pause 2021-03-30 16:47:50 +02:00
MtH
364b74c1c8 Merge branch 'scoreoutline' of https://github.com/ActualMandM/Funkin into nitpix 2021-03-30 16:39:10 +02:00
MtH
0b5809424f offset txts for all chars, move all chars to shared 2021-03-30 15:45:57 +02:00
MtH
51db0d3d24 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-30 14:06:56 +02:00
MtH
d63e132d71 week score lerp fix INSPIRED BY PR #447 BY @jvc2 
https://github.com/ninjamuffin99/Funkin/pull/447
 2021-03-30 14:06:03 +02:00
Cameron Taylor
b686bc73e1 Merge pull request #668 from VoltrexMaster/patch-2 
feat(extra): Remove extra imports
 2021-03-29 21:23:51 -07:00
George FunBook
70409443d1 fix errors on mac 2021-03-29 23:05:21 -05:00
Cameron Taylor
b388ea9064 spritemap atlas bullshit? 2021-03-29 18:06:35 -07:00
Cameron Taylor
f93def6df1 Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret 2021-03-29 18:00:37 -07:00
Cameron Taylor
8f25fb29ef potential adobe animate texture atlas bullshit WIP 2021-03-29 18:00:30 -07:00
Cameron Taylor
5425ae08cb Merge pull request #640 from VoltrexMaster/patch-1 
feat(performance): Use switch statement
 2021-03-29 13:45:54 -07:00
Cameron Taylor
006dc200f6 Merge pull request #500 from ActualMandM/she_cheers 
girlfriend cheering in tutorial
 2021-03-29 13:43:41 -07:00
Cameron Taylor
c0cfbc3380 Merge pull request #1 from ninjamuffin99/sans_discord 
allow run without discord stuff
 2021-03-29 13:43:10 -07:00
Cameron Taylor
bdb74d29bc pico in progress 2021-03-29 10:24:49 -07:00
MtH
03ed9bc2be resync by BOTH voices and inst 
also remove unnecessary includes in chartingstate
 2021-03-29 17:01:49 +02:00
Voltrex
0279da5026 Fix indentation 
2 -> 7 tabs.
 2021-03-29 18:17:41 +04:30
Voltrex
c7d4f1d2ba feat(extra): Remove extra imports 
Remove 2 extra imports, `IOErrorEvent` was imported already.
 2021-03-29 04:16:32 +04:30
MtH
627226dca9 pixel countdown 2021-03-28 23:36:14 +02:00
MtH
484ad359a4 FIX NOTE HITS 
fixes weird note misses when multiple notes are hittable
also fixes notes on HUD appearing pressed when the button is released during game pause/window unfocus
 2021-03-28 23:29:44 +02:00
MtH
09676d88f0 Merge branch 'master' of github.com:ninjamuffin99/Funkin-secret into nitpix 2021-03-28 18:10:40 +02:00
Cameron Taylor
00bfd26703 checkbox thingie hehe 2021-03-27 20:01:53 -07:00
Cameron Taylor
17545fbc86 reverted the ng thingies 2021-03-27 16:11:14 -07:00
Cameron Taylor
32a73e7d70 checkbox fix in progress 2021-03-26 21:33:16 -04:00
Cameron Taylor
c7097eae62 no camera zoom shit 2021-03-26 21:28:04 -04:00
Cameron Taylor
105c05f2e2 no flashing menu 2021-03-26 21:22:07 -04:00
Cameron Taylor
b470cfc83a preference toggling 2021-03-26 20:09:04 -04:00
Cameron Taylor
27c410cb9d cutscene bullshit 2021-03-26 05:09:42 -04:00
Cameron Taylor
45652399c3 cool note thingies 2021-03-26 03:51:39 -04:00
Cameron Taylor
85e181bc80 lerp tweaks and shit more 2021-03-24 23:39:19 -04:00
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
Jan200101
d38323ab55 check if newgroups api key actually exists before creating core 2021-02-05 13:14:28 +01:00
Lotusotho
823acd7a60 Deleted bool I created before 2021-02-04 22:40:02 +01:00
Lotusotho
4e3a29943a Fixed bug at the start of the dialogue 2021-02-04 22:36:01 +01:00
M&M
79e1925bf8 Add outline to score text 2021-02-02 23:44:35 -08:00
Cameron Taylor
6301c7744f fix roses oopsies 2021-02-02 08:04:23 -05:00
Cameron Taylor
b8b5bb8888 RELEASE 2021-02-02 05:46:17 -05:00
Cameron Taylor
b0af2f6680 IM PISSED IM MAD BUT WE CLOSE 2021-02-02 04:54:36 -05:00
Cameron Taylor
518ee235d1 section shit 2021-02-02 04:13:28 -05:00
Cameron Taylor
cddb67d984 background girls 2021-02-02 03:24:34 -05:00
Cameron Taylor
60c4367896 lil dating sim things 2021-02-02 02:35:35 -05:00
Cameron Taylor
385097941c idk campaign menu shit 2021-02-02 02:20:14 -05:00
Cameron Taylor
c66eb94ccf THORNS AND EVIL MAN 2021-02-02 00:48:22 -05:00
Cameron Taylor
f306e603be aligned pixel arrows 2021-02-01 05:52:10 -05:00
Cameron Taylor
13ae7d65b6 FONT AND BULLSHIT 2021-02-01 01:50:30 -05:00
Cameron Taylor
5d0363ae96 call me senpai 2021-01-31 21:43:09 -05:00