1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 11:13:02 +08:00
Commit Graph

11090 Commits

Author SHA1 Message Date
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
David Zhao
0d95511222
Merge branch 'master' into multi-background-stack 2019-03-11 11:19:08 +09:00
David Zhao
2df57c3a29 Give Multiplayer its own background stack 2019-03-11 11:08:04 +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
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