Cameron Taylor
d423753de0
Merge branch 'rewrite/master' into flooferland/new-settings-types
2024-07-11 19:48:51 -04:00
Eric
71947c581e
[PUBLIC PR] Fix a bug where the memory counter would overflow into the negatives ( #662 )
...
* get Float instead of Int in cpp (Float is 64-bit in so it works easier than Int64)
* use Math.fround instead of Math.round
---------
Co-authored-by: Karim Akra <144803230+KarimAkra@users.noreply.github.com>
2024-07-11 19:35:41 -04:00
gamerbross
7b9e4a0542
Fix F5 chart not reloading
2024-07-11 03:41:51 -04:00
AppleHair
34a19ef583
[BUGFIX] Fixed cancelMenu sound not playing after switching state.
2024-07-10 18:08:55 -04:00
EliteMasterEric
2ae6882241
Swappable album art and updated FlxAnimate
2024-07-10 17:25:52 -04:00
Cameron Taylor
fdf52efdd1
Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into rewrite/master
2024-07-08 22:10:52 -04:00
Cameron Taylor
51a156eec9
Merge branch 'char-select-cherrypick' into rewrite/master
2024-07-08 22:10:17 -04:00
Cameron Taylor
d9d0facfca
Merge pull request #653 from FunkinCrew/feature/playable-pico-results
...
Feature/playable pico results
2024-07-08 21:52:23 -04:00
Cameron Taylor
6e5c6a8f6d
assets submod
2024-07-08 21:51:44 -04:00
Cameron Taylor
b338dfe8f0
Merge pull request #649 from FunkinCrew/jvnpixels/story-menu-scrolling
...
[PUBLIC PR] Scroll wheel in Story Menu
2024-07-08 17:39:30 -04:00
Cameron Taylor
3a37b79a55
add TAB to controls stuff
2024-07-08 16:40:10 -04:00
Cameron Taylor
57c995e19d
char select screen controls stuff
2024-07-08 16:30:17 -04:00
Cameron Taylor
a92334d5ae
Merge branch 'rewrite/master' into char-select-cherrypick
2024-07-08 16:23:32 -04:00
Cameron Taylor
d7105e8b8e
change debug menu and add key for freeplay
2024-07-08 16:22:38 -04:00
Cameron Taylor
a7cfae8545
mer
2024-07-04 14:48:24 -04:00
EliteMasterEric
e32fcee77c
Migrate results animations to JSON data so we can implement them per-character
2024-07-03 22:50:39 -04:00
AppleHair
bd17d965f5
[BUGFIX] Fixed Ranks not appearing in freeplay for custom variations
...
Freeplay tries to access a song's rank using the current difficulty name alone, but custom variation ranks are being saved with a variation prefix. This PR makes freeplay look for the variation prefix when necessary.
2024-07-03 18:03:46 -04:00
EliteMasterEric
ad57e64994
Working Pico DJ
2024-07-03 18:03:31 -04:00
EliteMasterEric
5c2bad888d
Make Boyfriend DJ animations data driven
2024-07-03 18:02:16 -04:00
EliteMasterEric
72a00b9ae2
Implemented playable character registry, added Freeplay character filtering, added alt instrumental support
2024-07-03 18:01:49 -04:00
AppleHair
b1021530d8
now using getVariationsByCharId instead
2024-07-03 18:00:59 -04:00
AppleHair
837efcea36
[BUGFIX] Made freeplay use the metadata to get the instrumental suffix
...
Song previews in freeplay will now use the instrumental suffix from the current difficulty's corresponding song variation metadata instead of using the variation id as an instrumental suffix and checking only the "erect" variation.
2024-07-03 18:00:58 -04:00
Cameron Taylor
105e3dccba
spritesheet fixins for char select
2024-07-02 21:26:16 -04:00
FabsTheFabs
3fa9b2a635
new music
2024-07-01 22:18:04 -04:00
Cameron Taylor
8dfd36d227
menu spam fixie
2024-07-01 22:18:03 -04:00
FabsTheFabs
b1b7a032be
music updates
2024-07-01 22:17:55 -04:00
FabsTheFabs
28068b1a86
updating more stuff
2024-07-01 22:17:55 -04:00
FabsTheFabs
d686890f76
most of the old code
2024-07-01 22:16:56 -04:00
Cameron Taylor
043c8e8ade
Merge pull request #638 from FunkinCrew/cyn0x8/flash-fix
...
[PUBLIC PR] Make flashing effects look more consistent
2024-07-01 20:23:16 -04:00
Cameron Taylor
5134547071
Merge pull request #648 from FunkinCrew/gamerbross/freeplay-stack-overflow
...
[PUBLIC PR] Fix Stack Overflow if song doesn't have "normal" difficulty
2024-07-01 20:20:38 -04:00
Cameron Taylor
bb1fc64754
Merge pull request #647 from FunkinCrew/gamerbross/stickers-f5-screen
...
[PUBLIC PR] Fix crash after pressing F5 and coming back from stickers
2024-07-01 20:19:09 -04:00
Cameron Taylor
88263b9ffd
Merge pull request #640 from FunkinCrew/nothyper-474/loading-state-trace
...
[PUBLIC PR] Fix broken trace call in LoadingState
2024-07-01 16:53:07 -04:00
EliteMasterEric
432c709075
Animated pixel icons for freeplay
...
mend
2024-07-01 16:51:54 -04:00
FlooferLand!
cd08116aed
Added getWidth
2024-07-01 15:41:08 -04:00
FlooferLand!
fbc78adb65
Added new settings items
2024-07-01 15:41:08 -04:00
Pixel
a9c6b9ff8a
Extra newline removal.
...
Removes the extra line in code.
2024-06-29 01:15:48 -04:00
Pixel
90f3a8f285
Update source/funkin/ui/story/StoryMenuState.hx
...
Co-authored-by: gamerbross <55158797+gamerbross@users.noreply.github.com>
2024-06-29 01:15:48 -04:00
Pixel
55d02d49c2
Update StoryMenuState.hx
2024-06-29 01:15:47 -04:00
gamerbross
7e6ef61169
Fix Stack Overflow if song doesn't have "normal" difficulty
2024-06-29 00:35:01 -04:00
gamerbross
32deb8d190
Fix crash after pressing F5 and coming back from stickers
2024-06-29 00:29:23 -04:00
EliteMasterEric
fbfd8259a6
Merge branch 'applehair/ranks-for-custom-variations' into feature/playable-pico-mode
2024-06-27 04:06:10 -04:00
NotHyper-474
6f26fbba5f
Fix trace
2024-06-26 20:57:01 -04:00
cyn
dad8b0815d
flash fix
2024-06-26 20:36:53 -04:00
Cameron Taylor
ab2f949d7e
fix for heart icons being on the wrong frames
2024-06-25 13:56:31 -04:00
Cameron Taylor
5751430261
fix the camera not panning when opening then closing the debug menu during transition
2024-06-25 13:56:31 -04:00
EliteMasterEric
4e65c49e0e
Get rid of a warning about missing BPM info
2024-06-24 14:40:55 -04:00
EliteMasterEric
9b3a748f37
Working Pico DJ
2024-06-20 16:17:53 -04:00
EliteMasterEric
263039f52c
Make Boyfriend DJ animations data driven
2024-06-18 20:07:27 -04:00
EliteMasterEric
60e741434c
Implemented playable character registry, added Freeplay character filtering, added alt instrumental support
2024-06-18 17:56:24 -04:00
EliteMasterEric
6f2f2a9aa4
Merge branch 'applehair/preview-inst-suffix' into feature/playable-pico-mode
2024-06-18 15:40:51 -04:00
AppleHair
1f1fe62a06
[BUGFIX] Fixed Ranks not appearing in freeplay for custom variations
...
Freeplay tries to access a song's rank using the current difficulty name alone, but custom variation ranks are being saved with a variation prefix. This PR makes freeplay look for the variation prefix when necessary.
2024-06-14 16:53:33 +03:00
AppleHair
c4d6e18885
now using getVariationsByCharId instead
2024-06-12 11:23:45 +03:00
Cameron Taylor
47d5c4d141
Merge pull request #619 from FunkinCrew/freeplay-dad-smoother
...
freeplay bg nicer AA and proper sizing
2024-06-11 16:16:13 -04:00
Cameron Taylor
c05f053fe3
Merge branch 'rewrite/master' into bugfix/instrumental-id
2024-06-11 16:12:39 -04:00
Cameron Taylor
1e3ef61fc9
freeplay bg nicer AA and proper sizing
2024-06-11 15:57:45 -04:00
Cameron Taylor
817c216d06
Merge pull request #617 from FunkinCrew/bugfix/save-highest-rank
...
[FUNK-387] Save high scores and high ranks separately.
2024-06-11 12:04:38 -04:00
Cameron Taylor
381e0104e9
Merge pull request #616 from FunkinCrew/feature/freeplay-keybinds
...
[FUNK-391] Rebindable controls for the Freeplay menu
2024-06-11 11:49:24 -04:00
EliteMasterEric
b30faad7d9
Save high scores and high ranks separately.
2024-06-11 00:40:43 -04:00
Cameron Taylor
00021523bc
lower volume on freeplay easter egg
2024-06-10 17:35:49 -04:00
Ikko Eltociear Ashimine
e8f8a0c181
chore: update MenuList.hx
...
lenth -> length
2024-06-10 16:45:22 -04:00
Cameron Taylor
f31ea8fb73
add sound for changing sorting
2024-06-10 16:13:32 -04:00
gamerbross
8f44d9606d
Remove unnecessary scrollMenu sounds + adjust volume
2024-06-10 13:17:38 -04:00
AppleHair
9fa603363c
[BUGFIX] Made freeplay use the metadata to get the instrumental suffix
...
Song previews in freeplay will now use the instrumental suffix from the current difficulty's corresponding song variation metadata instead of using the variation id as an instrumental suffix and checking only the "erect" variation.
2024-06-10 19:42:27 +03:00
Cameron Taylor
4691e3d249
Merge branch 'bugfix/chart-editor-event-toolbox-crash' into rewrite/master
2024-06-10 12:26:47 -04:00
Cameron Taylor
b7d25bf04f
Merge branch 'escape-quit' into rewrite/master
2024-06-10 12:04:30 -04:00
Cameron Taylor
5dcd3eb946
Merge branch 'heart-capsule-pos' into rewrite/master
2024-06-10 12:04:09 -04:00
Cameron Taylor
55edb9ea14
pressing escape on title screen exits game
2024-06-09 15:38:22 -04:00
Cameron Taylor
d974f12c72
Merge branch 'develop' into rewrite/master
2024-06-09 15:30:14 -04:00
Cameron Taylor
f2d5a80bd1
completes funk-305
2024-06-09 15:06:45 -04:00
EliteMasterEric
09aa8fbf52
Rebindable controls for the Freeplay menu
2024-06-09 02:22:03 -04:00
Eric
4169116129
Merge branch 'develop' into abstract-optionname
2024-06-07 21:44:28 -04:00
gamerbross
1172949a04
Fix Options Menu not enabled in transIn
2024-06-07 21:31:53 -04:00
EliteMasterEric
2e4b94d528
Fix additional merge conflicts
2024-06-07 21:20:04 -04:00
EliteMasterEric
4382b3e16e
Merge branch 'develop' into richtrash21/freeplay-camera-optimization
2024-06-07 21:13:13 -04:00
EliteMasterEric
d39f3dc1e8
Merge branch 'main' into develop
2024-06-07 19:54:30 -04:00
Cameron Taylor
1d6315fe0e
Merge pull request #610 from FunkinCrew/2hot-freeplay
...
regexp for numbers
2024-06-07 14:33:56 -04:00
Cameron Taylor
34c91dae76
dadbattle hard/erect fix
2024-06-07 14:24:57 -04:00
Cameron Taylor
a0adbc72b3
regexp for numbers
2024-06-07 13:04:45 -04:00
Cameron Taylor
6fd030cb30
Merge branch 'patch-1' into rewrite/master
2024-06-07 11:38:57 -04:00
EliteMasterEric
ca345e6c4f
Play song IDs based on the chart file's "instrumental" field, not the variation ID.
2024-06-06 21:38:00 -04:00
Cameron Taylor
e45e359de7
Merge branch 'mainmenu-remember-selection' into rewrite/master
2024-06-06 20:15:11 -04:00
Cameron Taylor
73c7bcf609
Merge branch 'rewrite/master' into burgerballs/scroll-speed-event
2024-06-06 19:49:47 -04:00
EliteMasterEric
70f027cc3f
Fix another crash with the chart editor event toolbox
2024-06-06 16:44:47 -04:00
EliteMasterEric
a81b6b2d6e
Fix issue with rendering the grid in 3/4 time signature
2024-06-06 16:44:20 -04:00
FabsTheFabs
642f272bce
freeplay polish + new text
2024-06-06 01:49:33 +01:00
EliteMasterEric
6fb19dc4d3
Update chart editor dropdowns to be searchable
2024-06-05 20:09:26 -04:00
EliteMasterEric
6d133f007d
Fix a bug where the event data toolbox wouldn't rebuild, and it would crash.
2024-06-05 19:25:53 -04:00
Cameron Taylor
bc783a278a
rank clipping fix
2024-06-05 18:21:57 -04:00
Cameron Taylor
4311dd2074
hopefully dadbattle fix lol
2024-06-05 17:58:22 -04:00
Cameron Taylor
6334d16984
Merge branch 'ninjamuffin99/funk-250' into rewrite/master
2024-06-05 17:11:22 -04:00
Cameron Taylor
c1bfc67f52
remove effin trace
2024-06-05 15:43:25 -04:00
Cameron Taylor
5bcc0f9b25
partial sound loading should be more resiliant
2024-06-05 15:02:29 -04:00
Cameron Taylor
88248233b0
Merge pull request #599 from FunkinCrew/bugfix/results-percent-display
...
Fix some display issues with the clear percent in the results screen.
2024-06-05 01:48:43 -04:00
EliteMasterEric
640c1cf236
Dave say 1 minute to make Dad sneak up and 2 minutes to play the cartoons
2024-06-05 00:49:59 -04:00
Cameron Taylor
50990b15e1
heart glow
2024-06-04 23:36:32 -04:00
Cameron Taylor
cb773ed137
Merge branch 'ninjamuffin99/funk-269' into rewrite/master
2024-06-04 22:00:49 -04:00
Cameron Taylor
a643765db4
Merge branch 'ninjamuffin99/funk-270' into rewrite/master
2024-06-04 22:00:30 -04:00
Cameron Taylor
6a62f38c33
quicki fix for incorrect clip tweens
2024-06-04 16:51:27 -04:00
Cameron Taylor
84d4d044d6
check clip width when text changes
2024-06-04 16:47:58 -04:00
Cameron Taylor
29a33c8815
modifies behaviour of how the difficulty stars appear
2024-06-04 16:38:21 -04:00
