FunkinMP

ApfelTeeSaft/FunkinMP

Fork 0

mirror of https://github.com/ApfelTeeSaft/FunkinMP.git synced 2026-09-03 11:43:33 +00:00

Commit Graph

Select branches

Hide Pull Requests

EliteMasterEric-patch-1

Multiplayer-Dev

bugfix/appdomain-blacklist

bugfix/appdomain-blacklist-2

bugfix/chart-editor-duplicate-hitsounds

bugfix/chart-editor-notification-crash

bugfix/chart-editor-variation-bpms

bugfix/git-submodule-url

bugfix/more-community-fixes

bugfix/no-traces-on-release

bugfix/persistent-screenshot-preview

bugfix/save-data-fixes

bugfix/two-unrelated-bugfixes

chart-edit-polish

chart-edit-scroll-tweaks

debug-menu-cam-fix

develop

docs/changelog-0.5.1

docs/compiling-guide

docs/remove-potential-duplicates

docs/troubleshooting-update

feature/automatic-offset-flipping

flixel-bump

git-cliff-template

hundrec/combo-counter-rebase

label-test-docs

language-labels

legacy/0.2.x

main

ninjamuffin99/funk-1023

pico-menu-fix

vscode-compilation-server

1.0.0

1.1.0

v0.1.0

v0.2.0

v0.2.1

v0.2.1.1

v0.2.2

v0.2.4

v0.2.4.1

v0.2.5

v0.2.6

v0.2.7

v0.2.7.1

v0.3.2

v0.3.3

v0.4.0

v0.4.1

v0.5.0

v0.5.1

v0.5.2

v0.5.3

