Commit graph

3356 commits

Author SHA1 Message Date
Cameron Taylor
c299aa00b9 Merge pull request #324 from FunkinCrew/bugfix/darnell-fix
Darnell voices fix
2024-02-14 00:23:57 -05:00
EliteMasterEric
2b5922635b Darnell voices fix 2024-02-13 21:56:33 -05:00
EliteMasterEric
5b20e00a7b Upgrade Polymod to no longer spam popups when the same function fails repeatedly. 2024-02-13 21:43:54 -05:00
Cameron Taylor
b96232787a hide storymode menu characters if they dont exist for the level 2024-02-13 05:23:59 -05:00
Cameron Taylor
c3d03011cc Merge branch 'rewrite/master' into input-offsets 2024-02-13 03:34:41 -05:00
Cameron Taylor
cf01f8c0f3 Merge pull request #279 from FunkinCrew/feature/hashlink-hot-reload
Allow builds without hxCodec if using hashlink
2024-02-13 03:32:46 -05:00
Cameron Taylor
923f8f423e swag truthers we are BACK 2024-02-13 03:32:20 -05:00
EliteMasterEric
2dbc0cda6e Fix a missing import. 2024-02-13 03:18:51 -05:00
EliteMasterEric
c901763ad8 Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-gamepad-support 2024-02-13 03:12:57 -05:00
EliteMasterEric
bd4103fd11 Merge remote-tracking branch 'origin/rewrite/master' into feature/hashlink-hot-reload 2024-02-13 03:06:20 -05:00
EliteMasterEric
e37fc09e89 Hashlink actually working! 2024-02-13 03:03:11 -05:00
Cameron Taylor
6b80e292e5 Merge branch 'rewrite/master' into input-offsets 2024-02-13 03:02:33 -05:00
Cameron Taylor
1c91eac47e Merge pull request #257 from FunkinCrew/rewrite/weekend-1-gameplay-shaderdev
Rewrite/weekend 1 gameplay shaderdev
2024-02-13 02:41:18 -05:00
Cameron Taylor
36da3c136b Merge branch 'rewrite/master' into rewrite/weekend-1-gameplay-shaderdev 2024-02-13 02:41:02 -05:00
EliteMasterEric
fa4b896d9a Merge branch 'rewrite/master' into feature/hashlink-hot-reload 2024-02-13 02:23:14 -05:00
EliteMasterEric
c4522fe177 Merge branch 'rewrite/master' into rewrite/weekend-1-gameplay-shaderdev 2024-02-13 02:17:06 -05:00
Eric
1aea96fecf Merge pull request #315 from FunkinCrew/docs/compiling.md
small compiling guide
2024-02-13 02:16:32 -05:00
Eric
b2e489582b Merge branch 'rewrite/master' into docs/compiling.md 2024-02-13 02:16:16 -05:00
EliteMasterEric
f7da12acbc Apparently the transition bug was TransitionableSubState's fault so kill it with fire. 2024-02-13 02:09:25 -05:00
EliteMasterEric
f0b5ef4491 Rest in peace, SwagCamera. 2024-02-13 01:38:11 -05:00
Cameron Taylor
48bf486cdb Merge pull request #313 from FunkinCrew/bugfix/weekend-1-fixes
Fixes for Pico animations in Weekend 1
2024-02-13 01:33:42 -05:00
Cameron Taylor
5c2504da2a Merge branch 'rewrite/master' into bugfix/weekend-1-fixes 2024-02-13 01:33:31 -05:00
Cameron Taylor
30af25c8fc Merge pull request #318 from FunkinCrew/pico-retry-blood
pico death animation loop fix
2024-02-13 01:33:03 -05:00
Cameron Taylor
c84ed63c99 Merge branch 'rewrite/master' into pico-retry-blood 2024-02-13 01:32:51 -05:00
Eric
0979bf5ab5 Merge pull request #321 from FunkinCrew/darnell-voice-separate
chart editor waveform fixes for single vocal audio files
2024-02-13 01:32:12 -05:00
Eric
0063e673bc Merge pull request #319 from FunkinCrew/prebuild
makes prebuild.hx actually run on prebuild
2024-02-13 01:31:34 -05:00
Eric
f9eac4ebdb Merge branch 'rewrite/master' into pico-retry-blood 2024-02-13 01:28:27 -05:00
Cameron Taylor
deecd7ebb8 Merge branch 'rewrite/master' into prebuild 2024-02-13 01:19:28 -05:00
Cameron Taylor
e362331174 assets submod update 2024-02-13 01:19:00 -05:00
Cameron Taylor
681cfa0883 chart editor waveform fixes for single vocal audio files 2024-02-13 01:16:09 -05:00
Cameron Taylor
68f30f195b Merge branch 'rewrite/master' into bugfix/weekend-1-fixes 2024-02-13 00:51:26 -05:00
Cameron Taylor
5ee6bb39a1 Merge pull request #308 from FunkinCrew/feature/freeplay-pico-character
Play as Pico in Freeplay
2024-02-13 00:49:04 -05:00
Cameron Taylor
41e94f951e Merge branch 'rewrite/master' of https://github.com/funkincrew/funkin-secret into feature/freeplay-pico-character 2024-02-13 00:48:26 -05:00
Cameron Taylor
1ad17aa904 flixel hmm update 2024-02-13 00:45:29 -05:00
Cameron Taylor
8c54a62ed6 Merge branch 'rewrite/master' into feature/freeplay-pico-character 2024-02-13 00:41:03 -05:00
Eric
eabdc921d3 Merge pull request #320 from FunkinCrew/enable-debug-keys
debugger fixes
2024-02-13 00:31:54 -05:00
Cameron Taylor
6e0f577d54 debugger fixes 2024-02-13 00:29:46 -05:00
Cameron Taylor
1d8e82b108 makes prebuild.hx actually run on prebuild 2024-02-13 00:18:47 -05:00
Cameron Taylor
5f5b2bb80b pico death animation loop fix 2024-02-13 00:00:27 -05:00
EliteMasterEric
0ff258ce75 Use stickers to transition from the Results state 2024-02-12 23:34:51 -05:00
EliteMasterEric
1b5b7f0ae2 Fix a bug where stickers were broken on story mode 2024-02-12 23:34:40 -05:00
Eric
57ac960850 Merge pull request #317 from FunkinCrew/flxdebugger-enabled
flixel debugging on test builds
2024-02-12 23:23:50 -05:00
EliteMasterEric
0494ddb506 Fix crash in chart editor minimal Playtest 2024-02-12 23:19:25 -05:00
Cameron Taylor
92f52b2c3f flixel debugging on test builds 2024-02-12 23:15:18 -05:00
Cameron Taylor
58077b4505 more working audio offset in progress 2024-02-12 22:44:59 -05:00
Cameron Taylor
e759f90147 audioVisualOffset numbers 2024-02-12 22:14:35 -05:00
Cameron Taylor
25766dbde9 decoupling some stuff from Conductor.instance 2024-02-12 21:41:16 -05:00
Cameron Taylor
43ec35f5fd derp .position -> .time fix 2024-02-12 21:00:40 -05:00
Cameron Taylor
6ac24141f4 Merge branch 'rewrite/master' into input-offsets 2024-02-12 20:57:42 -05:00
Cameron Taylor
9246a8bc86 Merge branch 'rewrite/master' into docs/compiling.md 2024-02-12 20:15:05 -05:00