Jamie Taylor
e6449db8e3
Null metrics on null beatmap for transition animation
2019-03-13 14:13:42 +09:00
Dean Herbert
f4c505709a
Use parsing methods in more places
...
Limiting scope to beatmap decoding for this pass. Can expand to skin/storyboard in the future.
2019-03-13 13:56:31 +09:00
Dean Herbert
f8b5cf8c8e
Add extra clamping of endTime to startTime
2019-03-13 13:46:41 +09:00
Dean Herbert
b1f18481e0
Show text to supporters telling them they're cool
...
Also adds better tests for disclaimer screen.
2019-03-13 12:58:42 +09:00
Dean Herbert
f0114d776d
Use interface to access API
...
Allows for better testability.
2019-03-13 12:58:18 +09:00
Dan Balasescu
a35d9ccc09
Apply clamping suggestion
...
Co-Authored-By: peppy <pe@ppy.sh>
2019-03-13 12:35:05 +09:00
Dean Herbert
93b774104a
Fix NaN handling
2019-03-13 11:30:33 +09:00
Dean Herbert
73d9aef5bd
Fix filename
2019-03-12 20:38:04 +09:00
Dean Herbert
cc09ecbfcf
Increase validation performed on .osu files to avoid hard crashes
2019-03-12 20:31:15 +09:00
David Zhao
7eb253b687
Fix incorrect scale duration
2019-03-12 19:44:53 +09:00
David Zhao
3b3b1e51ee
Move hit animation logic into virtual method
2019-03-12 19:41:33 +09:00
David Zhao
9850122245
Fix incorrect delay
2019-03-12 19:24:46 +09:00
David Zhao
12f334035f
Create properties for use in DrawableManiaJudgement
2019-03-12 19:23:24 +09:00
Dean Herbert
a10cd2288d
Improve ModRamp's handling of external rate changes
2019-03-12 18:15:18 +09:00
Dean Herbert
6832e384a9
Simplify DT/HT/NC/DC
2019-03-12 18:14:41 +09:00
Dean Herbert
c1a356161f
Allow use rate adjust to fallback to clock rate adjust
2019-03-12 18:14:01 +09:00
Dean Herbert
3c2d8cad0a
Add better async logic for ScreenWithBeatmapBackground
2019-03-12 17:32:40 +09:00
Dean Herbert
8230d5b52e
Ensure initial blur is set on song select background creation
...
We do not want the blur transition to play here
2019-03-12 17:27:20 +09:00
Dean Herbert
ee7169a629
Use new non-immediate suspend logic in BackgroundScreenStack
2019-03-12 17:26:16 +09:00
Dan Balasescu
e6e0cf1957
Merge branch 'master' into direct-stats-offset
2019-03-12 16:17:36 +09:00
smoogipoo
059397ac50
Remove unnecessary early return for maching beatmap IDs
2019-03-12 14:40:13 +09:00
Dan Balasescu
05358fa458
Merge branch 'master' into ensure-import-sanity
2019-03-12 14:24:07 +09:00
Dean Herbert
00feb34a3d
Perform load even if default beatmap
2019-03-12 14:02:49 +09:00
Dean Herbert
1954eaca4c
Populate an initial beatmap
2019-03-12 14:01:27 +09:00
Dan Balasescu
c92ecc4808
Merge branch 'master' into 4439-alternative
2019-03-12 13:07:06 +09:00
Dean Herbert
cc41618760
Reorganise class
2019-03-12 12:56:01 +09:00
Dean Herbert
5ba8388e54
Add load check to avoid double-loading
2019-03-12 12:55:54 +09:00
Dan Balasescu
448e3da429
Merge branch 'master' into fix-direct-queries
2019-03-12 12:47:33 +09:00
Joehu
ad3b956cec
Fix channel selection overlay dimming bg forever when popped out
2019-03-11 20:10:59 -07:00
Dan Balasescu
61ba39d89f
Merge branch 'master' into fix-direct-queries
2019-03-12 12:02:17 +09:00
Dean Herbert
cdeaa80fea
Call ResetSpeedAdjustments before adjusting clock
2019-03-12 11:35:25 +09:00
Dean Herbert
13b3036ec6
Fix "wind" mods adjusting rate twice
...
This is a hotfix for incorrect framework behaviour.
Closes #4442
2019-03-12 02:45:45 +09:00
Dean Herbert
1be4c7b813
Fix excess newline
2019-03-12 02:23:23 +09:00
Dean Herbert
38e75421ab
Fix HoldForMenuButton getting stuck in a confirming state
...
Closes #4446 .
2019-03-12 02:21:34 +09:00
Dean Herbert
941a72d69a
Fix osu!direct firing excess queries during initial search characters
...
Due to faulty debounce fire logic, a web request would always fire with a single character search, followed by the real search. This caused unwanted delays and display weirdness.
2019-03-12 01:49:47 +09:00
Dean Herbert
e9ab329e93
Fix backgrounds not correctly handling initial async load
2019-03-12 00:05:05 +09:00
Dean Herbert
81d9e391f4
Preload main menu background
2019-03-12 00:04:19 +09:00
Dean Herbert
59897bbeb5
Refactor UpdateableBeatmapBackground lookup logic for clarity
...
Closes #4401 . Alternative to #4439 .
2019-03-11 19:00:39 +09:00
Dean Herbert
d0ae75af6e
Add tests and fix scenario where all matching are contained by duplicate candidate
2019-03-11 18:13:33 +09:00
Dean Herbert
3a8c32d41b
Add the ability for ArchiveModelManager to re-import even when existing entry is present
2019-03-11 17:04:18 +09:00
Dean Herbert
63fea65c0c
Clarify repeat index
2019-03-11 14:53:21 +09:00
Dean Herbert
489153579a
Add xmldoc and clarify struct variables
2019-03-11 14:36:29 +09:00
Dean Herbert
2029cf93fd
Rename and reuse variables
2019-03-11 14:33:21 +09:00
Dean Herbert
26f78b659b
Merge remote-tracking branch 'upstream/master' into extract-slider-tick-creation
2019-03-11 14:31:12 +09:00
Joehu
0fc6fa7245
Fix file naming on ParticipantCountDisplay
2019-03-09 20:29:56 -08:00
Joehu
7311ccabfb
Fix direct panel stats being misaligned by one pixel
2019-03-08 20:27:50 -08:00
Dean Herbert
9df27f3a5f
Merge branch 'master' into prevent-null-lookup
2019-03-09 11:14:54 +09:00
Albert Tang
7f30fce3fe
Merge branch 'master' into android
2019-03-08 10:39:24 -06:00
Dean Herbert
10734b774c
Update framework
2019-03-08 20:48:50 +09:00
Dean Herbert
c6194d5487
Merge branch 'master' into extract-slider-tick-creation
2019-03-08 20:40:03 +09:00
Dean Herbert
48e54c84c1
Merge branch 'master' into mod-wind
2019-03-08 20:23:02 +09:00
Dean Herbert
28a1baa07e
Merge branch 'extract-slider-tick-creation' of https://github.com/peppy/osu into extract-slider-tick-creation
2019-03-08 20:13:58 +09:00
Dean Herbert
93a999396e
LegacyFinalTick -> LegacyLastTick to match existing variable
2019-03-08 20:13:11 +09:00
Dean Herbert
f59b9e933e
Merge branch 'master' into extract-slider-tick-creation
2019-03-08 20:00:12 +09:00
Dean Herbert
355705f0a5
Fix legacy tick handling
2019-03-08 19:57:30 +09:00
Jamie Taylor
8e5816805c
Fix showing outdated data for non-online beatmaps
2019-03-08 18:44:35 +09:00
Jamie Taylor
800007c378
Set DummyWorkingBeatmap difficulties to 0 for better fallback display
2019-03-08 18:17:50 +09:00
smoogipoo
d055b248ac
Remove blank line
2019-03-08 15:56:36 +09:00
smoogipoo
7c5ca67691
Merge remote-tracking branch 'origin/master' into gameplay-clock-container
...
# Conflicts:
# osu.Game/Screens/Play/Player.cs
2019-03-08 15:54:15 +09:00
Dean Herbert
973f29b765
Apply review
2019-03-08 15:14:57 +09:00
Dan Balasescu
c967875ff6
Merge branch 'master' into fix-non-async-load
2019-03-08 15:14:37 +09:00
smoogipoo
e00702f4e4
Merge remote-tracking branch 'origin/master' into fix-non-async-load
2019-03-08 15:14:14 +09:00
smoogipoo
09b5cf4891
Move sizing to ctor
2019-03-08 15:14:07 +09:00
Dean Herbert
ed8c9bc88a
Merge remote-tracking branch 'upstream/master' into gameplay-clock-container
2019-03-08 15:07:55 +09:00
Dean Herbert
42efea1e06
Apply review
2019-03-08 15:05:45 +09:00
Dean Herbert
a73e3d9700
Move cursor construction to BDL
2019-03-08 15:01:45 +09:00
Dean Herbert
2c98ba1c0c
Split out consumption and creation into two separate code paths
2019-03-08 14:59:45 +09:00
Dean Herbert
3ccc76e18f
Merge remote-tracking branch 'upstream/master' into cursor-in-playfield
2019-03-08 14:50:46 +09:00
Dean Herbert
551380dd42
Extract slider tick creation so it can be shared with osu!catch
2019-03-08 14:46:26 +09:00
Dan Balasescu
969d5bcbd0
Merge branch 'master' into fix-roomstate-on-cancel
2019-03-08 14:10:24 +09:00
Dean Herbert
400514630d
Fix incomplete comment
2019-03-08 12:44:33 +09:00
Dan Balasescu
d1c18c52ab
Merge branch 'master' into fix-cursor-in-scale-container
2019-03-08 12:43:57 +09:00
Dean Herbert
c4cc72cad9
Merge pull request #4437 from peppy/fix-resharper-inspection
...
Fix stuck r# inspection
2019-03-08 12:43:17 +09:00
Jamie Taylor
08fc42f8e9
Merge branch 'master' into fix-roomstate-on-cancel
2019-03-08 12:39:29 +09:00
Dean Herbert
75e94eba35
Merge branch 'master' into gameplay-clock-container
2019-03-08 12:32:48 +09:00
Dean Herbert
5ade51f030
Merge branch 'master' into fix-resharper-inspection
2019-03-08 12:29:56 +09:00
Dean Herbert
30a0bb4a25
Merge branch 'master' into fix-duplicate-bg-sprites
2019-03-08 12:25:23 +09:00
Dean Herbert
d01b026ebd
Fix stuck r# inspection
2019-03-08 12:16:12 +09:00
Dean Herbert
075ea70124
Move more toolbar to async load
2019-03-08 12:15:27 +09:00
Dean Herbert
11e5c6a2a0
Fire initial APIStateChanged on local thread
2019-03-08 12:15:27 +09:00
Dan Balasescu
101009c92e
Merge branch 'master' into fix-autoplay-tests
2019-03-08 12:14:40 +09:00
Dean Herbert
27edc41c11
Update framework
2019-03-07 20:14:43 +09:00
Dean Herbert
5ab9f45a8f
Merge branch 'drawnode-changes'
2019-03-07 20:10:42 +09:00
Dean Herbert
7fa84335ce
Merge branch 'line-graph-fix'
2019-03-07 20:10:11 +09:00
Dean Herbert
1f44dde96b
Fix autoplay tests not working
2019-03-07 18:34:56 +09:00
smoogipoo
04d756524d
Adjust with shader changes
2019-03-07 18:30:18 +09:00
smoogipoo
e430b8a640
Merge remote-tracking branch 'nekodex/master' into drawnode-changes
2019-03-07 18:15:12 +09:00
David Zhao
b3e046c4d1
Rename PathWidth to PathRadius
2019-03-07 17:39:19 +09:00
David Zhao
b2f4850275
Apply twice the line radius in order to properly account for diameter
2019-03-07 17:25:51 +09:00
Jamie Taylor
c34e110a2c
Merge remote-tracking branch 'upstream/master' into fix-roomstate-on-cancel
2019-03-07 17:01:24 +09:00
Jamie Taylor
054db48089
Move online id null check to only bypass metrics lookup
2019-03-07 16:59:43 +09:00
Jamie Taylor
50c1b3a576
Move room resetting logic from MatchSubScreen to LoungeSubScreen
2019-03-07 16:49:48 +09:00
Jamie Taylor
e5e454ddcd
Don't perform lookup of beatmap stats unless an online id is present
2019-03-07 16:17:12 +09:00
Dan Balasescu
ae4ca2cb66
Merge branch 'master' into fix-duplicate-bg-sprites
2019-03-07 16:11:33 +09:00
Dean Herbert
64b6eaa844
Simplify inward bindings
2019-03-07 16:04:11 +09:00
Dean Herbert
58ef397f4f
Move all clock related gameplay logic inside GameplayClockContainer
2019-03-07 16:02:24 +09:00
Dan Balasescu
7783c33398
Merge branch 'master' into fix-mp-chat-in-own-room
2019-03-07 15:59:53 +09:00
Jamie Taylor
ee076bbbe3
Fix chat channel ids not being updated on room creation
2019-03-07 15:35:57 +09:00
Jamie Taylor
e13516c2ba
Only attempt to restore CurrentItem state if present
2019-03-07 14:09:28 +09:00
David Zhao
d97c070ef1
Account for path width correctly in LineGraph
2019-03-07 13:45:55 +09:00
Jamie Taylor
6e5ea78ca2
Fix some nullref crashes when escaping out of new room creation
2019-03-06 20:03:37 +09:00
Jamie Taylor
5de6e29294
Reset currentRoom state when cancelling room creation
2019-03-06 20:03:37 +09:00
Jamie Taylor
ab0ac7a82a
Pass through timeBeforeLoad instead of hardcoding
2019-03-06 19:12:37 +09:00
Jamie Taylor
06b65e00c4
Prevent null beatmap from creating an extra drawable
2019-03-06 19:12:28 +09:00
Jamie Taylor
eb80549782
Fix UpdateableBeatmapBackgroundSprite not disposing of previously loaded sprites
2019-03-06 19:12:22 +09:00
Dean Herbert
ffe53411f6
Add back cursor proxying
2019-03-06 17:44:58 +09:00
Dean Herbert
62716851a1
Revert some unnecessary changes
2019-03-06 17:41:54 +09:00
Dean Herbert
7aa30ca3f6
Change method of cursor creation
2019-03-06 17:41:54 +09:00
Dean Herbert
acf518c208
Move cursor inside playfield
2019-03-06 17:41:54 +09:00
Dean Herbert
5411c63093
Fix menu cursor not displaying outside of gameplay scaling area
2019-03-06 17:14:08 +09:00
Dean Herbert
2300e59e91
Formatting and simplification
2019-03-06 14:19:00 +09:00
Dean Herbert
d70b373af9
Merge branch 'master' into mod-wind
2019-03-06 14:04:04 +09:00
Dean Herbert
9441f88033
Use actual reference to default beatmap for fallback
...
Co-Authored-By: nyquillerium <nyquill@ppy.sh>
2019-03-06 13:01:37 +09:00
Dean Herbert
b94d080b1c
Merge branch 'master' into LobbyList
2019-03-06 12:34:36 +09:00
tangalbert919
1e6cb3e7d8
Merge remote-tracking branch 'upstream/master' into android
2019-03-05 17:56:13 -06:00
tangalbert919
999b947153
Update Android csproj files
2019-03-05 17:55:18 -06:00
Dean Herbert
6b042eae94
Merge branch 'master' into fix-cursor-in-scale-container
2019-03-05 22:22:56 +09:00
Dean Herbert
8a6fa0915e
Merge branch 'master' into simplify-gameplay-clock
2019-03-05 20:22:46 +09:00
Dean Herbert
558dbafb71
Use a safer method of setting the clock
2019-03-05 20:14:04 +09:00
Dean Herbert
d5943330b1
Fix potential infinite loop
2019-03-05 20:06:04 +09:00
Dean Herbert
76ce3954a0
Rename PauseContainer
2019-03-05 19:30:55 +09:00
David Zhao
89987210c3
Merge remote-tracking branch 'upstream/master' into LobbyList
2019-03-05 18:59:38 +09:00
David Zhao
34b2553b95
Remove redundant boolean
2019-03-05 18:59:25 +09:00
Dan Balasescu
fafc80818c
Fix typo
...
Co-Authored-By: peppy <pe@ppy.sh>
2019-03-05 18:50:46 +09:00
Dean Herbert
f98d55531f
Add documentation for FetchScores
2019-03-05 18:48:59 +09:00
Nathan Alo
2a741d5853
Merge branch 'master' into local-leaderboard-display
2019-03-05 17:43:28 +08:00
Dean Herbert
424e02f165
Merge pull request #4411 from smoogipoo/fix-custom-sample-volume
...
Fix volume not being considered for file samples
2019-03-05 18:41:52 +09:00
LeNitrous
8ad258f426
only check IsLoggedIn after requesting scores
2019-03-05 17:34:23 +08:00
Dean Herbert
5aaa2511eb
Merge pull request #4374 from Joehuu/status-direct-list
...
Add beatmap status on direct list panels
2019-03-05 18:22:56 +09:00
smoogipoo
a08086cc8a
Fix volume not being considered for file samples
2019-03-05 18:21:29 +09:00
smoogipoo
aefaceb397
Merge remote-tracking branch 'origin/master' into show-mods-on-loader
2019-03-05 18:08:11 +09:00
Dean Herbert
fc0b297232
Fix menu cursor not displaying outside of gameplay scaling area
2019-03-05 18:06:24 +09:00
smoogipoo
c06dac5b1a
Remove null check (beatmap cannot be null)
2019-03-05 17:58:30 +09:00
smoogipoo
2fee7276ae
Combine creation + assignment
2019-03-05 17:58:05 +09:00
Dan Balasescu
bb6c83ab25
Merge branch 'master' into show-mods-on-loader
2019-03-05 17:46:35 +09:00
Dan Balasescu
8e99f54fed
Merge branch 'master' into update-beatmap-sections
2019-03-05 17:39:47 +09:00
Dan Balasescu
fd147dae21
Merge branch 'master' into fix-disabled-set-crash
2019-03-05 17:25:13 +09:00
smoogipoo
d01ec59acb
Fix sizings
2019-03-05 17:14:49 +09:00
smoogipoo
e73cef5f94
Prefill some more properties of TestWorkingBeatmap
2019-03-05 17:14:24 +09:00
David Zhao
52558c5cf6
Fix metadata potentially being null
2019-03-05 16:59:02 +09:00
David Zhao
166a8c8bbb
Add back fallback behavior for match creation
2019-03-05 16:41:59 +09:00
Dean Herbert
9a9b4efb8d
Fix excess line
2019-03-05 16:41:11 +09:00
Dean Herbert
93c79023dc
Merge remote-tracking branch 'upstream/master' into simplify-gameplay-clock
2019-03-05 16:41:01 +09:00
Dean Herbert
ec063a13db
Update RulesetInputManager to support new clock structure more accurately
2019-03-05 16:34:50 +09:00
smoogipoo
76aca738a9
Revert "Use same size labels from song select"
...
This reverts commit 7077e405ab
2019-03-05 16:02:07 +09:00
David Zhao
11e353c152
Use local class instead of having a separate file
2019-03-05 15:55:37 +09:00
David Zhao
fc62877fdc
Fall back to default background
2019-03-05 15:51:43 +09:00
Dan Balasescu
b5fb6e2a59
Merge branch 'master' into limit-blank-lines
2019-03-05 15:40:11 +09:00
David Zhao
7c53c7b602
Remove local background logic
2019-03-05 15:33:39 +09:00
Dan Balasescu
07c7d03a04
Merge branch 'master' into move-osu-settings
2019-03-05 15:32:54 +09:00