39686d094b Merge branch 'bugfix/week-4-boppers' into develop EliteMasterEric 2024-08-27 05:01:32 -04:00
0e81cdb993 Merge branch 'feature/project-hxp' into develop EliteMasterEric 2024-08-27 05:00:04 -04:00
ecdd697284 Merge branch 'art-repo-update' into develop EliteMasterEric 2024-08-27 04:56:41 -04:00
d02f632c0e Fix a bug where stage props would receive events twice EliteMasterEric 2024-08-27 04:54:02 -04:00
df42ac7531 Fixed issues with Nene offsets in Pico mode EliteMasterEric 2024-08-27 04:20:49 -04:00
5caba54e19 Update HScript to use the organization's fork EliteMasterEric 2024-08-27 02:33:17 -04:00
dff87babe6 Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into rewrite/master Cameron Taylor 2024-08-26 21:58:39 -04:00
91e4043ce9 small hmm updates Cameron Taylor 2024-08-26 21:58:35 -04:00
a0a3b95d22 Merge remote-tracking branch 'secret/rewrite/master' into develop EliteMasterEric 2024-08-26 18:12:47 -04:00
29aa714571 Merge remote-tracking branch 'secret/rewrite/master' into develop EliteMasterEric 2024-08-26 18:12:38 -04:00
475a20ece8 Merge pull request #700 from FunkinCrew/bugfix/builds-2024-08 Cameron Taylor 2024-08-26 18:11:05 -04:00
200b3c963b Updated compile defines to use feature flag system EliteMasterEric 2024-08-26 18:01:36 -04:00
6b9bdb5f2a Upgraded project file to HXP EliteMasterEric 2024-08-26 18:01:23 -04:00
269f3ecfbe Updated haxelibs EliteMasterEric 2024-08-26 18:01:06 -04:00
f2433bfdcc Updated CHANGELOG EliteMasterEric 2024-08-26 18:00:59 -04:00
b51ba61d07 Update art submodule EliteMasterEric 2024-08-26 17:14:15 -04:00
e8ed5ffc74 Update loop behavior EliteMasterEric 2024-08-26 17:07:09 -04:00
3c208ee143 git cleanup crew mint 2024-08-26 20:00:53 +02:00
a778555a97 more debug info mint 2024-08-26 19:52:53 +02:00
266bf939a9 haxelib mint 2024-08-26 19:38:21 +02:00
514aa576ea haxelib mint 2024-08-26 19:35:54 +02:00
8010441bef haxelib mint 2024-08-26 19:34:30 +02:00
0193bde700 hm, pain mint 2024-08-26 19:32:38 +02:00
7cac3c95ee config the haxelib 👁️ mint 2024-08-26 19:27:11 +02:00
1089764ab6 suppress useless git warnings mint 2024-08-26 18:56:32 +02:00
86f61b4fdd pulseaudio mint 2024-08-26 18:12:16 +02:00
a1714711e3 swap docker image deps mint 2024-08-26 17:52:37 +02:00
0b19b4bc25 add the maskTest Bizz CheemsAndFriends 2024-08-26 20:34:14 +02:00
f4c45f082f Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into rewrite/master Cameron Taylor 2024-08-26 13:18:09 -04:00
025c186ddc assets submod Cameron Taylor 2024-08-26 13:18:05 -04:00
7940b19dbf Merge pull request #696 from FunkinCrew/funk-vis-pr Cameron Taylor 2024-08-26 13:16:41 -04:00
fd06e6800c Merge pull request #698 from FunkinCrew/completion-server-null-fix Cameron Taylor 2024-08-26 13:16:05 -04:00
235f502d0e Re-export Boyfriend Freeplay EliteMasterEric 2024-08-26 13:01:21 -04:00
b837aa0888 Disable spamming TAB EliteMasterEric 2024-08-26 13:00:41 -04:00
86283bc74f Fall back to idle animation if character doesn't have NewUnlock EliteMasterEric 2024-08-26 13:00:25 -04:00
8a8ddbfbb5 Use FunkinCamera on Char Select state. EliteMasterEric 2024-08-26 13:00:01 -04:00
00c7767f8a Update FunkinSound.hx cyn 2024-08-23 20:17:10 -07:00
c62b53ebe9 Merge branch 'FunkinCrew:main' into flash_fix cyn 2024-08-23 20:09:41 -07:00
9e1d328a0f assets submod FabsTheFabs 2024-08-23 13:37:50 +01:00
55dd1857c9 freeplay transition + wip card classes FabsTheFabs 2024-08-23 13:36:35 +01:00
e37330f288 character select transition FabsTheFabs 2024-08-23 13:36:00 +01:00
0d3fa41b29 blue fade shader FabsTheFabs 2024-08-23 13:35:50 +01:00
96c151cf36 Update assets EliteMasterEric 2024-08-23 05:02:29 -04:00
3caa88c4a6 Update FunkVis EliteMasterEric 2024-08-23 05:01:51 -04:00
8161221299 Merge remote-tracking branch 'secret/feature/charSelect' into develop EliteMasterEric 2024-08-23 05:01:01 -04:00
cd600a67c4 Merge remote-tracking branch 'secret/completion-server-null-fix' into develop EliteMasterEric 2024-08-23 04:56:42 -04:00
6a12ebfa88 Merge remote-tracking branch 'secret/hscript-git' into develop EliteMasterEric 2024-08-23 04:54:14 -04:00
7f0f0efe46 initial Commit CheemsAndFriends 2024-08-22 23:36:43 +02:00
1e45cb94c8 Add Pico Tutorial EliteMasterEric 2024-08-21 18:40:26 -04:00
5756eff7cf dont need null check, we just need to declare string type Cameron Taylor 2024-08-21 16:39:34 -04:00
e1d8e758bb completion server fixin? Cameron Taylor 2024-08-21 16:31:10 -04:00
506c7e8404 Re-exported Nene and corrected Pico death animation offsets. EliteMasterEric 2024-08-21 07:02:44 -04:00
9f66b7ae37 Botplay can never miss now. EliteMasterEric 2024-08-21 06:30:18 -04:00
9419985f8c Add BF new character animation EliteMasterEric 2024-08-21 06:10:13 -04:00
cd5bb071d3 Character select tweaks (starting to move stuff to the JSON data) EliteMasterEric 2024-08-21 04:00:04 -04:00
617337a751 Use git fork of HScript (adds support for "is" and "?.") EliteMasterEric 2024-08-21 01:15:58 -04:00
0b4611273f Update haxelibs EliteMasterEric 2024-08-21 01:09:34 -04:00
5290306a0f Merge remote-tracking branch 'secret/rewrite/master' into develop EliteMasterEric 2024-08-21 01:06:19 -04:00
6e0363b60b Implement Pico's loss animation. EliteMasterEric 2024-08-21 01:02:51 -04:00
cee5d53deb Merge pull request #686 from FunkinCrew/applehair/freeplay-stack-overflow Cameron Taylor 2024-08-20 15:09:36 -04:00
df588f86af Merge branch 'rewrite/master' into applehair/storymode-valid-variation Cameron Taylor 2024-08-20 15:06:07 -04:00
78d299db4e Merge branch 'gamerbross/animation-editor' into rewrite/master Cameron Taylor 2024-08-20 15:03:42 -04:00
76edf2e4e9 remove unused imports Cameron Taylor 2024-08-20 14:44:53 -04:00
6e3fba4d3d Merge branch 'rewrite/master' into gamerbross/animation-editor Cameron Taylor 2024-08-20 14:29:43 -04:00
af8c52a489 Merge pull request #685 from FunkinCrew/70ltan/char-path-fix Cameron Taylor 2024-08-20 14:21:58 -04:00
1b309e33ef Merge branch 'rewrite/master' into 70ltan/char-path-fix Cameron Taylor 2024-08-20 14:21:36 -04:00
f8b63c9968 update funkin.vis PR Cameron Taylor 2024-08-20 14:19:04 -04:00
7acd0de409 Merge remote-tracking branch 'secret/rewrite/master' into develop EliteMasterEric 2024-08-20 06:22:34 -04:00
94a08ff528 asset stuff CheemsAndFriends 2024-08-20 01:28:03 +02:00
a6f8cf0141 Setting a simple mask test CheemsAndFriends 2024-08-20 01:20:13 +02:00
7d3d83b23c Merge branch 'week1-stage-erect' into rewrite/master Cameron Taylor 2024-08-19 19:06:24 -04:00
ec07a476c1 assets submod Cameron Taylor 2024-08-19 19:06:07 -04:00
0aa9c41c5b assets submod Cameron Taylor 2024-08-19 18:59:08 -04:00
0250bfa8b0 Fixes for HTML5 EliteMasterEric 2024-08-19 14:55:09 -04:00
82eea221d8 Can't seem to understand AtlasSprite CheemsAndFriends 2024-08-19 14:41:20 +02:00
8a2d8a9941 Committing all the additional stuff (Lowering FPS For my PC lol) CheemsAndFriends 2024-08-19 13:41:29 +02:00
4dad17d241 Prepare the FlxAnimate bizz CheemsAndFriends 2024-08-19 13:40:58 +02:00
8a03cc7b2a assets submod FabsTheFabs 2024-08-19 04:29:28 +01:00
9d85d423c6 add stage to registry and chart editor FabsTheFabs 2024-08-19 04:29:22 +01:00
eb5bf449a4 assets submod Cameron Taylor 2024-08-17 15:06:10 -04:00
0270df6b23 assets submod Cameron Taylor 2024-08-17 14:58:42 -04:00
2af34963fd Merge remote-tracking branch 'secret/rewrite/master' into develop EliteMasterEric 2024-08-16 20:53:09 -04:00
0e46f91a60 Merge branch 'rewrite/master' into feature/album-art-swap Cameron Taylor 2024-08-16 20:21:51 -04:00
b1fe983c21 Merge branch '2-erect-songs' into rewrite/master Cameron Taylor 2024-08-15 15:15:08 -04:00
6679ec5519 assets submod Cameron Taylor 2024-08-15 15:14:41 -04:00
0d33cd29a9 Merge pull request #692 from FunkinCrew/feature/more-pico-songs Cameron Taylor 2024-08-15 15:13:37 -04:00
d2b52570c6 Fix a bunch of warnings and errors with FlxAtlasSprite EliteMasterEric 2024-08-14 23:07:16 -04:00
d6d17fcd48 Fixes to assets submodule EliteMasterEric 2024-08-14 18:26:50 -04:00
da1960637f A couple more develop fixes EliteMasterEric 2024-08-14 16:00:53 -04:00
397816960d Merge branch '2-erect-songs' into develop EliteMasterEric 2024-08-14 15:16:29 -04:00
11518fa189 Merge branch 'feature/more-pico-songs' into develop EliteMasterEric 2024-08-14 15:15:30 -04:00
988e819e9b Add a bunch of remixes EliteMasterEric 2024-08-14 15:10:47 -04:00
c209e0e192 Ugh Erect and Cocoa Erect EliteMasterEric 2024-08-14 10:57:44 -04:00
a8a29f0d96 Merge remote-tracking branch 'secret/rewrite/master' into develop EliteMasterEric 2024-08-14 05:09:18 -04:00
23bac90735 Fix a whole batch of bugs EliteMasterEric 2024-08-14 05:08:44 -04:00
26cb7fb9f1 Merge remote-tracking branch 'secret/gamerbross/animation-editor' into develop EliteMasterEric 2024-08-13 20:25:50 -04:00
d60f831e0c Merge branch 'feature/ghost-tapping' into develop EliteMasterEric 2024-08-12 17:34:53 -04:00
081baa5dca Merge branch 'project-hxp' into develop EliteMasterEric 2024-08-12 17:34:12 -04:00
4ff1e2b46a Fixed an issue where the chart editor was unavailable EliteMasterEric 2024-08-12 15:56:04 -04:00
3717b8cd42 Update HXP to correctly add assets to libraries EliteMasterEric 2024-08-09 22:47:10 -04:00

... 6 7 8 9 10 ...