Commit graph

4289 commits

Author SHA1 Message Date
Cameron Taylor
d595767e59 small compiling guide 2024-02-10 13:06:27 -05:00
EliteMasterEric
d0b3842d44 Merge branch 'feature/freeplay-pico-character' into rewrite/weekend-1-gameplay-shaderdev 2024-02-10 02:38:23 -05:00
Cameron Taylor
2d5b67d880 Merge pull request #309 from FunkinCrew/feature/chart-editor-freeplay-difficulty
Implement difficulty rank into Metadata toolbox.
2024-02-10 02:32:37 -05:00
Cameron Taylor
66188fbd52 Merge branch 'rewrite/master' into feature/chart-editor-freeplay-difficulty 2024-02-10 02:32:23 -05:00
Cameron Taylor
31ef89e9e0 assets submod 2024-02-10 02:31:32 -05:00
EliteMasterEric
eea8dde455 Merge branch 'rewrite/master' into rewrite/weekend-1-gameplay-shaderdev 2024-02-10 02:30:50 -05:00
Cameron Taylor
072cd2daf2 Merge pull request #307 from FunkinCrew/feature/dialogue-data-refactor
Refactor dialogue data parsing
2024-02-10 02:25:39 -05:00
Cameron Taylor
4bfab35b29 Merge branch 'rewrite/master' into feature/dialogue-data-refactor 2024-02-10 02:25:06 -05:00
Cameron Taylor
f12847dc59 assets submod 2024-02-10 02:23:58 -05:00
Cameron Taylor
ea76476ec2 Merge pull request #314 from FunkinCrew/bugfix/weekend-1-stuff
Fix darnell's animations being flipped
2024-02-10 02:18:10 -05:00
Cameron Taylor
2cc5d43896 Merge branch 'rewrite/master' into bugfix/weekend-1-stuff 2024-02-10 02:17:41 -05:00
Cameron Taylor
f3630dfff9 assets submod 2024-02-10 02:17:07 -05:00
EliteMasterEric
aaeea320e5 Fix darnell's animations being flipped 2024-02-10 00:51:53 -05:00
EliteMasterEric
bb0b176469 Fix bug with building specifically for freeplay. 2024-02-10 00:51:02 -05:00
EliteMasterEric
3ede16be16 Fix issue where Freeplay could be silent sometimes 2024-02-10 00:50:07 -05:00
Cameron Taylor
f845e20da5 assets submod 2024-02-10 00:11:22 -05:00
Eric
aec42f783f Merge pull request #312 from FunkinCrew/weekend1/pico-retry-pos
pico death retry position consistency fix
2024-02-10 00:06:54 -05:00
EliteMasterEric
40603eaa06 Merge remote-tracking branch 'origin/rewrite/master' into weekend1/pico-retry-pos 2024-02-09 23:52:05 -05:00
EliteMasterEric
6f125a97b1 Fix idle animations for Pico. 2024-02-09 23:44:35 -05:00
Cameron Taylor
6b8c0637e3 pico death retry position fix 2024-02-09 23:36:01 -05:00
EliteMasterEric
b5803d867a Merge remote-tracking branch 'origin/rewrite/master' into bugfix/weekend-1-fixes 2024-02-09 23:27:17 -05:00
Eric
22c589764c Merge pull request #311 from FunkinCrew/wekend1/ez-fixies
weekend 1 camera zoom
2024-02-09 23:14:22 -05:00
EliteMasterEric
091f8eb724 Merge branch 'rewrite/master' into feature/freeplay-pico-character 2024-02-09 23:13:40 -05:00
Cameron Taylor
a50f27fe96 weekend 1 camera zoom 2024-02-09 23:03:09 -05:00
Cameron Taylor
f321c91078 Merge pull request #310 from FunkinCrew/feature/chart-editor-freeplay-preview
Chart Editor: Freeplay Preview Toolbox
2024-02-09 15:40:42 -05:00
EliteMasterEric
4bf9f68658 Finalize freeplay preview toolbox 2024-02-09 14:58:57 -05:00
Cameron Taylor
cd28f81c8c hmm commit update 2024-02-09 01:31:34 -05:00
EliteMasterEric
4491465bf9 Implement difficulty rank into Metadata toolbox. 2024-02-08 19:22:28 -05:00
EliteMasterEric
2dd5f476b5 Fix a bug where alt instrumentals will load but not cache. 2024-02-08 02:21:12 -05:00
EliteMasterEric
fa2aebdc52 Use the correct assets submodule commit. 2024-02-07 19:37:19 -05:00
EliteMasterEric
2d4ca436ec Update Polymod to drastically improve efficiency of openfl.utils.Assets.list() 2024-02-07 18:46:09 -05:00
EliteMasterEric
31cd5b3414 Rework Conversation data parsing 2024-02-07 18:45:13 -05:00
EliteMasterEric
fa556dc1f2 Rewrite conversation JSON parsing code. 2024-02-07 09:21:44 -05:00
EliteMasterEric
82b63c02e1 Reworks to make Pico mode actually work. 2024-02-05 21:35:58 -05:00
EliteMasterEric
e5fb1de4ba Fix a boatload of deprecation warnings and upgrade a few libraries. 2024-02-05 19:46:11 -05:00
EliteMasterEric
167976c8ba Work in progress 2024-02-05 13:35:30 -05:00
Cameron Taylor
401c200070 Merge pull request #304 from FunkinCrew/feature/chart-editor-offset-toolbox
Chart Editor: Offsets Toolbox
2024-02-05 13:21:26 -05:00
Cameron Taylor
984c26c0e5 Merge branch 'rewrite/master' into feature/chart-editor-offset-toolbox 2024-02-05 13:06:25 -05:00
Cameron Taylor
bfd11ae097 Merge pull request #303 from FunkinCrew/bugfix/copy-prompt-fixes
Copy command fixes
2024-02-05 13:05:22 -05:00
Cameron Taylor
201e109d64 Merge branch 'rewrite/master' into bugfix/copy-prompt-fixes 2024-02-05 13:03:32 -05:00
Cameron Taylor
6e2786ef52 Merge pull request #302 from FunkinCrew/feature/units
Added units field to event properties
2024-02-05 13:03:01 -05:00
Cameron Taylor
30cb53d8c2 haxeui-core update 2024-02-05 13:02:23 -05:00
Cameron Taylor
cc8b2b2d20 Merge branch 'rewrite/master' into feature/units 2024-02-05 11:55:52 -05:00
EliteMasterEric
8be9c4f8ed Fix web builds. 2024-02-02 23:26:02 -05:00
Eric
334d267ffc Merge pull request #306 from FunkinCrew/bugfix/metadata-crashfix
Metadata toolbox crash fix
2024-02-02 23:20:30 -05:00
EliteMasterEric
de1ddcbf4d Merge branch 'rewrite/master' into feature/chart-editor-gamepad-support 2024-02-02 23:15:48 -05:00
EliteMasterEric
8e2c30720d Merge remote-tracking branch 'origin/rewrite/master' into bugfix/copy-prompt-fixes 2024-02-02 22:51:44 -05:00
Eric
4d6ee03947 Merge branch 'rewrite/master' into ansi-trace 2024-02-02 22:39:06 -05:00
EliteMasterEric
387ff4e816 Replace multiple conditions with array. 2024-02-02 22:38:34 -05:00
EliteMasterEric
65280c144c Merge branch 'feature/chart-editor-offset-toolbox' of https://github.com/FunkinCrew/Funkin-secret into feature/chart-editor-offset-toolbox 2024-02-02 22:28:47 -05:00