Dean Herbert
|
9bac8f3792
|
Add null check on replay as safety measure
|
2020-10-27 18:58:37 +09:00 |
|
Dean Herbert
|
ac4671c594
|
Add basic implementation of spectator screen
|
2020-10-27 18:58:37 +09:00 |
|
Dean Herbert
|
5fd97bd043
|
Add basic spectator screen
|
2020-10-27 18:58:37 +09:00 |
|
Dean Herbert
|
9cfb81589e
|
Use bindable flow instead
|
2020-10-27 14:10:12 +09:00 |
|
Dean Herbert
|
6853da459d
|
Move sample pausing logic out of FrameStabilityContainer
|
2020-10-27 13:54:33 +09:00 |
|
Dean Herbert
|
b86347dc81
|
Merge branch 'master' into spectator
|
2020-10-26 13:39:07 +09:00 |
|
Bartłomiej Dach
|
0542a45c43
|
Change to manual adjustment add/remove
|
2020-10-25 12:33:35 +01:00 |
|
Bartłomiej Dach
|
85e14f3f0c
|
Shorten fade duration to make fade out snappier
|
2020-10-25 00:40:11 +02:00 |
|
Bartłomiej Dach
|
e101ba5cba
|
Move volume manipulations to player loader
|
2020-10-25 00:40:11 +02:00 |
|
Bartłomiej Dach
|
73174961f0
|
Rework animation sequence for readability
|
2020-10-24 22:30:08 +02:00 |
|
Dean Herbert
|
4fca7675b0
|
Don't send spectate data when an autoplay mod is active
|
2020-10-23 14:47:21 +09:00 |
|
Dan Balasescu
|
bd4e0e1a60
|
Merge branch 'master' into epilepsy-warning
|
2020-10-20 17:43:37 +09:00 |
|
Dean Herbert
|
55d08fad5c
|
Remove unused field
|
2020-10-20 15:18:15 +09:00 |
|
Dean Herbert
|
7a68636f71
|
Adjust fade sequence and durations to feel better
|
2020-10-20 15:03:33 +09:00 |
|
Dean Herbert
|
4e57751ca1
|
Fix background dim application to avoid overdraw, transition smoother
|
2020-10-20 15:03:12 +09:00 |
|
Dean Herbert
|
80b1f816c7
|
Merge branch 'master' into hide-hud-during-break-time
|
2020-10-20 14:19:04 +09:00 |
|
Dean Herbert
|
c57fecd1fc
|
Update comment to make it clear this is a hack
|
2020-10-20 12:43:57 +09:00 |
|
Bartłomiej Dach
|
fd4bab85cf
|
Merge branch 'master' into epilepsy-warning
|
2020-10-20 01:06:46 +02:00 |
|
Bartłomiej Dach
|
05251c646e
|
Fade volume back up on pop out
|
2020-10-20 01:06:20 +02:00 |
|
Bartłomiej Dach
|
1fc22bdbff
|
Only show warning once on given map
|
2020-10-20 00:59:36 +02:00 |
|
Bartłomiej Dach
|
a164d330e5
|
Improve feel of transition
|
2020-10-20 00:51:31 +02:00 |
|
Bartłomiej Dach
|
6e50ae0458
|
Reformulate push sequence code
|
2020-10-20 00:22:30 +02:00 |
|
Bartłomiej Dach
|
8505903041
|
Move warning construction to load()
|
2020-10-20 00:08:05 +02:00 |
|
Bartłomiej Dach
|
aeca61eb3e
|
Split warning to separate file
|
2020-10-19 23:48:02 +02:00 |
|
Bartłomiej Dach
|
44279ed347
|
Remove unused using directive
|
2020-10-19 23:46:09 +02:00 |
|
Salman Ahmed
|
6e4b28ed1e
|
Different version of epilepsy warning display
|
2020-10-20 00:32:44 +03:00 |
|
Joehu
|
fef6e55b39
|
Remove unused using and field
|
2020-10-19 12:32:16 -07:00 |
|
Joehu
|
dbda18acea
|
Fix autoplay/replay settings going off screen on some legacy skins
|
2020-10-19 12:04:23 -07:00 |
|
Dan Balasescu
|
b5cadd6a2c
|
Merge pull request #10555 from peppy/fix-score-display-zero-padding
Fix incorrect zero padding for classic scoring mode
|
2020-10-19 15:54:12 +09:00 |
|
Dean Herbert
|
ba99c5c134
|
Remove rolling delay on default combo counter
|
2020-10-19 14:39:02 +09:00 |
|
Dean Herbert
|
cb1784a846
|
Fix score displays using non-matching zero padding depending on user score display mode
|
2020-10-19 14:05:28 +09:00 |
|
Dan Balasescu
|
b7c12ff61e
|
Merge pull request #10530 from peppy/fix-catch-dual-combo-counter
Fix osu!catch showing two combo counters for legacy skins
|
2020-10-16 23:52:14 +09:00 |
|
smoogipoo
|
dfbc0965e4
|
Merge branch 'master' into peppy/skinnable-health-display
|
2020-10-16 23:17:17 +09:00 |
|
Dean Herbert
|
8a3bce3cc3
|
Fix osu!catch showing two combo counters for legacy skins
|
2020-10-16 18:20:17 +09:00 |
|
Dean Herbert
|
a774de2270
|
Also add support in LegacyComboCounter
|
2020-10-16 17:52:22 +09:00 |
|
Dean Herbert
|
77bf050a80
|
Ignore IgnoreHits for flashiness
|
2020-10-16 17:24:43 +09:00 |
|
Dean Herbert
|
f0b15813e2
|
Add support for both legacy styles
|
2020-10-16 17:08:46 +09:00 |
|
Dean Herbert
|
a810f56ec8
|
Move "flash on hit only" logic to binding
|
2020-10-16 17:08:46 +09:00 |
|
Dean Herbert
|
c0a1f2158c
|
Add basic component structure for skinnable health displays
|
2020-10-16 17:08:46 +09:00 |
|
Dan Balasescu
|
583fdc3a95
|
Merge pull request #10510 from peppy/skinnable-accuracy-display
Add legacy skinning support for accuracy display
|
2020-10-15 21:20:48 +09:00 |
|
Dan Balasescu
|
5d8cf87155
|
Merge pull request #10511 from peppy/bottom-error-display
Add support for bottom-anchored hit error display
|
2020-10-15 20:51:09 +09:00 |
|
Dan Balasescu
|
70b050f212
|
Merge branch 'master' into skinnable-accuracy-display
|
2020-10-15 20:28:57 +09:00 |
|
Dan Balasescu
|
1ce0e83e59
|
Merge branch 'master' into skinnable-score-display
|
2020-10-15 19:16:03 +09:00 |
|
Dan Balasescu
|
93dfbd5d9e
|
Merge pull request #10505 from peppy/skin-disabler-refactor
Move ISampleDisabler implementation to Player and FrameStabilityContainer
|
2020-10-15 19:14:52 +09:00 |
|
Dean Herbert
|
70806deba1
|
Add support for bottom-anchored hit error display
|
2020-10-15 19:14:02 +09:00 |
|
Dean Herbert
|
d76365ed1b
|
Make container readonly
|
2020-10-15 18:38:41 +09:00 |
|
Dan Balasescu
|
5640d33d1a
|
Merge branch 'master' into skin-disabler-refactor
|
2020-10-15 18:32:50 +09:00 |
|
Dean Herbert
|
6983978c98
|
Correct top-right element offset by finding the lower top anchor element
|
2020-10-15 18:30:44 +09:00 |
|
Dean Herbert
|
b31a3fbabb
|
Add test
|
2020-10-15 18:11:30 +09:00 |
|
Dean Herbert
|
254eba9008
|
Add and consume skinnable accuracy counter
|
2020-10-15 17:53:16 +09:00 |
|
Dean Herbert
|
90ff8ff050
|
Merge branch 'skinnable-combo-counter' into skinnable-score-display
|
2020-10-15 17:52:06 +09:00 |
|
Dean Herbert
|
37e9f331ad
|
Simplify score font lookup
|
2020-10-15 17:49:55 +09:00 |
|
Dean Herbert
|
43e5cb90e2
|
Merge branch 'skinnable-combo-counter' into skinnable-score-display
|
2020-10-15 17:30:29 +09:00 |
|
Dean Herbert
|
9f51327e4b
|
Fix completely incorrect default positioning logic
|
2020-10-15 17:29:40 +09:00 |
|
Dean Herbert
|
5b5ba7df93
|
Remove unused offset
|
2020-10-15 17:22:34 +09:00 |
|
Dean Herbert
|
d8d085ede9
|
Align top-right elements with lowest point in score display
|
2020-10-15 17:14:42 +09:00 |
|
Dean Herbert
|
74c031cfbb
|
Fix ModOverlay not including "UNRANKED" text in size
|
2020-10-15 17:14:42 +09:00 |
|
Dean Herbert
|
b210147c2e
|
Update combo counter to read from default score display's position correctly
|
2020-10-15 17:14:42 +09:00 |
|
Dean Herbert
|
950c47287c
|
Fix positioning of score display in HUD overlay
|
2020-10-15 17:14:42 +09:00 |
|
Dean Herbert
|
e1da64398e
|
Add and consume skinnable score counter
|
2020-10-15 17:14:42 +09:00 |
|
Dean Herbert
|
219cbec6bd
|
Split out DefaultScoreCounter and make ScoreCounter abstract
|
2020-10-15 16:32:30 +09:00 |
|
Dean Herbert
|
d5f2aab52e
|
Tidy up SkinnableComboCounter class slightly
|
2020-10-15 15:37:40 +09:00 |
|
Dean Herbert
|
e0210f5c4c
|
Ignore failed casts to make tests happy
|
2020-10-14 23:52:58 +09:00 |
|
Dean Herbert
|
e3eaba7b2c
|
Move ISampleDisabler implementation to Player and FrameStabilityContainer
|
2020-10-14 19:39:48 +09:00 |
|
Dean Herbert
|
ac4f56403d
|
Adjust size/position
|
2020-10-14 19:16:34 +09:00 |
|
Dean Herbert
|
7f5ea57bd4
|
Clean-up pass (best effort) on LegacyComboCounter
|
2020-10-14 19:16:34 +09:00 |
|
Dean Herbert
|
9bb8a43bce
|
Combine LegacyComboCounter and ComboCounter classes
|
2020-10-14 19:16:34 +09:00 |
|
Dean Herbert
|
fbbea48c8c
|
Add score text skinnability
|
2020-10-14 19:16:34 +09:00 |
|
Dean Herbert
|
2fce064e32
|
Add basic legacy combo counter and updating positioning logic
|
2020-10-14 19:16:34 +09:00 |
|
Dean Herbert
|
6a6718ebab
|
Allow bypassing origin/anchor setting of skinnable components
It makes little sense to set these when using RelativeSizeAxes.Both
|
2020-10-14 19:16:34 +09:00 |
|
Dean Herbert
|
899bac6ca5
|
Rename catch combo counter for clarity
|
2020-10-14 19:16:34 +09:00 |
|
Dean Herbert
|
f5623ee21e
|
Setup skinnable combo counter component with default implementation
|
2020-10-14 19:16:34 +09:00 |
|
Dean Herbert
|
60603d2918
|
Add skin components and interfaces
|
2020-10-14 19:16:34 +09:00 |
|
Dean Herbert
|
98acf1e31d
|
Make field read only
|
2020-10-14 19:16:25 +09:00 |
|
Dean Herbert
|
a7f8e26e35
|
Adjust bottom-right elements positions based on song progress display
|
2020-10-14 18:51:53 +09:00 |
|
Dean Herbert
|
0cf3e90904
|
Update SongProgress height based on its dynamic height during resize
|
2020-10-14 18:44:22 +09:00 |
|
Dean Herbert
|
ace9fbc8d3
|
Confine available area for HUD components to excluse the song progress area
|
2020-10-14 18:44:22 +09:00 |
|
Dean Herbert
|
de6fe34361
|
Bind to local bindable and combine dual bindings
|
2020-10-11 21:51:48 +09:00 |
|
Dean Herbert
|
5fcdee6fd8
|
Remove cast and expose as IBindable
|
2020-10-11 21:46:55 +09:00 |
|
unknown
|
6a52c98a42
|
make IsBreakTime its own bindable and bind it to BreakTracker on load
|
2020-10-11 06:15:20 +08:00 |
|
unknown
|
7bbdd6ab25
|
expose break time bindable
|
2020-10-10 21:07:17 +08:00 |
|
Dean Herbert
|
8dddd8aff5
|
Merge pull request #9883 from swoolcock/confine-during-gameplay
Add "During Gameplay" option for mouse confining
|
2020-10-08 20:25:27 +09:00 |
|
Dean Herbert
|
dbdb25ccf7
|
Move reset logic to OsuGame
|
2020-10-08 18:29:19 +09:00 |
|
Dean Herbert
|
43a575484a
|
Remove pointless comments
|
2020-10-08 18:29:09 +09:00 |
|
Dean Herbert
|
0f6eb9d4cb
|
Ensure music playback is stopped when retrying by any means
|
2020-10-07 17:40:54 +09:00 |
|
Shane Woolcock
|
2e0a9f53c1
|
Add test coverage
|
2020-10-07 17:52:39 +10:30 |
|
Shane Woolcock
|
8b8eb00bd7
|
Permit nulls rather than casting to OsuGame
|
2020-10-07 16:16:58 +10:30 |
|
Shane Woolcock
|
485bd962c7
|
Also reset LocalUserPlaying in OnSuspending
|
2020-10-07 16:15:17 +10:30 |
|
Shane Woolcock
|
7fff762dfc
|
Rename IsGameplay
|
2020-10-07 16:14:49 +10:30 |
|
Shane Woolcock
|
8847b88e65
|
Fix unit tests trying to resolve OsuGame
|
2020-10-07 11:44:41 +10:30 |
|
Shane Woolcock
|
ec12a21088
|
Merge branch 'master' into confine-during-gameplay
# Conflicts:
# osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
|
2020-10-07 11:07:00 +10:30 |
|
Shane Woolcock
|
478f2dec96
|
Maintain the current gameplay state in OsuGame
|
2020-10-06 22:39:35 +10:30 |
|
Shane Woolcock
|
782fc1d60f
|
Use OsuGame.OverlayActivationMode rather than per-Player
|
2020-10-06 20:27:35 +10:30 |
|
Dean Herbert
|
d5782c95bd
|
Merge branch 'master' into confine-during-gameplay
|
2020-10-06 18:05:15 +09:00 |
|
Dean Herbert
|
9d7880afda
|
Make SettingsItem conform to IHasCurrentValue
|
2020-10-06 17:18:54 +09:00 |
|
Dean Herbert
|
e4710f82ec
|
Fix sample disabled status not being updated correctly from seek state
|
2020-10-05 14:27:51 +09:00 |
|
Shane Woolcock
|
a483dfd2d7
|
Allow confineMouseTracker to be null
|
2020-10-05 11:54:39 +10:30 |
|
Shane Woolcock
|
5859755886
|
Use current OverlayActivationMode to determine confine logic
|
2020-10-05 11:11:46 +10:30 |
|
Shane Woolcock
|
4b6f893408
|
Merge branch 'master' into confine-during-gameplay
# Conflicts:
# osu.Game/Configuration/OsuConfigManager.cs
# osu.Game/OsuGame.cs
# osu.Game/Screens/Play/Player.cs
|
2020-10-05 10:23:37 +10:30 |
|
Bartłomiej Dach
|
6f2b991b32
|
Ensure true gameplay rate is finite when paused externally
|
2020-10-04 14:54:51 +02:00 |
|