EliteMasterEric
|
571c6d5960
|
Merge branch 'rewrite/master' into feature/credits
|
2024-03-28 20:29:15 -04:00 |
|
Eric
|
5fa559dfb1
|
Merge branch 'rewrite/master' into bugfix/buncha-2hot-fixes
|
2024-03-28 20:26:45 -04:00 |
|
Cameron Taylor
|
86c91d1e82
|
Merge pull request #436 from FunkinCrew/feature/touch-here-to-play
New Funkin' Preloader, and Touch Here To Play
|
2024-03-28 07:15:53 -04:00 |
|
EliteMasterEric
|
8a9eee3aa3
|
Rework Funkin Preloader and added "Touch to Play" graphic
|
2024-03-28 04:34:43 -04:00 |
|
EliteMasterEric
|
6ab6458e2a
|
Merge remote-tracking branch 'origin/rewrite/master' into feature/credits
|
2024-03-28 03:00:45 -04:00 |
|
EliteMasterEric
|
3d14024fd8
|
Implement merch link.
|
2024-03-28 02:58:08 -04:00 |
|
EliteMasterEric
|
3a86b47292
|
Fix issue where main menu music wouldn't play after credits.
|
2024-03-28 02:57:51 -04:00 |
|
EliteMasterEric
|
5311b043ac
|
Rework credits data structure.
|
2024-03-28 02:57:22 -04:00 |
|
EliteMasterEric
|
b13c6563df
|
Fix issues with Freeplay OST text and add animations.
|
2024-03-28 01:46:50 -04:00 |
|
EliteMasterEric
|
837fcee983
|
Fix a bug where 000 would display any time a Bad or Shit is hit (instead of just when a combo break is hit)
|
2024-03-28 00:19:57 -04:00 |
|
EliteMasterEric
|
c1c2621e1d
|
Fix bug where Bad and Shit didn't count at Notes Hit in the results screen.
|
2024-03-28 00:18:39 -04:00 |
|
EliteMasterEric
|
201e018f25
|
Merge remote-tracking branch 'origin/rewrite/master' into bugfix/buncha-2hot-fixes
|
2024-03-28 00:03:09 -04:00 |
|
EliteMasterEric
|
893822532e
|
Fix an issue causing the Kickstarter video to not play
|
2024-03-28 00:01:42 -04:00 |
|
EliteMasterEric
|
b771b46f1c
|
Fix a build issue.
|
2024-03-28 00:01:18 -04:00 |
|
EliteMasterEric
|
f267a72783
|
Merge remote-tracking branch 'origin/rewrite/master' into feature/new-audio
|
2024-03-27 23:00:34 -04:00 |
|
Cameron Taylor
|
53d62c3c12
|
Merge branch 'rewrite/master' into bugfix/pico-fixes
|
2024-03-27 22:14:44 -04:00 |
|
Cameron Taylor
|
96fe131544
|
Merge pull request #430 from FunkinCrew/feature/miss-judgement-debug
Add debug logging to Flixel debugger for miss judgements
|
2024-03-27 21:56:18 -04:00 |
|
Cameron Taylor
|
0f80f1c8a6
|
Merge pull request #417 from FunkinCrew/bugfix/freeplay-afk-fixes
Bugfix/freeplay afk fixes
|
2024-03-27 21:08:08 -04:00 |
|
Cameron Taylor
|
3181795985
|
remove trace() calls from ages ago while im here
|
2024-03-27 20:58:58 -04:00 |
|
EliteMasterEric
|
195f366b65
|
Fix an issue where the Random button would crash Freeplay.
|
2024-03-27 17:43:15 -04:00 |
|
EliteMasterEric
|
f1811a8594
|
Implement Pico pause music
|
2024-03-27 17:42:29 -04:00 |
|
EliteMasterEric
|
463e946b17
|
Merge remote-tracking branch 'origin/rewrite/master' into bugfix/buncha-2hot-fixes
|
2024-03-27 01:40:22 -04:00 |
|
EliteMasterEric
|
843095e3de
|
Add debug logging to Flixel debugger for miss judgements
|
2024-03-27 01:25:38 -04:00 |
|
Cameron Taylor
|
cccfdd0638
|
Merge branch 'rewrite/master' into feature/more-new-charts
|
2024-03-27 01:09:45 -04:00 |
|
EliteMasterEric
|
4209c5156e
|
Readd a missing sound in the story menu
|
2024-03-27 01:02:11 -04:00 |
|
EliteMasterEric
|
6b35898ed9
|
Fix some issues with Weekend 1.
|
2024-03-26 23:24:59 -04:00 |
|
EliteMasterEric
|
0e93f2ab27
|
Improve error logging when the game can't find a chart file.
|
2024-03-26 21:30:08 -04:00 |
|
EliteMasterEric
|
9ebb253b53
|
Fix music updating issue.
|
2024-03-26 19:38:56 -04:00 |
|
EliteMasterEric
|
e84fdf9fac
|
Resolve FlxG.sound.music crash
|
2024-03-26 19:38:42 -04:00 |
|
Eric
|
88c973f1ae
|
Merge branch 'rewrite/master' into bugfix/freeplay-afk-fixes
|
2024-03-26 19:35:10 -04:00 |
|
EliteMasterEric
|
1e888658f7
|
First implementation of credits state.
|
2024-03-26 12:33:54 -04:00 |
|
Cameron Taylor
|
524ae119fa
|
Merge branch 'rewrite/master' into bugfix/blazin-crashes
|
2024-03-26 01:30:59 -04:00 |
|
EliteMasterEric
|
8943cd117e
|
Make the error message a bit better if an Animate atlas fails to parse.
|
2024-03-26 01:12:46 -04:00 |
|
EliteMasterEric
|
5ae075e947
|
Fix a couple Flixel warnings on the results screen.
|
2024-03-25 21:09:14 -04:00 |
|
EliteMasterEric
|
90f861628d
|
Fix an HTML5 build issue.
|
2024-03-25 21:09:02 -04:00 |
|
EliteMasterEric
|
07ad250060
|
Fix an audio crash when exiting a cutscene
|
2024-03-25 21:08:39 -04:00 |
|
Cameron Taylor
|
ccfb9ca65b
|
Merge branch 'rewrite/master' into feature/high-erect
|
2024-03-25 16:02:09 -04:00 |
|
Cameron Taylor
|
fe6cb8c5a9
|
Merge pull request #413 from FunkinCrew/bugfix/funkin-sound-overhaul
Funkin Sound overhaul
|
2024-03-25 15:59:02 -04:00 |
|
Cameron Taylor
|
6a0672684c
|
Merge pull request #416 from FunkinCrew/bugfix/camera-zoom-option
Fix a bug where the Camera Zoom toggle didn't work.
|
2024-03-25 14:52:24 -04:00 |
|
Cameron Taylor
|
9fd780e00c
|
Merge branch 'rewrite/master' into bugfix/cut-pico-dadbattle
|
2024-03-25 13:42:50 -04:00 |
|
Cameron Taylor
|
c456430910
|
Merge pull request #414 from FunkinCrew/bugfix/opponent-mute-on-miss
Fix a bug where lag could cause the opponent to miss which would mute the vocals.
|
2024-03-25 13:37:12 -04:00 |
|
Cameron Taylor
|
3c9f63892b
|
Merge pull request #411 from FunkinCrew/feature/video-cutscene-hide
Hide a video cutscene after playing it
|
2024-03-25 13:37:00 -04:00 |
|
EliteMasterEric
|
51d36ea25e
|
Work in progress on fixing Boyfriend's spook/tv animations
|
2024-03-24 04:53:05 -04:00 |
|
EliteMasterEric
|
138dfd61e8
|
Fix a bug where the Camera Zoom toggle didn't work.
|
2024-03-23 23:52:08 -04:00 |
|
EliteMasterEric
|
24b03e4f6b
|
Replace calls to FlxG.sound.playMusic with ones that set the BPM.
|
2024-03-23 23:38:07 -04:00 |
|
EliteMasterEric
|
a8486a47df
|
Fix a bug where the album disappears never to return
|
2024-03-23 18:22:15 -04:00 |
|
EliteMasterEric
|
709fbc8594
|
Fix a bug where lag could cause the opponent to miss.
|
2024-03-23 18:11:06 -04:00 |
|
EliteMasterEric
|
6407770ed6
|
Rework every class to use FunkinSound.
|
2024-03-23 17:50:48 -04:00 |
|
Eric
|
8e8ec2c5aa
|
Merge branch 'rewrite/master' into funkin-crew-presents
|
2024-03-22 23:55:05 -04:00 |
|
EliteMasterEric
|
e4a9d25ac0
|
Syntax fix
|
2024-03-22 23:53:29 -04:00 |
|
EliteMasterEric
|
471b015d1a
|
Add some FlxSignals and showVideo/hideVideo
|
2024-03-22 23:46:03 -04:00 |
|
Cameron Taylor
|
932f7bce41
|
Merge pull request #408 from FunkinCrew/bugfix/camera-behavior-fixes
Make the ZoomCamera events use sensible defaults.
|
2024-03-22 23:38:26 -04:00 |
|
Cameron Taylor
|
01e83d4713
|
the funkin crew presents
|
2024-03-22 20:21:09 -07:00 |
|
EliteMasterEric
|
28088146eb
|
Fix bug where Pico dadbattle was playing over normal dadbattle
|
2024-03-22 22:17:34 -04:00 |
|
Cameron Taylor
|
a695fb2b39
|
Merge branch 'rewrite/master' into formatting-fixes
|
2024-03-22 19:00:29 -07:00 |
|
EliteMasterEric
|
83e8865a24
|
Make the ZoomCamera events use sensible defaults.
|
2024-03-22 20:29:35 -04:00 |
|
Cameron Taylor
|
7d008e7247
|
playstate camera fixie
|
2024-03-22 15:03:17 -07:00 |
|
Cameron Taylor
|
9d7831d40b
|
Merge branch 'rewrite/master' into bugfix/minimal-mode-gameover
|
2024-03-22 14:56:41 -07:00 |
|
EliteMasterEric
|
c765249030
|
Complain if the main metadata file specifies a variation (like erect) but the game can't find it.
|
2024-03-22 03:04:52 -04:00 |
|
EliteMasterEric
|
aea9213eea
|
Make sure the BPM label gets updated properly
|
2024-03-22 03:04:33 -04:00 |
|
EliteMasterEric
|
2b477c9bd1
|
Make Conductor a lazy instance
|
2024-03-22 02:47:56 -04:00 |
|
EliteMasterEric
|
4524b66170
|
Only show easy/normal/hard in story mode for now
|
2024-03-22 02:47:43 -04:00 |
|
EliteMasterEric
|
d50ff73d3c
|
Registries now get added to the Flixel console (and get lazy instantiated so they don't start before the game does)
|
2024-03-22 02:47:21 -04:00 |
|
Cameron Taylor
|
f7acee94cd
|
Merge branch 'rewrite/master' into feature/freeplay-album-art
|
2024-03-21 23:37:20 -07:00 |
|
Cameron Taylor
|
80c938af4f
|
fix for the album roll to come in only once bf hand hits
|
2024-03-21 23:34:03 -07:00 |
|
Cameron Taylor
|
433d4968da
|
change to elasticOut
|
2024-03-21 23:32:07 -07:00 |
|
Eric
|
fe2e272abb
|
Merge branch 'rewrite/master' into title-music-vol-fix
|
2024-03-22 00:17:03 -04:00 |
|
EliteMasterEric
|
2b91c0f926
|
Merge remote-tracking branch 'origin/rewrite/master' into feature/focusCameraTweening
|
2024-03-22 00:06:55 -04:00 |
|
EliteMasterEric
|
5e0de6d1ce
|
Fix some issues with events unintentionally sharing data after being edited via the toolbox.
|
2024-03-21 23:57:26 -04:00 |
|
Eric
|
662688023a
|
Merge branch 'rewrite/master' into title-music-vol-fix
|
2024-03-21 22:57:18 -04:00 |
|
EliteMasterEric
|
2069bf1d89
|
Merge remote-tracking branch 'origin/rewrite/master' into soundtray
|
2024-03-21 21:49:04 -04:00 |
|
EliteMasterEric
|
105aca4707
|
Fix an issue where hidden difficulties could end up in the difficulty list.
|
2024-03-21 19:44:02 -04:00 |
|
EliteMasterEric
|
1f81e92827
|
Scrapped the weird FlxAltasSprite stuff and just used a tween. Also fixed some bugs with story menu
|
2024-03-21 00:38:52 -04:00 |
|
EliteMasterEric
|
3975d34b70
|
Fix scoring lerp issue on story menu.
|
2024-03-20 23:06:32 -04:00 |
|
Cameron Taylor
|
99cb7263ca
|
Merge pull request #399 from FunkinCrew/bugfix/html5-video-pausing
Rework HTML5 video cutscenes to properly support the pause menu and volume controls.
|
2024-03-20 18:33:25 -04:00 |
|
EliteMasterEric
|
36a9c29720
|
Work in progress on custom album art for freeplay
|
2024-03-20 14:37:24 -04:00 |
|
EliteMasterEric
|
566a271a63
|
Fix several crashes when reaching a game over in minimal mode
|
2024-03-19 23:25:56 -04:00 |
|
EliteMasterEric
|
42eec66753
|
Rework HTML5 video cutscenes to properly support the pause menu and volume controls.
|
2024-03-19 15:56:00 -04:00 |
|
EliteMasterEric
|
3a35be916b
|
A bunch of checkstyle fixes
|
2024-03-16 22:20:22 -04:00 |
|
Jenny Crowe
|
494a3c9e86
|
Bugfixes. New additive zoom mode for camera tweening.
|
2024-03-16 08:38:10 -07:00 |
|
EliteMasterEric
|
d56c33cd17
|
Fix a dozen tiny issues with 2hot's audio and visuals (and some script crashes!).
|
2024-03-16 00:55:57 -04:00 |
|
EliteMasterEric
|
e4eb543fa7
|
Fix a bug where title music starts blaringly loud.
|
2024-03-15 21:53:07 -04:00 |
|
EliteMasterEric
|
ea491e57a0
|
Switch "Skip Cutscene" and "Restart Cutscene" (Dave's request)
|
2024-03-15 17:16:44 -04:00 |
|
EliteMasterEric
|
f31634351b
|
Fix an issue where stage character scale was overriding base character scale.
|
2024-03-15 16:45:18 -04:00 |
|
Jenny Crowe
|
1541f0aa68
|
Camera tween pausing/unpausing additions
|
2024-03-15 01:52:22 -07:00 |
|
Cameron Taylor
|
d68ea0eb46
|
lil polish
|
2024-03-14 19:40:07 -07:00 |
|
Cameron Taylor
|
82383018f6
|
funkin soundtray
|
2024-03-14 19:27:07 -07:00 |
|
Jenny Crowe
|
42506909f7
|
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening
|
2024-03-14 15:24:51 -07:00 |
|
Cameron Taylor
|
3aada18a59
|
title screen volume fix
|
2024-03-14 04:03:33 -07:00 |
|
Cameron Taylor
|
c4550ca773
|
Merge branch 'rewrite/master' into bugfix/github-force-debug
|
2024-03-14 03:09:05 -07:00 |
|
Cameron Taylor
|
e0eb00d01a
|
Merge branch 'rewrite/master' into feature/pico-flicker
|
2024-03-13 21:51:58 -07:00 |
|
Cameron Taylor
|
b5bc63feca
|
use isMinimalMode
|
2024-03-13 21:27:09 -07:00 |
|
Cameron Taylor
|
1211dbb6e8
|
Merge branch 'rewrite/master' into feature/chart-editor-song-scripts
|
2024-03-13 21:26:50 -07:00 |
|
Cameron Taylor
|
c8b74ccce2
|
Merge branch 'rewrite/master' into feature/debugger-popup-fixes
|
2024-03-13 18:54:24 -07:00 |
|
Cameron Taylor
|
b9ab38e0b9
|
timertools -> timerutil fix
|
2024-03-13 18:47:15 -07:00 |
|
Cameron Taylor
|
1a224423f9
|
Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into bugfix/precache-library-assets
|
2024-03-13 18:41:45 -07:00 |
|
EliteMasterEric
|
d22cb1a96f
|
Fix some issues resulting in release builds breaking!
|
2024-03-13 17:38:00 -04:00 |
|
EliteMasterEric
|
a13dc6e585
|
Remove deprecated imports.
|
2024-03-13 12:07:06 -04:00 |
|
EliteMasterEric
|
43cf1e71e2
|
Disable camera events in the minimal playtest.
|
2024-03-12 21:35:55 -04:00 |
|
EliteMasterEric
|
66085ff867
|
Song scripts can now be (optionally) enabled in the Chart Editor playtest
|
2024-03-12 21:34:50 -04:00 |
|