Cameron Taylor
|
4af4c2defc
|
Merge branch 'lemz1/fps-setting' into rewrite/master
|
2024-09-19 23:56:04 -04:00 |
|
Cameron Taylor
|
69bcd0834e
|
Merge branch 'rewrite/master' into techniktil/chart-editor-icons
|
2024-09-19 23:31:26 -04:00 |
|
Cameron Taylor
|
29e89c8acb
|
Merge branch 'rewrite/master' into actualmandm/char-select-crash
|
2024-09-19 22:50:18 -04:00 |
|
Cameron Taylor
|
0b908b3cab
|
Merge branch 'rewrite/master' into abnormalpoof/opening-urls
|
2024-09-19 22:31:12 -04:00 |
|
Cameron Taylor
|
50de041251
|
Merge branch 'public-release/develop' into rewrite/master
|
2024-09-19 22:11:05 -04:00 |
|
EliteMasterEric
|
3cbba8ba29
|
Resolve merge issues.
|
2024-09-19 17:16:31 -04:00 |
|
Eric
|
d81e09b1c3
|
Merge branch 'rewrite/master' into abnormalpoof/opening-urls
|
2024-09-19 03:46:46 -04:00 |
|
Cameron Taylor
|
3c30575727
|
Merge branch 'kadedev/chart-editor-fixes' into rewrite/master
|
2024-09-18 15:23:07 -04:00 |
|
Cameron Taylor
|
f30c0cff49
|
Merge branch 'feature/gold-perfect-anim-for-modders' into rewrite/master
|
2024-09-18 15:20:38 -04:00 |
|
Cameron Taylor
|
35005df32a
|
Merge branch 'feature/pico-character-script' into rewrite/master
|
2024-09-18 15:17:37 -04:00 |
|
EliteMasterEric
|
a469385cdb
|
Resolve merge issues
|
2024-09-18 06:22:02 -04:00 |
|
EliteMasterEric
|
b28af79eb3
|
Fix build issues
|
2024-09-18 05:18:16 -04:00 |
|
Eric
|
5f563f0555
|
Merge branch 'develop' into chart-editor-icon-fix
|
2024-09-18 05:10:30 -04:00 |
|
EliteMasterEric
|
7b7d5deed5
|
Tweaks to framerate preference
|
2024-09-18 03:13:21 -04:00 |
|
EliteMasterEric
|
19e6029fb2
|
Fix some compilation errors
|
2024-09-18 03:13:10 -04:00 |
|
Michael
|
f2b3f47e73
|
Disable input in CharSelect until stayFunky plays
|
2024-09-17 15:57:50 -07:00 |
|
AbnormalPoof
|
aae7dcdada
|
fix crash when opening urls
|
2024-09-16 23:35:23 -05:00 |
|
Eric
|
6efdbde8da
|
Merge branch 'develop' into fps-setting
|
2024-09-16 22:09:54 -04:00 |
|
Til Tjardes
|
b7c3f5ac9f
|
Chart Editor Icons are fixed now!
|
2024-09-16 20:04:04 -06:00 |
|
EliteMasterEric
|
811caf6b70
|
Suppress a spammy log trace
|
2024-09-16 21:54:33 -04:00 |
|
EliteMasterEric
|
2e9223ec72
|
Merge remote-tracking branch 'origin/develop' into anysad/custom-popups-countdowns
|
2024-09-16 20:50:13 -04:00 |
|
Kade
|
9624b57e44
|
This does fix it now
|
2024-09-16 17:23:49 -07:00 |
|
Kade
|
7d2b946e9c
|
depreciated screen X/Y to view X/Y
|
2024-09-16 17:13:14 -07:00 |
|
Kade
|
5a877a14a0
|
only show last two digits
digit
|
2024-09-16 17:13:13 -07:00 |
|
Kade
|
535ac0e528
|
add milliseconds to the playbar in charting state
remove laggy redundant traces
Revert "remove laggy redundant traces"
This reverts commit 204113840473dd5069f5d508d50e15e21104b45a.
|
2024-09-16 17:13:13 -07:00 |
|
Eric
|
f38a95bbf7
|
Merge branch 'develop' into fps-setting
|
2024-09-16 18:59:55 -04:00 |
|
Eric
|
8cad10263e
|
Merge branch 'develop' into bugfix/animation-editor
|
2024-09-16 18:37:35 -04:00 |
|
lemz
|
224d930ae6
|
Update PreferencesMenu.hx
|
2024-09-17 00:17:56 +02:00 |
|
lemz
|
e7674ec31c
|
Merge branch 'develop' into fps-setting
|
2024-09-17 00:13:49 +02:00 |
|
EliteMasterEric
|
16aff6e7c3
|
Fix bugs with highscore display in Freeplay
|
2024-09-14 21:37:02 -04:00 |
|
EliteMasterEric
|
9f3af1ab94
|
Add a separate Gold Perfect animation for modders
|
2024-09-14 20:56:21 -04:00 |
|
EliteMasterEric
|
fd6ca6e267
|
Remove some spammy log traces.
|
2024-09-14 20:26:33 -04:00 |
|
EliteMasterEric
|
d5c7e4ffdb
|
Fix bug where Pico would become locked on every game restart.
|
2024-09-14 20:26:19 -04:00 |
|
EliteMasterEric
|
d59594ee45
|
Fix animations not looping on Char Select
|
2024-09-12 22:02:05 -04:00 |
|
Cameron Taylor
|
47f3c6f00a
|
vid sizing
|
2024-09-12 19:56:04 -04:00 |
|
Cameron Taylor
|
d826f2a7bc
|
Merge branch 'rewrite/master' into char-unlock-tinkers
|
2024-09-12 19:55:35 -04:00 |
|
Cameron Taylor
|
3103768d91
|
Merge pull request #747 from FunkinCrew/charselect-fade-fix
Fix transition out of character select
|
2024-09-12 19:14:34 -04:00 |
|
Cameron Taylor
|
10dfc96cf4
|
Merge branch 'freeplay-charselect-hint' into rewrite/master
|
2024-09-12 19:11:42 -04:00 |
|
CheemsAndFriends
|
1e9c6f0c4c
|
Add Char Select stuff
|
2024-09-13 00:31:52 +02:00 |
|
FabsTheFabs
|
bc86f1f459
|
character select hint text
|
2024-09-12 22:44:40 +01:00 |
|
FabsTheFabs
|
703e899288
|
apply shader filter
|
2024-09-12 22:43:12 +01:00 |
|
CheemsAndFriends
|
34d1c568ea
|
locked fixin
|
2024-09-12 23:22:20 +02:00 |
|
CheemsAndFriends
|
6dca858fd7
|
Introbizz
|
2024-09-12 23:13:30 +02:00 |
|
CheemsAndFriends
|
395de4ee95
|
Char select subs stuff
|
2024-09-12 22:53:01 +02:00 |
|
Cameron Taylor
|
89f4703977
|
Merge branch 'framerate-pref' into rewrite/master
|
2024-09-12 16:47:13 -04:00 |
|
Cameron Taylor
|
721cecd271
|
add preference option for framerate capping
|
2024-09-12 15:38:44 -04:00 |
|
EliteMasterEric
|
e5673549cf
|
Fix issues with the difficulty selector showing non-existant difficulties in Freeplay
|
2024-09-12 15:38:20 -04:00 |
|
EliteMasterEric
|
386dc22d7b
|
Debug hotkey properly resets char select cutscene
|
2024-09-12 15:34:16 -04:00 |
|
Cameron Taylor
|
3de7047d22
|
Merge branch 'master-bugs' into rewrite/master
|
2024-09-12 14:34:21 -04:00 |
|
CheemsAndFriends
|
3553d008cf
|
tinkering shit
|
2024-09-12 01:37:32 +02:00 |
|