1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 00:07:24 +08:00
Commit Graph

1115 Commits

Author SHA1 Message Date
Lucas A
2d966682dc Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-14 18:09:58 +02:00
Dean Herbert
2200959dd0
Merge branch 'master' into remember-fps-display-state 2019-05-14 19:19:46 +09:00
Dean Herbert
4c221e43a9 Apply minimal changes to make framework compile 2019-05-14 18:39:56 +09:00
smoogipoo
d5e25c05b3 Increase loader animation test wait 2019-05-14 18:39:03 +09:00
Dan Balasescu
d3d20773ee
Merge branch 'master' into fullscreen-overlay 2019-05-14 17:40:20 +09:00
Dean Herbert
a765f2502d Add simple test case for FullscreenOverlay 2019-05-14 15:14:00 +09:00
Dean Herbert
ca2662e941 Rename incorrectly named test cases 2019-05-14 14:58:36 +09:00
Dan Balasescu
157ba01d60
Merge branch 'master' into tidy-osu-game 2019-05-14 12:19:39 +09:00
Dean Herbert
a98accb4d4 Add tests for cached types in OsuGame and OsuGameBase 2019-05-14 11:05:53 +09:00
Dean Herbert
7553e2da25 Fix incorrect DI reference and update naming of SettingsOverlay classes 2019-05-14 10:45:05 +09:00
Dean Herbert
d18504bfe0 Attempt to fix pause test failures by reducing steps 2019-05-13 19:23:38 +09:00
Dean Herbert
4b8a9bae34 Remove unused test case 2019-05-13 17:17:20 +09:00
Lucas A
1fe4d20d9b Fix references to UserActivities in Tests 2019-05-12 17:47:02 +02:00
Lucas A
18fc965d7a Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-12 17:39:13 +02:00
Dean Herbert
82599127fd
Merge branch 'master' into patch-1 2019-05-12 20:30:25 +09:00
Paul Teng
7adaa09263 Move tab channel class into tab item class 2019-05-12 06:31:11 -04:00
Paul Teng
d53fb9a5c8 Check against type instead of channel name 2019-05-12 06:11:16 -04:00
Lucas A
5ac6bd8204 Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-12 11:53:30 +02:00
Dean Herbert
3566da73cc
Merge branch 'master' into fix-more-pause-cases 2019-05-12 15:57:45 +09:00
Dean Herbert
f5d7330a20
Fix player loader testcase potentially failing (#4720)
Fix player loader testcase potentially failing

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-05-12 13:18:38 +09:00
smoogipoo
bde2d552b6 Merge remote-tracking branch 'origin/master' into fix-more-pause-cases
# Conflicts:
#	osu.Game.Tests/Visual/Gameplay/TestCasePause.cs
2019-05-10 22:16:59 +09:00
smoogipoo
3352252e00 Fix testcase regression 2019-05-10 18:21:07 +09:00
Dean Herbert
97796a8578 Attempt to fix failing tests by delaying starting of the gameplay clock 2019-05-10 18:10:07 +09:00
smoogipoo
7c105fd99f Fix testcase players pausing on window unfocus 2019-05-10 15:39:25 +09:00
Dean Herbert
3c796bcfda
Merge branch 'master' into fix-player-testcase 2019-05-10 13:20:22 +09:00
Dean Herbert
3bcfc86b9c Allow custom MaxCatchUpFrames to be specified
Also adjusts the default to allow for smoother seeking.
2019-05-09 16:39:03 +09:00
Dean Herbert
66594b7a1b Pass GameplayStartTime to FrameStabilityContainer to allow bypassing prior to start 2019-05-09 16:39:03 +09:00
Dan Balasescu
22940373a0
Merge branch 'master' into zoomablescrollcontainer-fix 2019-05-09 13:54:21 +09:00
Dean Herbert
5b1ae1210a Add more asserts to pause test in an attempt to track down intermittent test failures 2019-05-09 11:31:40 +09:00
Dean Herbert
5dbf57046e Fix regression from removing unused variable 2019-05-09 10:38:22 +09:00
smoogipoo
9c01f6793e Remove unused variable 2019-05-08 23:52:44 +09:00
smoogipoo
9b279f324f Adjust testcase to avoid random failures 2019-05-08 23:40:01 +09:00
Dean Herbert
29fdfefafc
Merge branch 'master' into fix-player-testcase 2019-05-08 17:30:03 +09:00
David Zhao
ff3c226596 Give ZoomableScrollContainer an initial width 2019-05-08 13:37:03 +09:00
Lucas A
a5f758b977 Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-07 18:27:14 +02:00
smoogipoo
a00e2b18a9 Fix background unloading/reloading sometimes crashing 2019-05-07 17:24:05 +09:00
smoogipoo
1d2db85866 Improve background sprite testcase 2019-05-07 17:23:44 +09:00
Dean Herbert
8bc313fb33
Merge branch 'master' into fix-new-inspections 2019-05-07 14:14:40 +09:00
smoogipoo
d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
smoogipoo
3661ddbff6 Fix player loader testcase potentially failing 2019-05-07 13:02:19 +09:00
Lucas A
a50bbf7f42 Make appveyor happy. 2019-05-05 21:32:23 +02:00
Lucas A
3d8b56fe57 Fix user status related unit tests 2019-05-05 21:11:52 +02:00
Lucas A
8beb2f6e90 Remove hackery from unit tests. 2019-05-05 21:01:35 +02:00
Dean Herbert
3e3f12f277 Use more local bindables 2019-05-04 17:53:17 +09:00
Lucas A
a4a2ce5ec0 Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-02 21:36:28 +02:00
Lucas A
5d4aa5a12e Add ScreenStatus property to change the OsuScreen's status + Renamed old ScreenStatus property to InitialScreenStatus 2019-05-02 20:51:19 +02:00
Lucas A
84b41b3886 Split out setUserStatus() logic to multiple lines. +
Make UserStatusDoNotDisturb inherit from UserStatus
2019-05-02 19:44:07 +02:00
Lucas A
e02def58f3 Fix tests failing 2019-05-01 19:20:18 +02:00
iiSaLMaN
3b03ca802a
Merge branch 'master' into sh-xh-grading-2 2019-04-30 18:55:35 +03:00
Lucas A
7e42068a14 Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-04-28 19:48:35 +02:00