Cameron Taylor
|
23dd9937ec
|
black camera bg
|
2024-04-30 07:21:45 -04:00 |
|
EliteMasterEric
|
01b80ab5c8
|
Merge remote-tracking branch 'origin/input-offsets' into rewrite/master
|
2024-04-28 19:07:44 -04:00 |
|
EliteMasterEric
|
dd90d430ee
|
Replace the zoom with a fade (for now)
|
2024-04-24 23:50:19 -04:00 |
|
EliteMasterEric
|
e0721b901e
|
Fix a bug where negative visual offsets would break the countdown.
|
2024-04-24 21:57:23 -04:00 |
|
EliteMasterEric
|
f474bc32a5
|
Merge remote-tracking branch 'origin/rewrite/master' into input-offsets
|
2024-04-24 21:54:45 -04:00 |
|
EliteMasterEric
|
b6247c933a
|
Disable chart editor on web until it's fixed.
|
2024-04-24 16:00:50 -04:00 |
|
EliteMasterEric
|
84c3fd452b
|
Update Weekend 1 cutscenes to use the instanced Conductor
|
2024-04-20 02:11:04 -04:00 |
|
Cameron Taylor
|
678dbc0ab7
|
Merge branch 'rewrite/master' into a-bot-bars
|
2024-04-19 15:11:28 -04:00 |
|
FabsTheFabs
|
351cb8cbaa
|
popupstuff changes + make combopopup able to be edited outside of playstate
|
2024-04-19 14:14:33 -04:00 |
|
Cameron Taylor
|
035db7f00a
|
Merge branch 'rewrite/master' into bugfix/draw-crash
|
2024-04-19 14:03:58 -04:00 |
|
Cameron Taylor
|
93ae7692c8
|
Merge branch 'rewrite/master' into bugfix/weekend-1-bug-fixes
|
2024-04-19 13:55:01 -04:00 |
|
Cameron Taylor
|
1405e21e3d
|
Merge branch 'rewrite/master' into a-bot-bars
|
2024-04-16 20:02:08 -04:00 |
|
EliteMasterEric
|
43ec72fb9d
|
Ensure playNoteHoldCover doesn't call if note is judged as 'miss'
|
2024-04-15 20:36:38 -04:00 |
|
Cameron Taylor
|
658fd392fa
|
Merge branch 'rewrite/master' into a-bot-bars
|
2024-04-14 02:57:05 -04:00 |
|
EliteMasterEric
|
6f5c3a043f
|
Fix crash caused when game tries to render disposed sprites during a Sticker transition.
|
2024-04-10 14:45:07 -04:00 |
|
EliteMasterEric
|
b464f51ba2
|
Fix an issue where a missing stage would cause a crash (rather than an error popup)
|
2024-04-06 22:38:32 -04:00 |
|
EliteMasterEric
|
5beb20ec7c
|
Fix bug where restarting the song would sometimes crash.
|
2024-04-06 21:42:18 -04:00 |
|
EliteMasterEric
|
14869b9373
|
Also disable highscores in botplay
|
2024-04-06 02:08:10 -04:00 |
|
EliteMasterEric
|
99ee2b07ca
|
Make results screen use full campaign score in Story Mode
|
2024-04-06 02:06:06 -04:00 |
|
EliteMasterEric
|
29f105a44d
|
Practice mode = no highscore!
|
2024-04-06 01:59:46 -04:00 |
|
EliteMasterEric
|
95434018f7
|
Readd GF camera zoom into results state.
|
2024-04-05 02:56:47 -04:00 |
|
EliteMasterEric
|
9c8ab72494
|
Merge remote-tracking branch 'origin/rewrite/master' into bugfix/quick-camera-fixes
|
2024-04-05 02:45:23 -04:00 |
|
EliteMasterEric
|
08e8530ad4
|
Fix SetCameraBopSongEvent to be additive
|
2024-04-05 02:44:44 -04:00 |
|
EliteMasterEric
|
07092269b8
|
Merge branch 'rewrite/master' into input-offsets
|
2024-04-04 18:45:16 -04:00 |
|
Cameron Taylor
|
8f3406cb0e
|
Merge branch 'rewrite/master' into feature/results-screen-score
|
2024-04-04 05:34:29 -04:00 |
|
EliteMasterEric
|
8826d0741b
|
Hide miss popups when hitting ~160ms
|
2024-04-04 03:31:44 -04:00 |
|
EliteMasterEric
|
1759f5c388
|
Note cover now only plays splash on player
|
2024-04-03 04:52:28 -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 |
|
EliteMasterEric
|
67e096e443
|
Bunch of results screen fixes
|
2024-04-01 21:59:53 -04:00 |
|
EliteMasterEric
|
927b2a7cfc
|
Put judgements below the notes, and remove COMBO word.
|
2024-04-01 20:21:27 -04:00 |
|
EliteMasterEric
|
342782c3d3
|
Fix issue with pink screen when moving from PlayState->Freeplay->Main Menu
|
2024-03-28 22:33:50 -04: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 |
|
Cameron Taylor
|
53d62c3c12
|
Merge branch 'rewrite/master' into bugfix/pico-fixes
|
2024-03-27 22:14:44 -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
|
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 |
|
EliteMasterEric
|
07ad250060
|
Fix an audio crash when exiting a cutscene
|
2024-03-25 21:08:39 -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 |
|
EliteMasterEric
|
138dfd61e8
|
Fix a bug where the Camera Zoom toggle didn't work.
|
2024-03-23 23:52:08 -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 |
|
Cameron Taylor
|
a695fb2b39
|
Merge branch 'rewrite/master' into formatting-fixes
|
2024-03-22 19:00:29 -07:00 |
|
Cameron Taylor
|
7d008e7247
|
playstate camera fixie
|
2024-03-22 15:03:17 -07: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 |
|
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
|
1211dbb6e8
|
Merge branch 'rewrite/master' into feature/chart-editor-song-scripts
|
2024-03-13 21:26:50 -07: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 |
|
EliteMasterEric
|
6edc274748
|
Merge branch 'rewrite/master' into a-bot-bars
|
2024-03-08 20:54:11 -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 |
|
EliteMasterEric
|
332a81ec72
|
No longer miss notes during ending cutscene
|
2024-03-06 17:22:11 -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 |
|
EliteMasterEric
|
059e1c0e13
|
Implement onNoteIncoming script event.
|
2024-03-05 21:48:04 -05:00 |
|
Eric
|
3aa4c23340
|
Merge branch 'rewrite/master' into bugfix/chart-editor-vocal-crash
|
2024-03-04 23:00:38 -05:00 |
|
Jenny Crowe
|
132eda6715
|
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening
|
2024-03-04 20:57:54 -07:00 |
|
Cameron Taylor
|
acc75c5c5c
|
use totalNotes instead of currentChart.notes.length
|
2024-03-04 21:25:56 -05:00 |
|
EliteMasterEric
|
d0f81add95
|
Fix a bug where Chart Editor Playtest destroys the vocals and crashes
|
2024-03-04 21:19:24 -05:00 |
|
Cameron Taylor
|
fa72fa44b1
|
tallies for story mode
|
2024-03-04 21:18:40 -05:00 |
|
Cameron Taylor
|
d2b124efca
|
some highscore tallies debugging stuf in progress
|
2024-03-04 20:47:23 -05:00 |
|
Jenny Crowe
|
d9a69dac10
|
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening
|
2024-03-04 18:20:00 -07:00 |
|
Cameron Taylor
|
ae7d8b9046
|
Merge branch 'rewrite/master' into feature/blazin-animation-work
|
2024-03-04 18:11:11 -05:00 |
|
EliteMasterEric
|
73cf6b9fd2
|
Rewrite save data to fix scripted story levels. Add a "pre-transition death delay"
|
2024-03-04 16:37:42 -05:00 |
|
Mike Welsh
|
fcce345454
|
Avoid null reference error with music
|
2024-03-04 02:26:54 -08:00 |
|
EliteMasterEric
|
0294ea0b79
|
Implemented FlxAnimate characters into Blazin'.
|
2024-03-01 08:13:06 -05:00 |
|
Cameron Taylor
|
35d0feceb8
|
assets submod
|
2024-03-01 00:15:30 -05:00 |
|
EliteMasterEric
|
684eb919b5
|
Make the playback rate option explicit so it doesn't break in the future.
|
2024-02-29 18:49:20 -05:00 |
|
Jenny Crowe
|
db80bba100
|
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening
|
2024-02-29 15:11:20 -07:00 |
|
Cameron Taylor
|
e36629a41f
|
Merge branch 'rewrite/master' into feature/new-pause-menu
|
2024-02-29 13:53:55 -05:00 |
|
EliteMasterEric
|
1d70ff95f9
|
Several chart editor fixes (more precise playback speed, live input mode loads properly from save)
|
2024-02-28 21:19:21 -05:00 |
|
EliteMasterEric
|
2252040241
|
Fix custom pause music in Week 6, improve documentation
|
2024-02-28 14:51:39 -05:00 |
|
EliteMasterEric
|
8683900922
|
Fixes to cutscene pausing.
|
2024-02-28 03:53:36 -05:00 |
|
EliteMasterEric
|
5d030b8a31
|
Merge remote-tracking branch 'origin/rewrite/master' into feature/new-pause-menu
|
2024-02-28 03:04:56 -05:00 |
|
EliteMasterEric
|
cecddbc2ee
|
Fixed issues with audio in Week 6 after skipping the cutscene.
|
2024-02-28 03:01:20 -05:00 |
|
Jenny Crowe
|
858d8edf7a
|
Cam tweening working! UI buggy af. To fix.
|
2024-02-27 23:29:40 -07:00 |
|
EliteMasterEric
|
13d6ba378e
|
Work in progress on fixing Week 6
|
2024-02-28 00:19:08 -05:00 |
|
Cameron Taylor
|
3764a5db3f
|
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/funkin-secret into a-bot-bars
|
2024-02-27 22:41:08 -05:00 |
|
EliteMasterEric
|
90360de0d0
|
Working Blazin cutscene and fixed time travel
|
2024-02-26 19:03:04 -05:00 |
|
Cameron Taylor
|
6f88865e0b
|
viz in progress
|
2024-02-23 04:00:31 -05:00 |
|
EliteMasterEric
|
e349b0bb49
|
New pre-caching techniques should reduce stuttering on Weekend 1.
|
2024-02-23 00:16:11 -05:00 |
|
EliteMasterEric
|
539b688055
|
Exploration in expanding FunkinSprite for optimization
|
2024-02-22 18:55:24 -05:00 |
|