Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-12-04 13:21:25 -05:00
Code Issues Projects Releases Packages Wiki Activity
4432 commits 30 branches 20 tags 3 GiB
Commit graph

4432 commits

This branch
This branch
All branches
Author SHA1 Message Date
7oltan
e2297af1cd FIX CHARACTER PATHS ISSUE 2024-07-29 18:54:26 -04:00
AppleHair
eb78b754f8 A fix requested by Eric 2024-07-29 18:34:59 -04:00
AppleHair
bef2e98222 [BUGFIX] Ensure the variation used for the next song is valid. 
When playing in story mode, `PlayState` assumes all the songs use the same variation, which is usually true, but not guaranteed. This PR makes `PlayState` use the `getFirstValidVariation` method to find the valid variation instead of using the `currentVariation` variable, which might not be valid.
 2024-07-29 18:34:59 -04:00
EliteMasterEric
68b7610225 Update OpenFL to latest (requires a few fixes) 2024-07-29 17:26:49 -04:00
Eric
9de51fd7d1
Merge pull request #674 from FunkinCrew/arm64-mac 
lime updates for arm64 mac
 2024-07-29 16:53:09 -04:00
EliteMasterEric
e4e4c66c6c Update Lime version 2024-07-29 16:24:29 -04:00
Cameron Taylor
5e04628480 lime shallow cairo 2024-07-29 16:24:29 -04:00
Cameron Taylor
195010c7ed hxcpp and lime hmm updates for arm64 mac 2024-07-29 16:24:24 -04:00
Cameron Taylor
f1af005cf3 Merge branch 'rewrite/master' into burgerballs/song-resync-tweaks 2024-07-29 14:04:41 -04:00
Cameron Taylor
ee584d780c Merge branch 'rewrite/master' into flooferland/new-settings-types 2024-07-29 13:44:01 -04:00
EliteMasterEric
41bd0246ac Custom coutndown, judgements, and combo count now use the note style file instead of hardcoded paths. 2024-07-28 17:10:32 -04:00
anysad
d07564cdc2 hopefully final polish? 2024-07-28 02:44:16 -04:00
anysad
82a6ca5916 welcome fallback note styles! 2024-07-28 02:43:02 -04:00
anysad
d3209e57b7 goodbye scripts, hello notestyles! 2024-07-28 02:34:12 -04:00
anysad
d5a53855d3 how the hell did I miss these? 2024-07-28 02:31:25 -04:00
anysad
dc9dbe84fa cache textures at their new locations! 2024-07-28 02:31:25 -04:00
anysad
bf1d4031af remove trace 2024-07-28 02:31:20 -04:00
anysad
0e7fad090b custom popups and countdowns yay!!! 2024-07-28 02:31:01 -04:00
EliteMasterEric
f3624f7e76 Fixes for scripted song events, define vocal tracks per variation, display suffixed difficulties properly. 2024-07-28 01:42:09 -04:00
EliteMasterEric
3db0cf3e0a Update Polymod to support applying JSON patches in the _merge folder of mods. 2024-07-26 00:22:36 -04:00
Eric
f07777116d
Merge pull request #676 from FunkinCrew/haxelib/hxcpp 
update hxcpp haxelib
 2024-07-25 07:46:54 -04:00
Eric
1f1d467156
Merge branch 'rewrite/master' into haxelib/hxcpp 2024-07-25 07:46:45 -04:00
Cameron Taylor
4dfb469552 update hxcpp haxelib 2024-07-25 06:39:12 -04:00
Cameron Taylor
a15695c3dc compile dev version of hxcpp 2024-07-25 06:39:12 -04:00
Eric
35c8b2c818
Merge pull request #634 from FunkinCrew/haxelib/flixels 
flixel haxelib updates
 2024-07-25 06:38:28 -04:00
Eric
a2838fffd0
Merge branch 'rewrite/master' into haxelib/flixels 2024-07-25 06:38:18 -04:00
Cameron Taylor
aaab24850d flixel haxelib updates 2024-07-25 06:34:35 -04:00
Burgerballs
1831daac38 Update PlayState.hx 2024-07-25 03:34:59 -04:00
Burgerballs
6e301bf648 Update PlayState.hx 2024-07-25 03:34:58 -04:00
Cameron Taylor
c60299e51a
Merge pull request #671 from FunkinCrew/lemz1/note-kind-scripts 
[PUBLIC PR] Note Kind Scripts
 2024-07-22 22:21:14 -04:00
Cameron Taylor
4164329ca9 Merge branch 'rewrite/master' into lemz1/note-kind-scripts 2024-07-22 22:20:58 -04:00
Cameron Taylor
9b8961d4b5 assets submod 2024-07-22 22:20:51 -04:00
EliteMasterEric
04c88baff0 CI fix? 2024-07-22 20:53:34 -04:00
EliteMasterEric
a071e90746 Added alt vocal offsets feature, disabled alt instrumentals on Pico mix (for now?) 2024-07-22 20:52:03 -04:00
EliteMasterEric
1515719a0f Implemented instrumental select (you need to beat the song as Pico first)! 2024-07-22 18:38:22 -04:00
EliteMasterEric
0110936a3e Update assets submodule 2024-07-20 02:19:34 -04:00
Cameron Taylor
bfa0bafc6f
Merge pull request #675 from FunkinCrew/bugfix/hud-hiding 
Several tiny bug fixes
 2024-07-19 19:10:28 -04:00
EliteMasterEric
7547875535 Allow hiding HUD on launcher builds. 2024-07-18 23:27:41 -04:00
EliteMasterEric
729745899e Blacklist haxe.Unserializer in scripts. 2024-07-18 23:27:24 -04:00
EliteMasterEric
558ec53532 Switch songs with no difficulties from an error to a warning. 2024-07-18 23:27:12 -04:00
Cameron Taylor
3f242eb96c
Merge pull request #666 from FunkinCrew/anysad/tutorial-hey-events 
[PUBLIC PR] Un-hardcode animation events from Tutorial.
 2024-07-18 15:12:15 -04:00
Cameron Taylor
f90c2bda99
Merge branch 'rewrite/master' into anysad/tutorial-hey-events 2024-07-18 15:08:10 -04:00
Cameron Taylor
b0a842c2c7
Merge pull request #664 from FunkinCrew/gamerbross/chart-reload-f5 
[PUBLIC PR] Pressing F5 in play state now reloads the chart data from your assets folder
 2024-07-18 15:07:52 -04:00
Cameron Taylor
8d9071d4fd
Merge pull request #669 from FunkinCrew/gamerbross/pause-sticker-zoom 
[PUBLIC PR] Fix a bug where pausing during a camera zoom would break the HUD funk-612
 2024-07-18 15:00:09 -04:00
Cameron Taylor
e26a99d128
Merge pull request #668 from FunkinCrew/gamerbross/chart-editor-live-inputs 
[PUBLIC PR] Cleanup chart editor live inputs
 2024-07-18 14:56:41 -04:00
FabsTheFabs
563905ebd4 assets submod 2024-07-18 06:04:32 +01:00
FabsTheFabs
a0ab216617 merged rain shader stuff from 'feature/week2-erect-bg-rain' 2024-07-18 06:04:19 +01:00
FabsTheFabs
4bcfbc957f assets submod 2024-07-18 05:24:15 +01:00
FabsTheFabs
ad93706b1d adjust color shader 2024-07-18 05:23:37 +01:00
FabsTheFabs
73fc855f8e new stage names 2024-07-18 05:23:31 +01:00