Dean Herbert
367b35bb10
Merge branch 'master' into fix-storyboard-sample-pausing
2020-09-30 22:42:26 +09:00
Dean Herbert
b0f8e11bd4
Fix incorrect caching
2020-09-30 17:34:14 +09:00
Dean Herbert
7f579850dd
Merge branch 'master' into fix-editor-silence-on-seek
2020-09-30 17:03:23 +09:00
Dean Herbert
414c40d298
Reverse inheritance order of SkinnableSound's pause logic
2020-09-30 15:45:14 +09:00
Dean Herbert
136843c8e4
Make DrawableStoryboardSample a SkinnableSound
...
Allows sharing pause logic with gameplay samples.
2020-09-29 14:25:39 +09:00
Dean Herbert
74e74e1c31
Fix pause loop sound not working because paused
2020-09-29 14:20:41 +09:00
Dean Herbert
c5f6b77bba
Add missing cached type
2020-09-29 13:42:17 +09:00
Dean Herbert
d6f3beffb6
Use existing bindable flow instead
2020-09-29 12:50:17 +09:00
Dean Herbert
4f0c0ea5f9
Fix hit samples playing while paused / seeking in the editor
2020-09-28 18:17:47 +09:00
Dean Herbert
26ba7d3100
Remove unused method (was moved to a more local location)
2020-09-25 13:20:19 +09:00
Dean Herbert
7df8b5bce7
Merge branch 'master' into fix-spinner-rpm-user-rate-adjust
2020-09-25 13:17:03 +09:00
Joehu
c5b684bd2e
Fix typo in log when beatmap fails to load
2020-09-23 00:30:20 -07:00
Dean Herbert
3276b9ae9c
Fix fail animation breaking on post-fail judgements
2020-09-22 15:08:53 +09:00
Dean Herbert
508278505f
Make local clock private
2020-09-21 19:40:57 +09:00
Dean Herbert
3f788da06d
Fix SPM changing incorrectly with playback rate changes
2020-09-21 19:39:54 +09:00
smoogipoo
06c49070b1
Remove player collection settings
2020-09-11 16:04:09 +09:00
Dean Herbert
d3957e6155
Move title specification for settings groups to constructor
...
Using an abstract property was awkward for this as it is being consumed
in the underlying constructor but could not be dynamically set in time from a
derived class.
2020-09-09 18:50:31 +09:00
Lucas A
82e314da59
Fix merge conflicts.
2020-09-03 21:56:47 +02:00
Dan Balasescu
84b3604192
Merge branch 'master' into game-overlay-activation-mode
2020-09-03 13:34:22 +09:00
smoogipoo
7e1844ed77
Fix track adjusments being reset incorrectly
2020-09-01 18:07:19 +09:00
smoogipoo
26b4226b55
Fix ModTimeRamp not working
2020-09-01 16:55:10 +09:00
Dan Balasescu
f08e7828da
Merge branch 'master' into beatmap-track-rework
2020-09-01 16:06:38 +09:00
Lucas A
dd093f44d8
Cast base immutable bindable to mutable for testing purposes and make InitialOverlayActivationMode property protected
2020-08-31 11:26:55 +02:00
Dean Herbert
a171d0e292
Remove unused methods and classes
2020-08-31 18:14:22 +09:00
Dean Herbert
3b03116179
Remove unnecessary using statement
2020-08-21 16:45:59 +09:00
Dean Herbert
f7e4feee34
Update remaining Player components to use WorkingBeatmap again
2020-08-21 15:25:57 +09:00
Dean Herbert
357fb3a10e
Merge branch 'master' into beatmap-track-rework
2020-08-21 12:53:09 +09:00
Dean Herbert
5714c761eb
Merge pull request #9768 from frenzibyte/allow-counter-customize-sprite-text
...
Allow providing custom sprite text for RollingCounter<T>
2020-08-20 00:14:48 +09:00
Salman Ahmed
8f1a71c6b1
Remove counter sprite attributes for not being of any reasonable use
2020-08-19 07:44:45 +03:00
Dean Herbert
93a8bc3d5a
Remove local reset method in GameplayClockContainer
2020-08-17 22:36:09 +09:00
Dean Herbert
d9debef156
Add explicit LoadTrack method
2020-08-17 15:38:16 +09:00
Lucas A
589d4eeb52
Remove setting.
2020-08-16 17:18:40 +02:00
Shane Woolcock
85b3fff9c8
Update mouse confine when gameplay state changes
2020-08-16 23:11:09 +09:30
Dean Herbert
71f4e753f0
Merge branch 'master' into beatmap-track-rework
2020-08-16 22:35:32 +09:00
Bartłomiej Dach
a426ff1d5b
Refactor gameplay menu overlay to fix regression
2020-08-15 14:18:50 +02:00
Dean Herbert
e465afa280
Merge branch 'master' into beatmap-track-rework
2020-08-14 20:02:43 +09:00
Dan Balasescu
b7ae70ff96
Merge branch 'master' into fix-skinnable-sound-mute
2020-08-14 19:01:32 +09:00
Lucas A
84cb36b6a8
Defer subscriptions for updateOverlayActivationMode() to OnEntering()
2020-08-13 10:57:18 +02:00
Dean Herbert
99bea6b8e9
Add missing null check (player construction is potentially delayed now)
2020-08-13 12:52:35 +09:00
Dean Herbert
27cd9e119a
Delay beatmap load until after transition has finished
...
Previously the beatmap would begin loading at the same time the
`PlayerLoader` class was. This can cause a horribly visible series of
stutters, especially when a storyboard is involved.
Obviously we should be aiming to reduce the stutters via changes to the
beatmap load process (such as incremental storyboard loading,
`DrawableHitObject` pooling, etc.) but this improves user experience
tenfold in the mean time.
2020-08-13 12:04:32 +09:00
smoogipoo
c0031955c9
Update with further framework changes
2020-08-12 01:50:18 +09:00
smoogipoo
e47a1eb313
Use adjustable ITrack
2020-08-12 01:41:21 +09:00
smoogipoo
eec94e1f53
Make track not-null in GameplayClockContainer/FailAnimation
2020-08-12 00:51:43 +09:00
smoogipoo
c66a14e9c5
Remove beatmap from FailAnimation
2020-08-11 12:37:48 +09:00
Lucas A
f74e162bbc
Fix overlay activation mode being updated when player is not current screen.
2020-08-10 20:27:42 +02:00
Lucas A
052bb06c91
Add ability to open overlays during gameplay breaks.
2020-08-10 20:13:50 +02:00
Dean Herbert
365aae799e
Merge branch 'master' into fix-skinnable-sound-mute
2020-08-10 23:55:51 +09:00
Bartłomiej Dach
9a09f97478
Extract constant to avoid double initial value spec
2020-08-08 21:21:30 +02:00
Dean Herbert
e3105fd4c8
Add more resilient logic for whether to avoid playing SkinnableSound on no volume
2020-08-06 19:16:26 +09:00
smoogipoo
2e3ecf71c7
Pass track from Player to components
2020-08-06 18:31:08 +09:00
smoogipoo
5c05fe3988
Expose track from MusicController
2020-08-06 16:24:14 +09:00
smoogipoo
6e42b8219c
Move track to MusicController, compiles
2020-08-06 16:24:14 +09:00
smoogipoo
9a00ad48c6
Update components to use extension methods
2020-08-06 14:43:39 +09:00
Lucas A
71895964f4
Refactor overlay activation logic and reword tip.
2020-08-05 11:21:09 +02:00
Lucas A
30c7a6f6a7
Fix CI issue and use method instead of triggering change on bindable.
2020-08-03 21:33:18 +02:00
Lucas A
242a035f7e
Apply review suggestions.
2020-08-03 21:25:45 +02:00
Lucas A
25ebb8619d
Add tests.
2020-08-03 16:04:11 +02:00
Lucas A
fe97d472df
Enable back overlays when a replay is loaded.
2020-08-02 21:53:13 +02:00
Lucas A
f1ba576438
Disable overlay activation when in gameplay.
2020-08-02 21:34:35 +02:00
Joe Yuan
e795b1ea31
Failing effect displays vertically
2020-07-28 00:42:48 -07:00
Dean Herbert
ee05d5cb14
Remove no-longer-necessary play trigger on skin change
2020-07-23 09:06:15 +09:00
Dean Herbert
fea6389f69
Hide HUD elements during break time by default
2020-07-22 12:41:06 +09:00
Gagah Pangeran
95f52573f7
change font size
2020-07-21 15:58:25 +07:00
Gagah Pangeran
055e31ddd5
update minor
2020-07-20 18:37:02 +07:00
Gagah Pangeran
6a144fba80
add epilepsy warning in metadata display
2020-07-20 17:24:17 +07:00
Dean Herbert
a39c4236c7
Fix multiple issues and standardise transforms
2020-07-17 19:08:50 +09:00
Dean Herbert
aa992f2e34
Merge branch 'master' into Issue#9170
2020-07-17 18:29:40 +09:00
Joehu
ecbd8067e9
Add ability to seek replays/auto with arrow keys
2020-07-14 20:18:47 -07:00
Dan Balasescu
c49ce65326
Merge pull request #9540 from peppy/gameplay-pause-via-middle-mouse
...
Allow pausing gameplay via middle mouse button
2020-07-14 21:13:31 +09:00
Dean Herbert
2626ab41c3
Add implicit braces for clarity
2020-07-14 20:15:31 +09:00
Dean Herbert
c7d3b025ad
Rename variable and change default to true
2020-07-14 20:11:54 +09:00
Dean Herbert
690f2fd482
Merge branch 'master' into always-combo-break
2020-07-14 20:11:02 +09:00
Dean Herbert
f442df75a9
Add missing released conditional
2020-07-13 09:00:10 +09:00
Dean Herbert
c1aafe83fa
Add note about future behaviour
2020-07-12 23:05:47 +09:00
Dean Herbert
08696b9bca
Allow pausing gameplay via middle mouse button
2020-07-12 23:03:03 +09:00
BananeVolante
f03303573e
formating
2020-07-08 13:54:22 +02:00
BananeVolante
e8f23e35a5
WIP : replaced TransformBindableTo by VolumeTo
...
Currently, the VolumeTO calls taht use a fading does not do anything.
calling VolumeTo calls pauseLoop.samplesContainer.TransformBindableTo(....), while i used to call pauseLoop.TransformBindableTo(....)
2020-07-03 14:33:42 +02:00
BananeVolante
ab1eb469af
removed unneeded null checks
2020-07-01 13:30:23 +02:00
BananeVolante
ab134c0ed7
removed unneeded information in a comment
2020-07-01 13:27:33 +02:00
BananeVolante
946fcf75ac
Merge branch 'master' of https://github.com/ppy/osu into Issue#9170
...
update local code
2020-07-01 13:06:44 +02:00
Dan Balasescu
0e80d6629b
Merge branch 'master' into red-tint
2020-06-30 15:44:22 +09:00
Bartłomiej Dach
678767918e
Centralise logic further
2020-06-28 23:32:04 +02:00
Bartłomiej Dach
3637bf2f9b
Clean up member order & access modifiers
2020-06-26 19:39:55 +02:00
Bartłomiej Dach
02f590309d
Add xmldoc for public property
2020-06-26 19:39:55 +02:00
Bartłomiej Dach
a63b6a3ddf
Simplify binding
2020-06-26 19:39:55 +02:00
Bartłomiej Dach
415e1c05ff
Simplify implementation
2020-06-26 19:39:55 +02:00
Bartłomiej Dach
3783fe8d6a
Rename fields for clarity
2020-06-26 19:39:53 +02:00
Power Maker
798e8e7a8d
Fix CI fail
2020-06-26 15:12:01 +02:00
Power Maker
efeaa1cc10
Make some changes, fix and add tests
2020-06-26 14:58:42 +02:00
Power Maker
97a212a7f6
Hide red tint based on "Show health display even when you can't fail" setting
2020-06-26 14:32:01 +02:00
BananeVolante
a4bb238c45
fixed bug preventing the pause loop from playing during the first pause after changing a skin
2020-06-26 14:07:27 +02:00
BananeVolante
7d2d6a52c9
now uses SkinnableSample instead of Drawable sample
...
Still does not support switching skins after Pause overlay loading,
there will be no sound for the first pause (works fine the the nexts)
Also, the pause loop seems to play for approximately 1 second when exiting the
screens via restart or quit
finally, since SkinnableSound does not play a sound if its aggregate
volume is at 0, i had turn up the volume a bit before playing the loop
2020-06-25 18:58:04 +02:00
BananeVolante
9e5cc1b7a2
added skin support for the pause loop
2020-06-25 13:26:42 +02:00
BananeVolante
2e8f30461f
play/stops music when entering the pause overlay, instead of letting it play silently in the background
2020-06-24 14:22:12 +02:00
BananeVolante
53107973a3
merged 2 lines
...
Co-authored-by: Salman Ahmed <email@iisalman.me>
2020-06-24 14:01:13 +02:00
Dean Herbert
9119f41604
Merge branch 'master' into results-screen-statistics-overlapping-transition
2020-06-24 18:22:51 +09:00
Bartłomiej Dach
43be75d481
Merge branch 'master' into Issue#9170
2020-06-23 20:49:13 +02:00
BananeVolante
624ad65806
formating
2020-06-23 13:09:24 +02:00
Dean Herbert
a6c6e391ca
Fix player not exiting immediately on Alt-F4
2020-06-23 17:38:30 +09:00
BananeVolante
579d7cedcc
Merge branch 'master' of https://github.com/ppy/osu into Issue#9170
...
updated local source
2020-06-22 15:29:05 +02:00
BananeVolante
836386d03b
removed duplicate lines
2020-06-22 15:22:13 +02:00
BananeVolante
9dea96e5fd
added pause sound with fading
2020-06-22 14:02:21 +02:00
BananeVolante
a4eb6c81c5
undid changes to the file
2020-06-22 13:40:31 +02:00
smoogipoo
261adfc4e6
Create a local playable beatmap instead
2020-06-22 18:38:41 +09:00
smoogipoo
33fdd7466c
Merge branch 'master' into results-screen-statistics-overlapping-transition
2020-06-22 15:38:48 +09:00
smoogipoo
49bdd89775
Cleanup ReplayPlayer adjustments
2020-06-19 21:54:09 +09:00
Dean Herbert
290ae37346
Add assertion of only usage game-wide
2020-06-18 23:54:20 +09:00
Dean Herbert
7da56ec7fd
Add null check and xmldoc
2020-06-18 23:52:35 +09:00
Dean Herbert
add1265d53
Block screen suspend while gameplay is active
2020-06-18 23:48:00 +09:00
smoogipoo
9442fc00ac
Temporary hack to make replay player populate scores
2020-06-16 17:48:59 +09:00
Dean Herbert
17a70bf6ee
Add test coverage
2020-06-15 20:32:27 +09:00
BananeVolante
4e7d60b6ff
Merge branch 'master' of https://github.com/ppy/osu into Issue#9170
...
updated local source
2020-06-15 12:58:47 +02:00
Dean Herbert
0d53d0ffc8
Fix back-to-front math
2020-06-15 00:46:20 +09:00
Dean Herbert
7b95c55afb
Fix HardwareCorrectionOffsetClock breaking ElapsedTime readings
2020-06-14 11:33:59 +09:00
BananeVolante
04c1efe298
resolved issues with inspect code script
2020-06-13 14:33:55 +02:00
BananeVolante
794b8673e2
formated using dotnet format
2020-06-13 10:56:02 +02:00
BananeVolante
8b8f2dfda2
Removed duplicate samplepause.stop() calls, removed test lines
...
Since restart() always call perform immediate exit when the function lead
to a restart, there is no need to stop the pause sample in restart
2020-06-13 10:31:54 +02:00
BananeVolante
6fd8548f79
no longer crash if the restart sample isn't found
2020-06-13 10:13:41 +02:00
BananeVolante
2feaf2c74a
added music during pause
2020-06-12 19:17:52 +02:00
Dean Herbert
64550fe87c
Merge branch 'master' into fix-draining-in-between-break-sections
2020-06-02 16:06:08 +09:00
smoogipoo
de0b6ec9f1
Create abstract implementation
2020-05-26 17:00:41 +09:00
Dean Herbert
ce223a2bd8
Silence hit sounds while seeking
2020-05-21 11:08:06 +09:00
smoogipoo
e5de382760
Merge branch 'master' into storyboard-overlay-layer
2020-05-20 15:08:45 +09:00
smoogipoo
85088c9b3b
Privatise setter
2020-05-20 15:08:33 +09:00
Bartłomiej Dach
ce4301c5b8
Add overlay layer to player by proxying
2020-05-19 19:47:50 +02:00
smoogipoo
6d70f4b410
Merge branch 'master' into allowgameplayoverlays-hide-skip
2020-05-18 19:54:38 +09:00
smoogipoo
49ee05c3c4
Make into CompositeDrawable
2020-05-18 19:37:49 +09:00
Lucas A
4096463d02
Move SkipOverlay internal alpha manipulation to a nested container and adjust visual tests.
2020-05-15 19:43:01 +02:00
Dean Herbert
9b6525bb03
Fix applied platform/user offsets being incorrect when rate adjust mods are active
2020-05-15 18:44:47 +09:00
Lucas A
7874045b1f
Allow disabling SkipOverlay through AllowGameplayOverlays.
2020-05-12 23:05:56 +02:00
Dean Herbert
de50b725d5
Fix mod failure checks executing actual game logic
2020-05-12 20:08:35 +09:00
Dan Balasescu
6841bd5609
Merge branch 'master' into taiko-scroller
2020-05-11 11:10:55 +09:00
Bartłomiej Dach
ee2ff77b89
Merge branch 'master' into fix-draining-in-between-break-sections
2020-05-10 17:57:44 +02:00
Dean Herbert
c712e98f2b
Merge branch 'master' into publicly-expose-hud
2020-05-10 20:06:28 +09:00
Dean Herbert
9b8589583c
Merge branch 'master' into taiko-scroller
2020-05-08 19:10:39 +09:00
Lucas A
30dd158c33
Rename property to AllowGameplayOverlays and update XMLDoc accordingly.
2020-05-08 09:37:50 +02:00
Lucas A
83be5455d3
Disable the display of HUD through DisplayHud property.
2020-05-07 08:52:36 +02:00
Lucas A
aff74db80d
Publicly expose HUDOverlay in Player.
2020-05-05 10:40:10 +02:00
alex
0e2ccac33b
Add spaces to comments
2020-05-04 18:36:24 -07:00
Dean Herbert
cea6be5e52
Expose as JudgementResult instead of "passing" state
2020-05-03 23:55:44 +09:00
Bartłomiej Dach
8118747732
Make PeriodTracker actually immutable
2020-05-02 01:33:33 +02:00
Dean Herbert
ff1d63060d
Add and consume passing state in GameplayBeatmap
2020-05-01 20:08:18 +09:00
Salman Ahmed
6fa9feb15c
Merge remote-tracking branch 'upstream/master' into add-interval-list
2020-04-29 05:14:40 +03:00
Salman Ahmed
6e76e5900a
Rename is-in-any check method to a more legible name
2020-04-29 05:11:44 +03:00
Salman Ahmed
8d899f4e77
Apply changes to the BreakTracker and more adjustment
2020-04-29 05:11:43 +03:00
Dean Herbert
a91c63819b
Refactor updateCompletionState implementation for legibility and code share
2020-04-21 11:55:28 +09:00
Salman Ahmed
e12e3391fb
Base wait steps duration on the delay used for results display
...
With `* 2` for safety of not potentially going to the next step and the delegate not executed yet.
2020-04-20 06:42:33 +03:00
Endrik Tombak
f893d523f5
User setting for always playing first combo break
2020-04-19 12:23:41 +03:00
Salman Ahmed
6d276890a7
Fix results screen pushed after rewinding in-between push delay
2020-04-19 05:59:56 +03:00
Salman Ahmed
7e64bec94f
Use HasCompleted in Player
2020-04-19 05:58:22 +03:00
