EliteMasterEric
a9d8fb8dfb
Updated HaxeUI for good measure
2023-07-06 12:33:50 -04:00
EliteMasterEric
a3929db7a8
Merge branch 'master' into feature/offset-editor-tweaks
2023-07-06 01:00:32 -04:00
Cameron Taylor
6a3c32bfa6
Merge pull request #111 from FunkinCrew/feature/week-6-dialogue
...
Week 6 dialogue
2023-07-05 22:11:03 -04:00
EliteMasterEric
f932422d74
Merge branch 'master' into feature/week-6-dialogue
2023-07-03 13:18:53 -04:00
EliteMasterEric
39cd304ef2
Expanded shortcut list, fixed build errors
2023-07-03 12:51:27 -04:00
EliteMasterEric
90bd5af376
Merge branch 'master' into feature/offset-editor-tweaks
2023-07-03 12:22:33 -04:00
Cameron Taylor
2ce3228bd5
Merge pull request #109 from FunkinCrew/feature/week-7-cutscenes
...
Week 7 Cutscenes
2023-06-28 21:15:23 -04:00
Cameron Taylor
740c547293
Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret into feature/week-7-cutscenes
2023-06-27 17:07:35 -04:00
Cameron Taylor
ed728e460b
hxcodec branch fix
2023-06-27 14:52:09 -04:00
Eric
a4a4e705a1
Merge pull request #105 from FunkinCrew/feature/modded-story
...
Mods in story menu
2023-06-27 13:26:44 -04:00
Cameron Taylor
6bf6cbbccc
Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret into feature/modded-story
2023-06-27 13:11:20 -04:00
Cameron Taylor
d1333b9b24
new hxcodec stuff
2023-06-27 12:45:41 -04:00
Cameron Taylor
6bce92e54a
Merge pull request #110 from FunkinCrew/actions-cache-fix
...
.haxelib caching
2023-06-17 16:27:33 -04:00
EliteMasterEric
28ddadffff
Week 6 dialogue support + bug fixes
2023-06-16 17:37:56 -04:00
Cameron Taylor
092dcb5a35
counter fix thing
2023-06-15 14:31:49 -04:00
Cameron Taylor
0b42b6e305
moved caching so html5 can also cache haxelibs
2023-06-15 14:12:39 -04:00
Cameron Taylor
a7aafa9e3e
.haxelib caching
2023-06-15 14:09:19 -04:00
Cameron Taylor
dff48c3013
Merge pull request #101 from FunkinCrew/death-alt
...
Death alt
2023-06-15 13:19:21 -04:00
EliteMasterEric
9a541c5769
Merge branch 'death-alt' of https://github.com/FunkinCrew/Funkin-secret into death-alt
2023-06-15 03:49:24 -04:00
EliteMasterEric
02632a623c
Disable fakeout happening 100% of the time.
2023-06-15 03:48:52 -04:00
Cameron Taylor
aabf36a788
Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into death-alt
2023-06-15 03:27:03 -04:00
EliteMasterEric
594cec62ad
Results screen now moves to Story menu if we are in story mode
2023-06-15 00:30:20 -04:00
EliteMasterEric
7a47221250
Fixes for FlxVideo
2023-06-15 00:30:01 -04:00
EliteMasterEric
dddd050268
Move debug menu to main menu only
2023-06-15 00:29:54 -04:00
EliteMasterEric
3d8dd8d604
More conductor rework changes
2023-06-15 00:29:40 -04:00
EliteMasterEric
3c558ce192
Pixel fixes
2023-06-15 00:29:18 -04:00
EliteMasterEric
5729eb0413
Fix reloading song events
2023-06-15 00:28:52 -04:00
EliteMasterEric
1191fff913
Additional controls (volume, cutscene skip)
2023-06-15 00:28:40 -04:00
EliteMasterEric
506e4bf680
Propagate Conductor rework to dependent classes.
2023-06-15 00:15:57 -04:00
EliteMasterEric
f6c38f9bdd
Refactor conductor (crochet->lengthMs)
2023-06-15 00:13:18 -04:00
EliteMasterEric
6ac4db48d9
Rename combo milestone
2023-06-15 00:12:35 -04:00
EliteMasterEric
b783271451
ComboCounter->ComboMilestone
2023-06-15 00:11:20 -04:00
Cameron Taylor
c969a53396
Merge pull request #102 from FunkinCrew/bugfix/character-data
...
Play State refactor and character data fixes
2023-06-13 19:39:46 -04:00
EliteMasterEric
338342ad5e
Tweaks and improvements to the animation editor
2023-06-13 17:13:14 -04:00
Cameron Taylor
a42daecdc1
Delete ScriptedMusicBeatSubstate.hx
2023-06-13 01:31:41 -04:00
Cameron Taylor
29e563b11f
Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into bugfix/character-data
2023-06-13 01:21:19 -04:00
Cameron Taylor
b564ad087b
vocals fix... lol!
2023-06-13 01:04:29 -04:00
Hazel
c17d48f39e
fix ci builds ( #106 ) (common ravy W)
...
* maybe fix html5 builds?
* sudo apt -y
i need to use debian based distros more dont i
* also needs randr extensions
* fuck it lets install all the x extensions and hope this is enough
* libmesa is now libgl1-mesa
* also needs alsa lib for sound
man i love undocumented dependencies
2023-06-12 11:20:51 -04:00
EliteMasterEric
6f676a5896
Added new "Mods" story menu section (hidden when no mods are installed)
2023-06-10 02:56:03 -04:00
EliteMasterEric
109676522a
Rewrite freeplay state to use correct week IDs.
2023-06-09 18:25:21 -04:00
EliteMasterEric
4dcdca51ae
Fix camera issue with stickers
2023-06-09 16:54:13 -04:00
Cameron Taylor
4daf644284
ree
2023-06-09 16:03:45 -04:00
Cameron Taylor
b95dc5604d
Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret
2023-06-09 16:03:36 -04:00
Cameron Taylor
4fae8bcad2
file renames...
2023-06-09 16:02:57 -04:00
Cameron Taylor
aa5a5c5cc1
Merge pull request #104 from FunkinCrew/recapitalizing
...
the SubState...
2023-06-09 15:54:50 -04:00
EliteMasterEric
ba20e5c39c
Merge remote-tracking branch 'origin/recapitalizing' into bugfix/character-data
2023-06-09 15:46:40 -04:00
Cameron Taylor
a7eb91ce29
the SubState...
2023-06-09 15:44:29 -04:00
EliteMasterEric
2d04b1c5f1
Merge branch 'master' into bugfix/character-data
2023-06-09 15:34:56 -04:00
Cameron Taylor
6c65a9ea78
Merge pull request #103 from FunkinCrew/bugfix/formatting-cleanup
...
Formatting cleanup (whitespace only)
2023-06-09 14:22:31 -04:00
Cameron Taylor
27a9ef211e
Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into bugfix/formatting-cleanup
2023-06-09 14:12:37 -04:00