Lucas A
a5f758b977
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-07 18:27:14 +02:00
Lucas A
3ecfa9dcdb
Invert partialy activity logic introduced in latest commit
2019-05-07 18:26:34 +02:00
Dan Balasescu
288b3deb94
Merge branch 'master' into fix-rank-display
2019-05-07 15:00:51 +09:00
Dean Herbert
8bc313fb33
Merge branch 'master' into fix-new-inspections
2019-05-07 14:14:40 +09:00
Dean Herbert
c878d814f6
Merge branch 'master' into pause-via-inactive
2019-05-07 13:35:23 +09:00
Dean Herbert
f7a570d67a
Fix double confirmation
2019-05-07 13:34:06 +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
Dan Balasescu
a1c64d8d26
Merge branch 'master' into fix-retry-sound
2019-05-07 12:40:01 +09:00
Dan Balasescu
8b9cfadd64
Merge branch 'master' into fix-retry-sound
2019-05-07 12:37:22 +09:00
smoogipoo
f26a1cff6c
Fix beatmap import crashing during room creation
2019-05-07 12:14:57 +09:00
Lucas A
e7afaeaa4d
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-06 18:39:58 +02:00
Lucas A
59b8da5c77
Move OsuScreen activity logic to setUserActivity()
2019-05-06 18:37:21 +02:00
Lucas A
a50bbf7f42
Make appveyor happy.
2019-05-05 21:32:23 +02:00
Lucas A
d5d31282e5
Rename InitialScreenStatus to InitialScreenActivity in Editor / Player classes
2019-05-05 20:55:42 +02:00
Lucas A
88b8afbb6a
Make UserPanel show current user activity when
...
user status is online.
2019-05-05 20:51:55 +02:00
Lucas A
fa986bb5e9
Rework OsuScreen user activity logic
2019-05-05 20:26:56 +02:00
Dean Herbert
7fdc79dd68
Improve skip boundary logic to be closer to expectations
...
Supersedes #4693 .
Closes #4676 .
2019-05-05 20:20:41 +09:00
Dean Herbert
3e3f12f277
Use more local bindables
2019-05-04 17:53:17 +09:00
Dean Herbert
b9a39fb788
Fix instant pausing when game becomes inactive
...
Resolves #4685 .
2019-05-04 14:54:29 +09:00
Dean Herbert
6bdaca1e3b
Fix mod equality checks not working as intended
2019-05-03 10:09:47 +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
a3541339f5
Handle the restoring of the screen status when the user status is changed back to online after having being set to DND / offline via the login overlay
2019-04-30 21:40:44 +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
Dean Herbert
5a9277ec0e
Merge branch 'master' into fix-retry-sound
2019-04-28 23:38:14 +09:00
Dean Herbert
fa340a9eff
Merge branch 'master' into profile-header-update
2019-04-27 23:48:23 +09:00
Dean Herbert
db75516e79
Merge branch 'master' into fix-lead-in-issues
2019-04-27 21:01:21 +09:00
Dean Herbert
d40177f97c
Merge branch 'master' into drawnode-composability
2019-04-27 18:41:19 +09:00
iiSaLMaN
b08fb5136e
Merge branch 'master' into sh-xh-grading-2
2019-04-26 10:38:10 +03:00
Dean Herbert
a680a38e81
Merge pull request #4675 from nyquillerium/playerloader-tracking
...
Prevent PlayerLoader from tracking the logo after it has been exited.
2019-04-26 13:21:13 +09:00
KingLuigi4932
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
KingLuigi4932
c6b3197dd0
Add AdjustRank and use it in Hidden Mod
2019-04-25 13:56:57 +03:00
smoogipoo
3b0d4c1bad
Merge branch 'turn-on-warnings' into profile-header-update
2019-04-25 17:43:10 +09:00
smoogipoo
0bd35ab7bb
Turn on warnings, resolve issues
2019-04-25 17:36:17 +09:00
Dean Herbert
6fdcd98caa
Don't play screen "back" sample when retrying
2019-04-25 14:15:07 +09:00
Dan Balasescu
b911322c92
Merge branch 'master' into fix-lead-in-issues
2019-04-25 12:34:29 +09:00
Dan Balasescu
9fa8f62077
Merge branch 'master' into update-framework
2019-04-25 12:25:17 +09:00
David Zhao
8222923ab8
Only track logo if we're still the current screen
2019-04-24 16:20:51 +09:00
Dean Herbert
bb69330e9f
Call ProcessFrame on the userOffsetClock after a seek
...
Without doing this, GameplayClock can be left in an incorrect state after a seek (due to the userOffsetClock being its own FramedClock).
2019-04-24 15:28:14 +09:00
Dean Herbert
efaedafc08
Fix (legacy) AudioLeadIn being used incorrectly.
...
This lead-in is intended to specify a value before zero, not a value before the start time.
Also removes an unnecessary ProcessFrame call (it happens within Seek itself).
2019-04-24 15:28:14 +09:00
Joehu
0838206ddd
Shorten multiplayer header to multi
2019-04-22 22:44:43 -07:00
Dan Balasescu
0bf17081f6
Merge branch 'master' into update-framework
2019-04-23 11:31:17 +09:00
Dean Herbert
c88a11a38f
Merge branch 'master' into fix-multiplayer-crash
2019-04-23 09:28:03 +09:00
smoogipoo
414d555484
Fix possible exit from non-current screen
2019-04-22 19:24:57 +09:00
Dean Herbert
5fe45c9bed
Merge branch 'master' into update-framework
2019-04-22 19:17:14 +09:00
Dan Balasescu
8fc0bf24c7
Merge branch 'master' into fix-hold-for-menu-icon
2019-04-22 18:57:43 +09:00
Dean Herbert
48e82d4b1c
Fix hold for menu button's icon being incorrect
2019-04-22 18:47:28 +09:00
Dean Herbert
6856571f17
Fix incorrect seek target
2019-04-22 18:45:58 +09:00
