Dean Herbert
fc66476107
Merge branch 'master' into dont-throw-on-missing-drawings
2021-07-30 13:10:03 +09:00
Dan Balasescu
804494e211
Merge pull request #14061 from bdach/colour-picker-integration
...
Integrate editor colour display with colour picker & popover
2021-07-30 12:24:31 +09:00
Bartłomiej Dach
c8891d4504
Integrate editor colour display with colour picker & popover
2021-07-29 23:14:37 +02:00
Bartłomiej Dach
0691c0dd63
Switch Colour{Display,Palette} to use Colour4
2021-07-29 23:14:32 +02:00
Bartłomiej Dach
59a33b5d02
Uncouple display logic from text in rankings overlay tables
2021-07-29 22:23:47 +02:00
Bartłomiej Dach
e3e36e0a12
Merge pull request #14050 from peppy/fix-api-request-abort
...
Fix aborting an `APIRequest` potentially resulting in incorrect success
2021-07-29 22:23:16 +02:00
Bartłomiej Dach
cbc504c1ed
Merge branch 'master' into fix-api-request-abort
2021-07-29 21:29:57 +02:00
Bartłomiej Dach
431be5b5c1
Merge pull request #14059 from peppy/tournament-lookup-ruleset
...
Resolve ruleset from store after loading tournament ladder
2021-07-29 21:00:55 +02:00
Bartłomiej Dach
9a59305dd9
Merge branch 'master' into tournament-lookup-ruleset
2021-07-29 20:20:05 +02:00
Bartłomiej Dach
6603ad33e9
Merge pull request #14057 from peppy/fix-stack-overflow-tournament-ruleset
...
Fix potential stack overflow in ruleset change rejection logic
2021-07-29 19:57:41 +02:00
Dean Herbert
77b354bfba
Resolve ruleset from store after loading tournament ladder
2021-07-30 02:12:03 +09:00
Dean Herbert
ceec74aaca
Avoid throwing / logging an error when drawings.txt is missing
2021-07-30 02:00:07 +09:00
Dean Herbert
46c72334fb
Fix stack overflow in ruleset change rejection logic
2021-07-30 01:54:30 +09:00
Dean Herbert
0b8ca667a9
Add failing test coverage of loading with an unavailable ruleset
2021-07-30 01:53:25 +09:00
Dean Herbert
5c5e33f4d7
Split out common logic for tournament game host tests
2021-07-30 01:53:08 +09:00
Dean Herbert
f9814a66cb
Merge pull request #14041 from Henry-YSLin/mod-muted
...
Add a mod that mutes the audio track
2021-07-29 23:44:06 +09:00
Henry Lin
daefea9221
Merge branch 'master' into mod-muted
...
# Conflicts:
# osu.Game/Overlays/MusicController.cs
2021-07-29 21:24:09 +08:00
Henry Lin
888e8f1c80
Use shared metronome class
2021-07-29 21:18:07 +08:00
Dan Balasescu
b0bd4ef794
Merge pull request #14052 from Henry-YSLin/music-controller-reset-all-adjustments
...
Reset all types of adjustments in `MusicController.ResetTrackAdjustments`
2021-07-29 22:17:34 +09:00
Henry Lin
7251c28c4a
Merge branch 'master' into mod-muted
2021-07-29 21:14:03 +08:00
ekrctb
a204ef39dd
Prevent catcher trail generation while rewinding
2021-07-29 17:32:38 +09:00
ekrctb
81f23e1111
Manage catcher trails by lifetime entries
2021-07-29 17:12:01 +09:00
Dean Herbert
5fc699de99
Merge pull request #14051 from Henry-YSLin/extract-target-mod-metronome
...
Extract metronome from `OsuModTarget`
2021-07-29 17:01:17 +09:00
Henry Lin
89e8296eb1
Reset all types of adjustments in MusicController; Rename AllowRateAdjustments to AllowTrackAdjustments
2021-07-29 15:39:26 +08:00
Henry Lin
935984d200
Rename MetronomeBeatContainer to Metronome
2021-07-29 15:17:21 +08:00
Henry Lin
0196141335
Remove unused constants
2021-07-29 14:52:40 +08:00
Henry Lin
18e760ee91
Extract metronome from OsuModTarget
2021-07-29 14:52:18 +08:00
Henry Lin
0620cd130e
Change mod description
2021-07-29 14:41:47 +08:00
Dean Herbert
c67c763a92
Merge pull request #14030 from Game4all/update-framework-changes
...
Update `TableContainer` usages in line with framework changes
2021-07-29 15:36:15 +09:00
Dean Herbert
3a5324c947
Fix aborting an APIRequest potentially resulting in incorrect success
2021-07-29 13:01:52 +09:00
Dan Balasescu
2a94fc214f
Merge pull request #14046 from peppy/fix-rapid-reconnection
...
Fix `HubClientConnector` reconnecting with no delay on server-triggered error
2021-07-29 01:52:21 +09:00
Lucas A
fbd02dc830
Update framework.
2021-07-28 18:24:29 +02:00
Henry Lin
e89f33483d
Code formatting fixes
2021-07-28 21:52:01 +08:00
smoogipoo
89f0739a4a
Update with framework changes
2021-07-28 21:54:11 +09:00
Dan Balasescu
5144bf8354
Merge pull request #14045 from peppy/avoid-unnecessary-error-deserialisation
...
Avoid deserialisation JSON request content when error is not present (or not relevant)
2021-07-28 20:58:46 +09:00
Dean Herbert
607da5143e
Merge pull request #14016 from ggliv/osu-mod-mirror
...
Add "Mirror" mod
2021-07-28 20:57:30 +09:00
Dean Herbert
681fe3042d
Merge pull request #14039 from ekrctb/catch-trail-naming
...
Use "hyper-dash after-image" terminology consistently
2021-07-28 20:57:02 +09:00
Dean Herbert
cd2a1af6de
Fix HubClientConnector reconnecting with no delay on server-triggered error
2021-07-28 20:46:02 +09:00
Dean Herbert
1ed4fdd5f5
Avoid deserialisation JSON request content when error is not present (or not relevant)
2021-07-28 20:13:40 +09:00
Henry Lin
22d83c75e3
Revert imports re-ordering
...
Out of the scope of this PR
2021-07-28 18:32:38 +08:00
Henry Lin
58bbe9db7e
Added muted mod
2021-07-28 18:21:08 +08:00
Dean Herbert
4a4d9b0dc6
Update description to match mania mirror implementation
2021-07-28 19:20:40 +09:00
ekrctb
90f3611ed0
Replace "sprite" variable names in CatcherTrailDisplay
...
The `CatcherTrail` was originally named `CatcherTrailSprite`, but it is not a sprite anymore.
2021-07-28 19:11:22 +09:00
ekrctb
a960a28d06
Replace "end glow" terminology with "hyper-dash after-image"
...
Because the is "end glow" is when a hyper-dash is *started*, the name was confusing.
The "after-image" was already used in the code as a synonym of "end glow" inconsistently.
2021-07-28 19:11:22 +09:00
Dean Herbert
2b107d624a
Merge pull request #14024 from ekrctb/trail-generation
...
Move catcher trail generation logic to `CatcherArea` to remove mutual dependency of `Catcher` and `CatcherTrailDisplay`
2021-07-28 19:06:44 +09:00
ekrctb
0bf04ece34
Avoid internal property by using ChildrenOfType
2021-07-28 18:13:43 +09:00
Gabe Livengood
712bc578dc
update setting name and description
2021-07-27 17:45:52 -04:00
Bartłomiej Dach
239b38a0ab
Reduce implicit conversions by using default
2021-07-27 21:46:29 +02:00
Lucas A
94877117b9
Apply changes in-line with framework changes.
2021-07-27 18:22:47 +02:00
Salman Ahmed
5cb02002d7
Fix flipped xmldoc
2021-07-27 18:24:17 +03:00
