Cameron Taylor
|
8f3406cb0e
|
Merge branch 'rewrite/master' into feature/results-screen-score
|
2024-04-04 05:34:29 -04:00 |
|
Cameron Taylor
|
544dcdf809
|
Merge branch 'rewrite/master' into bugfix/chart-editor-weekend-1
|
2024-04-04 05:32:26 -04:00 |
|
Cameron Taylor
|
57a5973c2c
|
small fade polish for week 8 convos
|
2024-04-04 05:22:44 -04:00 |
|
EliteMasterEric
|
33685b2bcd
|
Fix an issue where player could not switch difficulties from Pause menu until they beat Weekend 1.
|
2024-04-04 04:08:07 -04:00 |
|
EliteMasterEric
|
8826d0741b
|
Hide miss popups when hitting ~160ms
|
2024-04-04 03:31:44 -04:00 |
|
EliteMasterEric
|
f129cb7997
|
Fix a bug where if Weekend 1 wasn't cleared, you can't chart those songs
|
2024-04-03 21:57:29 -04:00 |
|
EliteMasterEric
|
d911c46d2f
|
Better scoring numbers and improved anims.
|
2024-04-03 06:24:20 -04:00 |
|
EliteMasterEric
|
1759f5c388
|
Note cover now only plays splash on player
|
2024-04-03 04:52:28 -04:00 |
|
EliteMasterEric
|
e9d8546737
|
More results screen changes
|
2024-04-03 04:52:12 -04:00 |
|
Cameron Taylor
|
dcffe0537f
|
Merge branch 'rewrite/master' into bugfix/buncha-2hot-fixes
|
2024-04-01 22:40:10 -04:00 |
|
Cameron Taylor
|
d6723a8212
|
Merge branch 'rewrite/master' into bugfix/freeplay-menu-transition
|
2024-04-01 22:14:29 -04:00 |
|
Cameron Taylor
|
165e20c318
|
Merge pull request #453 from FunkinCrew/bugfix/judgements-below-notes
Bugfix/judgements below notes
|
2024-04-01 22:08:00 -04:00 |
|
Cameron Taylor
|
db89e199c4
|
Merge pull request #455 from FunkinCrew/bugfix/results-screen-cleanup
Bunch of results screen fixes
|
2024-04-01 22:07:43 -04:00 |
|
EliteMasterEric
|
67e096e443
|
Bunch of results screen fixes
|
2024-04-01 21:59:53 -04:00 |
|
Cameron Taylor
|
bf9f87e9e7
|
Merge pull request #441 from FunkinCrew/bugfix/spookeez-hold-note
Bugfix/spookeez hold note
|
2024-04-01 21:00:14 -04:00 |
|
EliteMasterEric
|
927b2a7cfc
|
Put judgements below the notes, and remove COMBO word.
|
2024-04-01 20:21:27 -04:00 |
|
Cameron Taylor
|
ac5ca3991e
|
Merge branch 'rewrite/master' into feature/new-audio
|
2024-03-30 03:32:30 -04:00 |
|
EliteMasterEric
|
28462681b2
|
Fix bug where 100ms sustains wouldn't update their rendering.
|
2024-03-29 00:52:20 -04:00 |
|
EliteMasterEric
|
7c04630bb7
|
Fix a bug where duplicate notes would get placed at the beginning
|
2024-03-29 00:49:02 -04:00 |
|
EliteMasterEric
|
342782c3d3
|
Fix issue with pink screen when moving from PlayState->Freeplay->Main Menu
|
2024-03-28 22:33:50 -04:00 |
|
Jenny Crowe
|
e2851818b3
|
Zoom Camera: Property tweaks
|
2024-03-28 17:47:38 -07:00 |
|
Eric
|
0eddea9bf8
|
Merge branch 'rewrite/master' into bugfix/combo-fixes
|
2024-03-28 20:32:34 -04:00 |
|
EliteMasterEric
|
e5a10c6a25
|
Merge branch 'rewrite/master' into a-bot-bars
|
2024-03-28 20:26:13 -04:00 |
|
EliteMasterEric
|
35f99b49a4
|
Merge branch 'rewrite/master' into input-offsets
|
2024-03-28 20:23:31 -04:00 |
|
Jenny Crowe
|
76885c421d
|
Cleanup + Focus Camera: Use Tween toggle converted to "Classic" ease type.
|
2024-03-28 12:34:13 -07:00 |
|
Jenny Crowe
|
d4c9fffe48
|
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into bugfix/quick-camera-fixes
|
2024-03-28 11:05:51 -07:00 |
|
Jenny Crowe
|
ef2cb4d9fc
|
Convert zoom modifiers from additive to multiplicative
|
2024-03-28 11:05:38 -07: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
|
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 |
|
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 |
|
EliteMasterEric
|
6b35898ed9
|
Fix some issues with Weekend 1.
|
2024-03-26 23:24:59 -04:00 |
|
EliteMasterEric
|
e84fdf9fac
|
Resolve FlxG.sound.music crash
|
2024-03-26 19:38:42 -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
|
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
|
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
|
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 |
|
EliteMasterEric
|
dc638a1303
|
Fix a bunch of merge bugs.
|
2024-03-23 15:34:37 -04:00 |
|
EliteMasterEric
|
831d6aae71
|
Merge remote-tracking branch 'origin/rewrite/master' into input-offsets
|
2024-03-23 14:38:50 -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 |
|
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 |
|
Cameron Taylor
|
f7acee94cd
|
Merge branch 'rewrite/master' into feature/freeplay-album-art
|
2024-03-21 23:37:20 -07:00 |
|
EliteMasterEric
|
2b91c0f926
|
Merge remote-tracking branch 'origin/rewrite/master' into feature/focusCameraTweening
|
2024-03-22 00:06:55 -04:00 |
|
EliteMasterEric
|
efa0e103b0
|
Merge remote-tracking branch 'origin/rewrite/master' into a-bot-bars
|
2024-03-21 21:54:22 -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
|
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 |
|
Eric
|
41b9ba9bce
|
Merge branch 'rewrite/master' into a-bot-bars
|
2024-03-19 22:33:02 -04:00 |
|
EliteMasterEric
|
9eda84019d
|
Merge branch 'rewrite/master' into a-bot-bars
|
2024-03-19 13:34:06 -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
|
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 |
|
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
|
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
|
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
|
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 |
|
EliteMasterEric
|
be8f5699b5
|
2hot stutter actually fixed!
|
2024-03-11 23:42:32 -04:00 |
|
Jenny Crowe
|
6b8fb7dc77
|
Standardized camera zoom tweening to match camera follow tweening. Implemented methods to cancel tweens in necessary places. Start of pausing tweens when pausing the game (WIP). (CHANGES NOT TESTED EXPECT SOMETHING TO BREAK)
|
2024-03-10 16:35:41 -07:00 |
|
Jenny Crowe
|
f9291d6458
|
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening
|
2024-03-10 14:51:24 -07:00 |
|
Cameron Taylor
|
fbc5d9955d
|
Merge pull request #380 from FunkinCrew/bugfix/weekend-1-sing-time
Weekend 1: Fix default value for singTime to use correct unit.
|
2024-03-10 13:28:34 -04:00 |
|
EliteMasterEric
|
09029718aa
|
Fix an issue where story menu characters bop too fast
|
2024-03-08 21:33:06 -05:00 |
|
EliteMasterEric
|
9284f1495b
|
Fix default value for singTime to use correct unit.
|
2024-03-08 20:56:34 -05:00 |
|
EliteMasterEric
|
6edc274748
|
Merge branch 'rewrite/master' into a-bot-bars
|
2024-03-08 20:54:11 -05:00 |
|
EliteMasterEric
|
7d0d839cfb
|
Merge branch 'rewrite/master' into a-bot-bars
|
2024-03-08 20:03:15 -05:00 |
|
Cameron Taylor
|
7a5d48b290
|
Merge branch 'rewrite/master' into feature/blazin-touchups
|
2024-03-08 16:43:56 -05:00 |
|
Eric
|
c40919f53f
|
Merge pull request #375 from FunkinCrew/bugfix/html5-video
Use correct resource URL when loading videos
|
2024-03-08 00:31:10 -05:00 |
|
EliteMasterEric
|
1808f08554
|
Merge branch 'rewrite/master' into a-bot-bars
|
2024-03-08 00:21:51 -05:00 |
|
Cameron Taylor
|
d6608fe435
|
a-bot in progress
|
2024-03-07 14:19:26 -05:00 |
|
Mike Welsh
|
b0abef0d52
|
Use correct resource URL when loading videos
On HTML5, `VideoCutscene` was not stripping the library prefix
from the video file path, causing the video to fail to load.
Fixes FPIQ-281.
|
2024-03-06 23:37:50 -08:00 |
|
EliteMasterEric
|
332a81ec72
|
No longer miss notes during ending cutscene
|
2024-03-06 17:22:11 -05:00 |
|
Cameron Taylor
|
b2d3fe17d7
|
fun lil pitch effect on result scren
|
2024-03-06 02:56:10 -05:00 |
|
Cameron Taylor
|
1ebfeb3a89
|
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/funkin-secret into feature/script-event-note-incoming
|
2024-03-05 23:57:53 -05:00 |
|
EliteMasterEric
|
1b1834e98b
|
Implement a botplay checkbox in the chart editor
|
2024-03-05 22:27:07 -05:00 |
|