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
4172 commits 30 branches 20 tags 3 GiB
Commit graph

4172 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Jakkzero
2508b31ca2 Merge pull request #1 from WorstAquaPlayer/master 
More additions to the RPC
 2021-03-02 12:06:16 +00: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
6498a606d2 Merge branch 'master' of https://github.com/ninjamuffin99/ld47 2021-03-01 23:58:22 -05:00
Cameron Taylor
7cba3e72ea freeplay icon polish, and pause title touchups 2021-03-01 23:58:19 -05:00
Cameron Taylor
4691fd7ac5 Merge pull request #514 from ActualMandM/everybody-reads-this 
add transition fix to readme
 2021-03-01 23:04:31 -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
M&M
99a0ccf66f add transition fix to readme 2021-02-28 19:42:45 -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
Jakkzero
8c2ebcd5e8 Update README.md 2021-02-27 02:23:15 +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
4ccf1ad21b Update README.md 2021-02-26 13:18:35 +00:00