Dean Herbert
fe255c54d0
Merge pull request #4496 from smoogipoo/reinstantiate-mods
...
Fix mods being reused for difficulty calculation
2019-03-20 19:10:52 +09:00
David Zhao
fbfef844de
Add test case for resuming PlayerLoader
2019-03-20 17:18:42 +09:00
David Zhao
a5916f995e
Use the previous conditional instead
2019-03-20 16:54:42 +09:00
David Zhao
e9034c8a30
Move blurring logic into Update instead
2019-03-20 16:50:47 +09:00
smoogipoo
c510385aa8
Remove unnecessary allocations
2019-03-20 16:46:16 +09:00
smoogipoo
6df275c83a
Use fresh mods for each difficulty calculation iteration
2019-03-20 16:37:25 +09:00
Dean Herbert
13e2d6a340
Merge branch 'master' into fix-spinner-conversion
2019-03-20 16:32:44 +09:00
Dean Herbert
f43e7a880c
Merge remote-tracking branch 'upstream/master' into pause-logic-simplification
2019-03-20 15:27:06 +09:00
David Zhao
1086688e0a
Fix variable hiding
2019-03-20 15:13:59 +09:00
David Zhao
f670e4664d
Amend comment
2019-03-20 15:06:07 +09:00
David Zhao
2467ece020
store a field
2019-03-20 14:58:32 +09:00
Dean Herbert
6f1610be79
Merge branch 'master' into ruleset-container-refactor
2019-03-20 14:55:58 +09:00
David Zhao
86658e357b
Override add instead
2019-03-20 14:55:52 +09:00
Dean Herbert
c186629b8a
Reorder class
2019-03-20 14:55:38 +09:00
Dean Herbert
5f288650bf
Fix misses/typos
2019-03-20 14:49:33 +09:00
David Zhao
9964644683
Fix merge
2019-03-20 14:37:32 +09:00
Dan Balasescu
aca99c2c42
Merge branch 'master' into player-test-flexibility
2019-03-20 14:31:33 +09:00
David Zhao
2646126d86
Merge remote-tracking branch 'upstream/master' into visual-settings-container
2019-03-20 14:29:20 +09:00
David Zhao
15637f9c4a
Rework instant blur logic such that updateVisuals doesn't need to be public
2019-03-20 14:17:35 +09:00
smoogipoo
6511234804
Fix catch spinners not being allowed for conversion
2019-03-20 13:53:22 +09:00
Joehu
1f95abf7c7
Fix regressions caused by removing specified depths
...
- urgentOverlayContent is added so toolbar can be loaded first
2019-03-19 21:30:24 -07:00
Joehu
a39648edbc
Normalize format of single line curly brackets
2019-03-19 20:51:43 -07:00
Joehu
44e0291737
Remove specified depths of overlays
2019-03-19 20:47:12 -07:00
Dean Herbert
936c3e1ed9
Add safety type check to DrawableScrollingRuleset
2019-03-20 11:34:06 +09:00
Dean Herbert
45b8bfcfd3
Better protect not-generic DrawableRuleset
2019-03-20 11:31:03 +09:00
Dean Herbert
7b6d882ce6
Remove double-generic type
2019-03-20 11:29:16 +09:00
Dan Balasescu
e5db0c973e
Merge branch 'master' into fix-background-loading
2019-03-20 11:25:23 +09:00
Dean Herbert
3b7a76aa4e
Fix typo
2019-03-20 11:22:34 +09:00
Dean Herbert
7b65d3437f
Merge branch 'master' into fix-background-loading
2019-03-20 10:33:53 +09:00
Dean Herbert
5b6ac7abdc
Merge remote-tracking branch 'upstream/master' into pause-logic-simplification
2019-03-20 10:31:42 +09:00
Dean Herbert
461a0a5038
Merge branch 'master' into remove-unnecessary-code
2019-03-20 10:22:24 +09:00
Dean Herbert
e0ab40b082
Rename missed files
2019-03-19 23:56:12 +09:00
Dean Herbert
baea7230bc
Rename RulesetContainer to DrawableRuleset
2019-03-19 23:47:31 +09:00
Dean Herbert
9ca6699c64
Merge remote-tracking branch 'upstream/master' into player-test-flexibility
2019-03-19 20:33:39 +09:00
Dean Herbert
68f28326a2
Refactor RulesetContainer for readability
2019-03-19 20:21:31 +09:00
David Zhao
a1000524ee
Merge branch 'master' into visual-settings-container
2019-03-19 20:17:12 +09:00
David Zhao
a8e2072286
Make blurtarget private, improve documentation
2019-03-19 20:15:28 +09:00
Dean Herbert
def15645f7
Update framework
2019-03-19 17:32:36 +09:00
Dean Herbert
025a266112
Update framework
2019-03-19 17:02:03 +09:00
Dean Herbert
e36ad3eb6b
Add initial alpha in case
2019-03-19 16:11:22 +09:00
Dean Herbert
d2007cfb38
Fix weird transition
2019-03-19 16:10:28 +09:00
Dean Herbert
83f3d3abde
Merge remote-tracking branch 'upstream/master' into disclaimer-support-text
2019-03-19 16:02:34 +09:00
Dean Herbert
3327e2841a
Merge branch 'master' into fix-background-loading
2019-03-19 16:00:09 +09:00
David Zhao
dc26e90a8d
Remove unused usings
2019-03-19 13:16:06 +09:00
David Zhao
df37973e84
Move showstoryboard into player
2019-03-19 13:13:19 +09:00
David Zhao
27a92e017c
rename back to UserDimContainer
2019-03-19 13:06:14 +09:00
David Zhao
f1b2073bf6
Merge remote-tracking branch 'upstream/master' into visual-settings-container
2019-03-19 13:01:05 +09:00
Dean Herbert
4390e163fc
Merge branch 'master' into storyboard-clock
2019-03-18 21:11:41 +09:00
Dean Herbert
4f075f4740
Add more comprehensive testing
2019-03-18 20:33:43 +09:00
Dean Herbert
9433a97747
Add resume requesting support and fix exit scenarios
2019-03-18 20:33:43 +09:00
Dean Herbert
536b5e0dab
Remove PausableGameplayContainer
2019-03-18 20:33:43 +09:00
Dean Herbert
f13003c53b
Simplify and localise storyboard logic in Player.cs
2019-03-18 20:33:43 +09:00
Dean Herbert
bcaff9f7b4
Add basic pause tests
2019-03-18 20:33:43 +09:00
Dean Herbert
465c95e952
Refactor pause logic so GameplayClockContainer is in control
2019-03-18 20:33:43 +09:00
Dean Herbert
15dd132c92
Use SetUpSteps attribute
2019-03-18 20:32:36 +09:00
Dean Herbert
a81461ba12
Add ability to test without nofail enabled
2019-03-18 20:32:28 +09:00
David Zhao
acc133896b
Correct null check
2019-03-18 18:19:59 +09:00
Dean Herbert
8df47bc23e
Increase flexibility of player test cases
2019-03-18 17:09:48 +09:00
David Zhao
05147768d3
Permit nulls
2019-03-18 15:50:34 +09:00
David Zhao
6a26972284
DI gameplay clock for Storyboards
2019-03-18 15:25:54 +09:00
Dean Herbert
14df9f94e2
Merge branch 'master' into fix-background-loading
2019-03-18 14:59:35 +09:00
David Zhao
0024a0bdb2
Remove unused using
2019-03-18 14:35:03 +09:00
David Zhao
eac7672c6b
Clean up debug logging
2019-03-18 14:03:54 +09:00
Dean Herbert
392a0a1d74
Merge branch 'master' into update-framework
2019-03-18 11:34:59 +09:00
Dan Balasescu
e0b3149e32
Merge branch 'master' into api-testability
2019-03-18 10:59:06 +09:00
Dean Herbert
9ca4d9d4d1
Remove regions
2019-03-18 10:48:44 +09:00
Dean Herbert
300cb70859
Merge branch 'master' into multi-background-stack
2019-03-18 09:54:27 +09:00
Dean Herbert
c496f6e56b
Fix usages of OnLoadComplete
2019-03-17 13:44:20 +09:00
Dean Herbert
771d676ba1
Split RulesetInputManager out to FrameStabilityContainer
2019-03-17 13:30:52 +09:00
Dean Herbert
8c6caf0b18
Update framework
2019-03-16 01:38:42 +09:00
Dean Herbert
14af957599
Merge pull request #4468 from smoogipoo/fix-min-tick-distance
...
Fix ticks not being generated at the minimum tick distance
2019-03-15 12:12:48 +09:00
Dean Herbert
36e5c09710
Merge pull request #4433 from nekodex/prevent-null-lookup
...
Don't perform lookup of beatmap stats unless an online id is present
2019-03-15 10:39:39 +09:00
Joehu
e31680e373
Address styling issues on CodeFactor
2019-03-14 16:05:54 -07:00
Dan Balasescu
2c80f73a88
Merge branch 'master' into increase-osu-file-validation
2019-03-14 18:47:32 +09:00
David Zhao
8fc90bb9a0
Remove unused usings
2019-03-14 16:26:34 +09:00
David Zhao
8cdfb1fd61
Remove BlurrableBackgroundScreen, rework tests
2019-03-14 16:09:17 +09:00
smoogipoo
71d79f0a39
Fix ticks not being generated at the minimum tick distance
2019-03-14 15:20:12 +09:00
smoogipoo
2815c3b07c
Remove unused variable
2019-03-14 15:12:26 +09:00
David Zhao
8714902349
Handle all blurring directly from background
2019-03-14 14:02:46 +09:00
Jamie Taylor
69eb4ef983
Change updateMetrics parameter to be optional
2019-03-14 13:35:49 +09:00
Dean Herbert
0042cc5337
Merge branch 'master' into mod-ramp-hotfix
2019-03-14 13:02:29 +09:00
Dean Herbert
7d56ce63d3
Fix test case failures
2019-03-14 12:31:17 +09:00
Dean Herbert
85c518f146
Change logic to better handle external adjustments
2019-03-14 12:29:16 +09:00
Dean Herbert
843ede2d52
Update framework
2019-03-14 11:29:46 +09:00
Dean Herbert
108dcd0a92
Update framework
2019-03-13 21:58:50 +09:00
Dean Herbert
c40e24739b
Fix weird application logic
2019-03-13 21:37:33 +09:00
Dan Balasescu
5d23a966d7
Fix incorrect application logic for rate fallback
...
Co-Authored-By: peppy <pe@ppy.sh>
2019-03-13 20:55:33 +09:00
Dean Herbert
dd6fbccb56
Slight refactoring of order for readability
2019-03-13 19:57:45 +09:00
Dean Herbert
7fc8e07f12
Merge branch 'master' into prevent-null-lookup
2019-03-13 19:40:44 +09:00
Dean Herbert
7d637691d7
Use non-guest user ID for non-guest user
2019-03-13 19:01:42 +09:00
Dan Balasescu
6aa3dc9f55
Use non-real domain
...
Co-Authored-By: peppy <pe@ppy.sh>
2019-03-13 18:56:48 +09:00
Dean Herbert
3d4a80957f
Improve comment
2019-03-13 18:27:54 +09:00
David Zhao
de6d8fc637
Move user blurring into VIsualSettingsContainer
2019-03-13 18:25:22 +09:00
Dean Herbert
1617e2a729
Merge branch 'master' into mania-judgemetns
2019-03-13 18:17:42 +09:00
Dean Herbert
8f00f2290a
Log issues
2019-03-13 14:56:41 +09:00
Dean Herbert
241e336c21
Fix break parsing
2019-03-13 14:22:16 +09:00
Jamie Taylor
7a2af5634c
Merge remote-tracking branch 'upstream/master' into prevent-null-lookup
2019-03-13 14:13:50 +09:00
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
David Zhao
2e1b274fda
No need for player var
2019-03-12 17:59:11 +09:00
David Zhao
e6a55cd674
Fix TestCaseEditor as well
2019-03-12 17:45:16 +09:00
David Zhao
9368081b99
Fix TestCasePlayer
2019-03-12 17:33:16 +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
David Zhao
921c4ce242
Make tests use new OsuScreenStack
2019-03-12 16:33:35 +09:00
Dan Balasescu
e6e0cf1957
Merge branch 'master' into direct-stats-offset
2019-03-12 16:17:36 +09:00
David Zhao
e3567a5507
Make OsuGame use OsuScreenStack too
2019-03-12 16:03:25 +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
David Zhao
63b9fa58ef
Cleanup
2019-03-11 19:52:28 +09:00
David Zhao
6a1e600099
Create new OsuScreenStack for use in Multiplayer
2019-03-11 19:48:07 +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
David Zhao
aeae6143c1
Remove unnecessary variable
2019-03-11 17:47:03 +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
David Zhao
0b64af5e02
Put multiplayer background inside a parallax container
2019-03-11 16:51:43 +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