7e42068a14
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-04-28 19:48:35 +02:00
5a9277ec0e
Merge branch 'master' into fix-retry-sound
2019-04-28 23:38:14 +09:00
fa340a9eff
Merge branch 'master' into profile-header-update
2019-04-27 23:48:23 +09:00
db75516e79
Merge branch 'master' into fix-lead-in-issues
2019-04-27 21:01:21 +09:00
d40177f97c
Merge branch 'master' into drawnode-composability
2019-04-27 18:41:19 +09:00
b08fb5136e
Merge branch 'master' into sh-xh-grading-2
2019-04-26 10:38:10 +03:00
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
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
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
6fdcd98caa
Don't play screen "back" sample when retrying
2019-04-25 14:15:07 +09:00
b911322c92
Merge branch 'master' into fix-lead-in-issues
2019-04-25 12:34:29 +09:00
9fa8f62077
Merge branch 'master' into update-framework
2019-04-25 12:25:17 +09:00
8222923ab8
Only track logo if we're still the current screen
2019-04-24 16:20:51 +09:00
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
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
0838206ddd
Shorten multiplayer header to multi
2019-04-22 22:44:43 -07:00
0bf17081f6
Merge branch 'master' into update-framework
2019-04-23 11:31:17 +09:00
c88a11a38f
Merge branch 'master' into fix-multiplayer-crash
2019-04-23 09:28:03 +09:00
414d555484
Fix possible exit from non-current screen
2019-04-22 19:24:57 +09:00
5fe45c9bed
Merge branch 'master' into update-framework
2019-04-22 19:17:14 +09:00
8fc0bf24c7
Merge branch 'master' into fix-hold-for-menu-icon
2019-04-22 18:57:43 +09:00
48e82d4b1c
Fix hold for menu button's icon being incorrect
2019-04-22 18:47:28 +09:00
6856571f17
Fix incorrect seek target
2019-04-22 18:45:58 +09:00
55c5ef898d
Remove delay on entering player
2019-04-22 18:29:58 +09:00
908eee9942
Fix pause tests
2019-04-22 18:29:51 +09:00
b3c496d72c
Remove delay on entering player
2019-04-22 17:06:40 +09:00
034643b835
Fix pause tests
2019-04-22 17:06:22 +09:00
6f2bc943eb
Fix rank display on break info display
2019-04-21 12:04:15 +08:00
fe8c705f1b
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-04-20 09:42:32 +02:00
6502e26d09
Add draw size invalidation to ZoomableScrollContainer
2019-04-19 16:21:15 +09:00
2d7b3094ba
Merge branch 'master' into player-mod-reinstantiation
2019-04-17 16:42:57 +08:00
12b6bc48bd
Use .With() wherever possible
2019-04-17 17:24:09 +09:00
09568be270
Merge remote-tracking branch 'origin/master' into facade-container
...
# Conflicts:
# osu.Game/Screens/Play/PlayerLoader.cs
2019-04-17 17:17:33 +09:00
897bfa60db
Fix tracking position during 150ms state change delay
2019-04-17 17:05:35 +09:00
5a3d6a0258
Fix post-merge errors
2019-04-17 16:11:59 +09:00
bb539af1a0
Merge branch 'master' into player-mod-reinstantiation
2019-04-16 22:35:21 +08:00
5887008fb3
Merge branch 'master' into user-status-wiring
2019-04-15 11:43:53 +02:00
2d227d25cc
fix appveyor warnings
2019-04-14 07:55:15 +08:00
91c327a90f
use ModDisplay
2019-04-14 07:22:31 +08:00
c766631ad6
Check for breaks using GameplayClock time.
2019-04-13 11:39:22 -03:00
361c0ec9f2
Allow UserStatusSoloGame to provide metadata such as the ruleset the current beatmap is played in
2019-04-13 13:18:44 +02:00
da5d6cb1d4
Add Beatmap fields to UserStatusSoloGame & UserStatusEditing so they can carry metadata about the played / edited beatmap
2019-04-12 22:54:35 +02:00
69dda0ffd4
OsuScreens can now set a per screen user status
...
which defaults to UserStatusOnline
2019-04-12 22:36:01 +02:00
01cc78108c
add random button
2019-04-11 05:47:32 +08:00
b4d0755818
please appveyor
2019-04-10 22:10:09 +08:00
22f9339b01
let mods button have selected mod icons
2019-04-10 21:53:13 +08:00
0222424aef
Make mods IReadOnlyList<Mod> gamewide
...
Prevents potential multiple evaluations of enumerable.
2019-04-10 17:20:36 +09:00
85d3ff4846
Merge remote-tracking branch 'origin/master' into no-workingbeatmap-mods
...
# Conflicts:
# osu.Game/Screens/Play/GameplayClockContainer.cs
2019-04-10 12:06:51 +09:00
