|
|
1fe4d20d9b
|
Fix references to UserActivities in Tests
|
2019-05-12 17:47:02 +02:00 |
|
|
|
18fc965d7a
|
Merge remote-tracking branch 'upstream/master' into user-status-wiring
|
2019-05-12 17:39:13 +02:00 |
|
|
|
82599127fd
|
Merge branch 'master' into patch-1
|
2019-05-12 20:30:25 +09:00 |
|
|
|
7adaa09263
|
Move tab channel class into tab item class
|
2019-05-12 06:31:11 -04:00 |
|
|
|
d53fb9a5c8
|
Check against type instead of channel name
|
2019-05-12 06:11:16 -04:00 |
|
|
|
5ac6bd8204
|
Merge remote-tracking branch 'upstream/master' into user-status-wiring
|
2019-05-12 11:53:30 +02:00 |
|
|
|
3566da73cc
|
Merge branch 'master' into fix-more-pause-cases
|
2019-05-12 15:57:45 +09:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
3352252e00
|
Fix testcase regression
|
2019-05-10 18:21:07 +09:00 |
|
|
|
97796a8578
|
Attempt to fix failing tests by delaying starting of the gameplay clock
|
2019-05-10 18:10:07 +09:00 |
|
|
|
7c105fd99f
|
Fix testcase players pausing on window unfocus
|
2019-05-10 15:39:25 +09:00 |
|
|
|
3c796bcfda
|
Merge branch 'master' into fix-player-testcase
|
2019-05-10 13:20:22 +09:00 |
|
|
|
3bcfc86b9c
|
Allow custom MaxCatchUpFrames to be specified
Also adjusts the default to allow for smoother seeking.
|
2019-05-09 16:39:03 +09:00 |
|
|
|
66594b7a1b
|
Pass GameplayStartTime to FrameStabilityContainer to allow bypassing prior to start
|
2019-05-09 16:39:03 +09:00 |
|
|
|
22940373a0
|
Merge branch 'master' into zoomablescrollcontainer-fix
|
2019-05-09 13:54:21 +09:00 |
|
|
|
5b1ae1210a
|
Add more asserts to pause test in an attempt to track down intermittent test failures
|
2019-05-09 11:31:40 +09:00 |
|
|
|
5dbf57046e
|
Fix regression from removing unused variable
|
2019-05-09 10:38:22 +09:00 |
|
|
|
9c01f6793e
|
Remove unused variable
|
2019-05-08 23:52:44 +09:00 |
|
|
|
9b279f324f
|
Adjust testcase to avoid random failures
|
2019-05-08 23:40:01 +09:00 |
|
|
|
29fdfefafc
|
Merge branch 'master' into fix-player-testcase
|
2019-05-08 17:30:03 +09:00 |
|
|
|
ff3c226596
|
Give ZoomableScrollContainer an initial width
|
2019-05-08 13:37:03 +09:00 |
|
|
|
a5f758b977
|
Merge remote-tracking branch 'upstream/master' into user-status-wiring
|
2019-05-07 18:27:14 +02:00 |
|
|
|
a00e2b18a9
|
Fix background unloading/reloading sometimes crashing
|
2019-05-07 17:24:05 +09:00 |
|
|
|
1d2db85866
|
Improve background sprite testcase
|
2019-05-07 17:23:44 +09:00 |
|
|
|
8bc313fb33
|
Merge branch 'master' into fix-new-inspections
|
2019-05-07 14:14:40 +09:00 |
|
|
|
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 |
|
|
|
3661ddbff6
|
Fix player loader testcase potentially failing
|
2019-05-07 13:02:19 +09:00 |
|
|
|
a50bbf7f42
|
Make appveyor happy.
|
2019-05-05 21:32:23 +02:00 |
|
|
|
3d8b56fe57
|
Fix user status related unit tests
|
2019-05-05 21:11:52 +02:00 |
|
|
|
8beb2f6e90
|
Remove hackery from unit tests.
|
2019-05-05 21:01:35 +02:00 |
|
|
|
3e3f12f277
|
Use more local bindables
|
2019-05-04 17:53:17 +09:00 |
|
|
|
a4a2ce5ec0
|
Merge remote-tracking branch 'upstream/master' into user-status-wiring
|
2019-05-02 21:36:28 +02:00 |
|
|
|
5d4aa5a12e
|
Add ScreenStatus property to change the OsuScreen's status + Renamed old ScreenStatus property to InitialScreenStatus
|
2019-05-02 20:51:19 +02:00 |
|
|
|
84b41b3886
|
Split out setUserStatus() logic to multiple lines. +
Make UserStatusDoNotDisturb inherit from UserStatus
|
2019-05-02 19:44:07 +02:00 |
|
|
|
e02def58f3
|
Fix tests failing
|
2019-05-01 19:20:18 +02:00 |
|
|
|
3b03ca802a
|
Merge branch 'master' into sh-xh-grading-2
|
2019-04-30 18:55:35 +03:00 |
|
|
|
7e42068a14
|
Merge remote-tracking branch 'upstream/master' into user-status-wiring
|
2019-04-28 19:48:35 +02:00 |
|
|
|
754bebadbe
|
Merge branch 'master' into improve-waveform-test
|
2019-04-28 23:38:24 +09:00 |
|
|
|
b08fb5136e
|
Merge branch 'master' into sh-xh-grading-2
|
2019-04-26 10:38:10 +03:00 |
|
|
|
2f4bf423a4
|
Renamespace
|
2019-04-26 13:51:39 +09:00 |
|
|
|
838325fed4
|
Remove HasTooltipContainer, use separate composites
|
2019-04-26 11:58:45 +09:00 |
|
|
|
4e0f21102b
|
Merge branch 'sh-xh-grading-2' of https://github.com/iiSaLMaN/osu into sh-xh-grading-2
|
2019-04-25 14:04:12 +03:00 |
|
|
|
c6b3197dd0
|
Add AdjustRank and use it in Hidden Mod
|
2019-04-25 13:56:57 +03:00 |
|
|
|
9d5b81165e
|
Adjust button stylings
|
2019-04-25 19:51:05 +09:00 |
|
|
|
0eca9b9683
|
Center -> centre
|
2019-04-25 18:43:29 +09:00 |
|
|
|
b33c0e9a93
|
Cleanup bottom header container
|
2019-04-25 18:42:19 +09:00 |
|
|
|
3b0d4c1bad
|
Merge branch 'turn-on-warnings' into profile-header-update
|
2019-04-25 17:43:10 +09:00 |
|
|
|
0bd35ab7bb
|
Turn on warnings, resolve issues
|
2019-04-25 17:36:17 +09:00 |
|
|
|
9fa8f62077
|
Merge branch 'master' into update-framework
|
2019-04-25 12:25:17 +09:00 |
|
