1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 16:27:43 +08:00
Commit Graph

11457 Commits

Author SHA1 Message Date
Dean Herbert
61b8fb0366 Allow ScreenTestCase to support content 2019-03-27 22:28:32 +09:00
Dean Herbert
5c4f2cefea Fix Loader and TestCaseLoaderAnimation 2019-03-27 22:28:25 +09:00
Dean Herbert
1a0d1b238e Fix storage regression 2019-03-27 20:58:07 +09:00
David Zhao
061527a260 Add new automated tests for logofacade, reset interpolation 2019-03-27 20:04:01 +09:00
Dean Herbert
de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
Unknown
fea6adbf54 fix wedge bleeding into other elements (and being misaligned) 2019-03-27 10:12:09 +01:00
David Zhao
2e3791be1c Fix incorrect usage of LogoFacade 2019-03-27 18:11:12 +09:00
David Zhao
ca7a20585d Apply reviews, delete playerloader test 2019-03-27 17:28:53 +09:00
smoogipoo
012dcc25c9 Rename APIScoreInfo -> APILegacyScoreInfo 2019-03-27 17:08:40 +09:00
smoogipoo
d2af2cf21d Set legacy api score statistics directly 2019-03-27 17:08:01 +09:00
smoogipoo
eceecde0f8 Make APIScoreInfo derive LegacyScoreInfo 2019-03-27 17:07:45 +09:00
smoogipoo
977122d05f Fix ScoreInfo not getting set 2019-03-27 16:59:29 +09:00
smoogipoo
8fcb75809d Add LegacyScoreInfo for statistics preservation/conversion 2019-03-27 16:55:46 +09:00
smoogipoo
a5d5f469eb Populate more hit results for catch 2019-03-27 14:52:56 +09:00
smoogipoo
7239ebf5de Add margin for mods 2019-03-27 13:57:26 +09:00
David Zhao
43c6a8d2e5 use a property instead 2019-03-27 11:44:50 +09:00
David Zhao
efeed71517 Add comment 2019-03-27 11:37:16 +09:00
David Zhao
384eee3395 Remove DI requirement for the Facade in PlayerLoader 2019-03-27 11:32:26 +09:00
Dean Herbert
3fcbc2eab3 Fix key counter getting overridden 2019-03-27 10:31:21 +09:00
smoogipoo
adab31fd58 Cleanup + fix up score table layout 2019-03-26 17:38:56 +09:00
David Zhao
3fe52be77f Better tests, add documentation 2019-03-26 17:22:36 +09:00
Dean Herbert
15821c7511 Fix cursor adding 2019-03-26 17:04:14 +09:00
Dean Herbert
a88f23e555 Convert remaining two flags to ctor parameters 2019-03-26 16:53:44 +09:00
Dean Herbert
92184adef5 Add stable sorting of storyboard elements 2019-03-26 16:37:52 +09:00
Dean Herbert
83076e32c7 Fix TestWorkingBeatmap not running for times below zero 2019-03-26 16:35:34 +09:00
Dean Herbert
83863d35c3 Remove AllowLeadIn flag 2019-03-26 16:35:00 +09:00
Dean Herbert
dde7788c44 Merge branch 'universal-playfield-adjust' into resume-cursor-2 2019-03-26 13:58:48 +09:00
Dean Herbert
fb302e7ad8 Remove using 2019-03-26 13:58:07 +09:00
Dean Herbert
8658de5108 Rename KeyCounterCollection -> KeyCounterDisplay
Also fix not working
2019-03-26 13:52:48 +09:00
Dean Herbert
27cb4ce0d1 Remove poop 2019-03-26 13:48:35 +09:00
Dean Herbert
fbc97edc55 Add base cursor class to retrieve true visibility state 2019-03-26 13:41:30 +09:00
Dean Herbert
b4d785c76c Don't update gameplay loop while paused 2019-03-26 13:36:17 +09:00
Dean Herbert
ed3746e166 Make PlayfieldAdjustmentContainer universal 2019-03-26 13:32:44 +09:00
Dean Herbert
e512d88899 Apply required refactor 2019-03-26 13:29:26 +09:00
Dean Herbert
5d166a011d Update framework 2019-03-26 13:28:59 +09:00
Dean Herbert
868367511e Add ManualInputManager to screen tests
Also sanitises content init order (ctor for content; bdl for other)
2019-03-26 13:26:55 +09:00
Dean Herbert
256a579de0 Allow player to not pause on focus loss 2019-03-26 13:17:00 +09:00
Dean Herbert
c403dede20 Add ManualInputManager to screen tests
Also sanitises content init order (ctor for content; bdl for other)
2019-03-26 13:16:46 +09:00
Dean Herbert
4c0121a112 Merge remote-tracking branch 'upstream/master' into resume-cursor-2 2019-03-26 11:31:23 +09:00
Dean Herbert
b75ea295db Rename KeyCounterCollection -> KeyCounterDisplay
Also fix not working
2019-03-26 11:28:43 +09:00
David Zhao
be9ac39f54 Cleanup 2019-03-26 11:11:27 +09:00
David Zhao
35bf262d19 Merge remote-tracking branch 'upstream/master' into facade-container 2019-03-26 11:11:13 +09:00
David Zhao
a0f6718145 Better tests and implementation 2019-03-26 10:48:29 +09:00
smoogipoo
f4aeb390ef Initial re-layout of score table 2019-03-26 10:21:34 +09:00
Dean Herbert
82140c38fc Apply CI fixes 2019-03-25 22:00:33 +09:00
Dean Herbert
a642f10131 Remove redundant cast 2019-03-25 21:52:01 +09:00
Dean Herbert
15aea7f745 Update framework 2019-03-25 21:50:28 +09:00
Dean Herbert
245f463e3f Don't update gameplay loop while paused 2019-03-25 20:31:55 +09:00
Dean Herbert
a23dfb58ad Add base cursor class to retrieve true visibility state 2019-03-25 20:31:55 +09:00
Dean Herbert
06d4856e17 Remove unnecessary CursorTargetContainer 2019-03-25 20:31:55 +09:00
Dean Herbert
c79d187a89 Add final osu! resume screen implementation 2019-03-25 20:31:55 +09:00
Dean Herbert
38e481686f Make PlayfieldAdjustmentContainer universal 2019-03-25 20:31:55 +09:00
Dean Herbert
57b3b7b54b Add back resume overlay 2019-03-25 20:31:55 +09:00
Dean Herbert
a694626cc6 Add proper resume request logic 2019-03-25 20:31:55 +09:00
Dean Herbert
8ad4009c33 osu! resume overlay 2019-03-25 20:31:55 +09:00
smoogipoo
6a9f005ed4 Merge remote-tracking branch 'Joehuu/master' into update-beatmap-scores-design
# Conflicts:
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
2019-03-25 15:21:29 +09:00
Dean Herbert
fa7a0a0742
Merge branch 'master' into drawable-clear-safety 2019-03-25 13:58:57 +09:00
Dean Herbert
5b83e97e9d
Fix typo 2019-03-25 13:38:50 +09:00
Dean Herbert
c97116c91a Add safety against DrawableHitObject implementations clearing children 2019-03-25 13:34:22 +09:00
Dean Herbert
fcc91efc1a
Merge branch 'master' into skinnable-scaling-container-background 2019-03-25 13:33:39 +09:00
Dean Herbert
cd1b171df7 Refactor async load logic (not required due to stack presence) 2019-03-25 13:28:51 +09:00
Dean Herbert
e705eb586d Revert unintentional change 2019-03-25 12:51:54 +09:00
Dean Herbert
9a6576c0a1 Merge remote-tracking branch 'upstream/master' into multi-background-stack 2019-03-25 12:40:31 +09:00
Dean Herbert
371166955e Apply a few minor refactors 2019-03-25 12:39:40 +09:00
LeNitrous
fee260fa03 remove empty argument list 2019-03-25 06:05:57 +08:00
LeNitrous
01ce8f161e make scaling container background use BackgroundScreenStack with BackgroundScreenDefault 2019-03-25 05:49:57 +08:00
Dean Herbert
9bf48863b0 Fix DrawableRuleset drawable creation method's name 2019-03-25 00:00:29 +09:00
David Zhao
5169f7a43c Change default for null screen parallax, apply reviews 2019-03-24 16:21:43 +09:00
David Zhao
d37968d88d Add better test for facade containers 2019-03-24 15:18:38 +09:00
Dean Herbert
11b474e194 Handle released for safety 2019-03-24 12:19:09 +09:00
Dean Herbert
0d72104235 Refactor for formatting sanity 2019-03-24 12:03:06 +09:00
Dean Herbert
8ad19fc2d4 Merge branch 'master' into menu-globalaction-select 2019-03-24 11:58:52 +09:00
Dean Herbert
9a11a08acc Update textbox usages 2019-03-23 02:00:27 +09:00
Dean Herbert
97675f6495 Update framework 2019-03-23 00:55:31 +09:00
David Zhao
6e98a8dd7c Initial implementation 2019-03-22 20:01:58 +09:00
David Zhao
e93311fdc9 DI facade 2019-03-22 19:01:32 +09:00
Dean Herbert
db89796752 Merge remote-tracking branch 'upstream/master' into multi-background-stack 2019-03-22 16:05:39 +09:00
Dan Balasescu
b4954c5a7f
Merge branch 'master' into pause-logic-simplification 2019-03-22 15:11:34 +09:00
Dan Balasescu
e09c107f38
Merge branch 'master' into better-dummy-api 2019-03-22 14:51:11 +09:00
Dean Herbert
9e6cdd7bd5 Combine conditionals and clarify comment 2019-03-22 14:42:51 +09:00
Dean Herbert
5b8fd6822e Move storyboard logic region down 2019-03-22 14:39:20 +09:00
Dan Balasescu
a9975e845c
Merge branch 'master' into upgrade-nuget-packages 2019-03-22 14:37:58 +09:00
Dean Herbert
59d0996c8d Cleanup other instance of same function 2019-03-22 14:31:54 +09:00
smoogipoo
860999ad29 Cleanup 2019-03-22 14:20:53 +09:00
Dan Balasescu
5de99f3f5b
Merge branch 'master' into fix-random-select-crash 2019-03-22 14:11:06 +09:00
David Zhao
dcae86e39a Add a new test for OsuScreenStack, fix parallax 2019-03-22 14:10:38 +09:00
Dean Herbert
dc004910d7 Fix AccountCreationOverlay tests and better complete dummy api's behaviour 2019-03-22 11:55:35 +09:00
jorolf
7873022a8b Merge branch 'master' of git://github.com/ppy/osu into screen-title-class 2019-03-21 22:18:59 +01:00
jorolf
454c82c49e Don't go outside of the container bounds 2019-03-21 22:18:45 +01:00
Joseph Madamba
d5272a83cf
Rename "urgent" to "topMost" 2019-03-21 11:16:10 -07:00
Dean Herbert
d6f17a5ecd Bring nuget packages up to date 2019-03-22 02:41:21 +09:00
Dean Herbert
37010f97d7 Fix random select crashing
Closes #3383.
2019-03-21 21:02:54 +09:00
Dean Herbert
a10e43410a Fix song select potentially starting play before the carousel (and bindables) have been initialised 2019-03-21 20:52:34 +09:00
Dean Herbert
4789aa81cb Add an explicit flag for tracking song select's bindable binding
Not required (this change does not affect logic) but improves clarity.
2019-03-21 20:52:15 +09:00
Dean Herbert
96dba6a20d Move nested method to bottom of class 2019-03-21 20:51:21 +09:00
Dean Herbert
e2503888a4 Expose carousel's loaded flag 2019-03-21 20:51:06 +09:00
Dean Herbert
15f9a6b9df Merge remote-tracking branch 'upstream/master' into pause-logic-simplification 2019-03-21 16:04:18 +09:00
David Zhao
ee0d7b6c6d Merge remote-tracking branch 'upstream/master' into multi-background-stack 2019-03-21 15:35:14 +09:00
Dean Herbert
c555019692 Update framework 2019-03-20 22:50:50 +09:00
Dean Herbert
67a65b80fc
Merge branch 'master' into visual-settings-container 2019-03-20 20:48:30 +09:00
Dean Herbert
298c98871d Actually add the background 2019-03-20 20:18:08 +09:00
Dean Herbert
ba89bfee0c Define explicit method to add background
Also cleans up some redundant/misplaced comments.
2019-03-20 20:16:45 +09:00
Dean Herbert
8865d53992 Reword comment 2019-03-20 20:04:07 +09:00
David Zhao
2e9d823af4 Add comment regarding HandlePositionalInput 2019-03-20 19:59:54 +09:00
David Zhao
2ff7aa6c2e Remove handle positional input 2019-03-20 19:49:37 +09:00
David Zhao
bc6e8ce7b4 Merge branch 'visual-settings-container' of https://github.com/nyquillerium/osu into visual-settings-container 2019-03-20 19:48:57 +09:00
Dean Herbert
01f795b046 Make restart public rather than reimplementing 2019-03-20 19:45:04 +09:00
David Zhao
8543e8c36f Put loadcomplete next to other protected overrides 2019-03-20 19:42:39 +09:00
Dean Herbert
cda5bc28c8 Add proper comment 2019-03-20 19:41:20 +09:00
Dean Herbert
18de9e51c5 Formatting and naming improvements 2019-03-20 19:39:03 +09:00
David Zhao
9013afe412 Query for input manager once 2019-03-20 19:35:40 +09:00
Dean Herbert
acbcca4462
Merge branch 'master' into multi-background-stack 2019-03-20 19:11:27 +09:00
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
smoogipoo
f7016e1d2c Rename DrawableScore 2019-03-20 17:15:38 +09:00
smoogipoo
41d25c7d19 Fix post-merge errors 2019-03-20 17:15:21 +09:00
smoogipoo
ce57bdb8db Merge branch 'timed-difficulty-attributes' into update-beatmap-scores-design
# Conflicts:
#	osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
2019-03-20 17:12:34 +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
e59917ed03 Merge remote-tracking branch 'upstream/master' into correct-preview-loop 2019-03-20 10:58:15 +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
jorolf
f91e4a1fdd make ScreenTitle abstract and properties protected 2019-03-11 19:10:37 +01: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
jorolf
f3ab5070b9 apply suggestions 2019-03-11 18:37:36 +01: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
smoogipoo
315788c975 Rename a few classes 2019-03-11 15:11:01 +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
jorolf
2525f5bcb7 Apply most suggestions 2019-03-09 23:58:14 +01:00
jorolf
bb6e57169f Merge branch 'screen-title-class' of github.com:Jorolf/osu into profile-header-update 2019-03-09 20:22:33 +01: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
jorolf
af1c54d995 add ScreenTitle class 2019-03-08 23:44:01 +01: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
9a05643ec9 Minor refactorings 2019-03-08 17:18:54 +09:00
smoogipoo
a40ffcc692 Apply formatting adjustments 2019-03-08 16:44:39 +09:00
smoogipoo
a7ad29ca9d Merge remote-tracking branch 'origin/master' into update-beatmap-scores-design 2019-03-08 16:32:46 +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