1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-29 03:33:22 +08:00
Commit Graph

4022 Commits

Author SHA1 Message Date
Dean Herbert
20b43c20c8 Rename variables to remove redundant "screen" terminology 2019-06-12 16:33:15 +09:00
Dean Herbert
a9c229b1ec Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-06-12 16:00:35 +09:00
Dean Herbert
fc1f778b82 Remove implicit null 2019-06-12 15:53:53 +09:00
Lucas A
15893bbb75 Drop UserActivity prefix for subclasses nested in UserActivity + Change status messages. 2019-06-11 19:41:48 +02:00
Lucas A
6c74998487 Set ScreenActivity to InitialScreenActivity only when ScreenActivity hasn't been set manually before. 2019-06-11 19:24:36 +02:00
Dean Herbert
00ee45fe46 Merge remote-tracking branch 'origin/update-visibility-container' into update-framework 2019-06-11 19:36:13 +09:00
Dean Herbert
591be33fc2
Merge branch 'master' into async-results-pages 2019-06-11 18:45:06 +09:00
Dean Herbert
609a82bc94 Update VisibilityContainer usage in line with framework 2019-06-11 15:13:58 +09:00
Lucas A
141775d98c Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-06-10 21:41:00 +02:00
Dean Herbert
e87123342c Load results pages asynchronously
Reduces performance burden when first displaying pages. Closes #4977.
2019-06-10 23:51:09 +09:00
Lucas A
4f6978f2aa Apply review suggestions. 2019-06-09 20:01:19 +02:00
Dean Herbert
5c2ea0b1a7 Move dispose to end of file 2019-06-10 01:14:46 +09:00
Dean Herbert
d964f6ba9e Tween track frequency on pause 2019-06-10 00:56:35 +09:00
Dan Balasescu
346c4310c3
Merge branch 'master' into fail-animation 2019-06-07 20:48:36 +09:00
smoogipoo
90966b113b Merge remote-tracking branch 'origin/master' into ftb-prepass 2019-06-06 20:32:38 +09:00
smoogipoo
c7d0fcd42a Update drawnodes 2019-06-06 16:49:35 +09:00
Lucas A
a2bc5b538e Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-06-05 16:59:38 +02:00
Lucas A
da20be9a4b Fetch IAPIProvider via Resolved attribute 2019-06-05 16:59:08 +02:00
smoogipoo
a6dc5606bc Allow beatmapsets to be sorted by date added 2019-06-05 18:17:43 +09:00
Dean Herbert
9c214c3f0e Add animation on failing 2019-06-04 16:13:16 +09:00
smoogipoo
cea353975f Update with further framework-side changes 2019-06-04 11:04:28 +09:00
smoogipoo
53a39e9142 Merge remote-tracking branch 'origin/master' into audio-refactor-update 2019-06-04 10:50:33 +09:00
Lucas A
b3f6640d11 Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-31 12:41:26 +02:00
David Zhao
465aa4e0f6 Prevent idle state from being updated incorrectly 2019-05-31 14:06:18 +09:00
Dean Herbert
a20eda7b5f Fix remaining cases to work without things 2019-05-28 23:54:42 +09:00
Dean Herbert
4ca34bd5e8 Update osu! in line with audio subsystem refactor 2019-05-28 17:06:01 +09:00
Lucas A
a819dd764f Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-25 11:02:19 +02:00
Dan Balasescu
553d786b94
Merge branch 'master' into fix-logo-tracking-crash 2019-05-17 19:23:14 +09:00
Dean Herbert
359e5b71a5 Fix race condition causing player to never restart 2019-05-16 17:13:03 +09:00
Dean Herbert
958598d13b Fix crash on switching from main menu to gameplay too fast 2019-05-15 19:39:36 +09:00
Lucas A
2d966682dc Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-14 18:09:58 +02:00
Dean Herbert
4b508915f6 Centralise caching of components at OsuGame level 2019-05-13 17:10:25 +09:00
Lucas A
55663b3576 Nest all UserActivities into UserActivity 2019-05-12 17:38:02 +02:00
Lucas A
5ac6bd8204 Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-05-12 11:53:30 +02:00
Dean Herbert
038e49701e Move conditional to within BreakPeriod 2019-05-12 16:25:25 +09:00
Dean Herbert
1391aa342c
Merge branch 'master' into break-pause 2019-05-12 16:15:24 +09:00
Dean Herbert
3566da73cc
Merge branch 'master' into fix-more-pause-cases 2019-05-12 15:57:45 +09:00
Dean Herbert
9add2562f9
Close beatmap options when suspending (#4761)
Close beatmap options when suspending
2019-05-12 15:50:10 +09:00
Dean Herbert
790700d8bf Use more correct calculation 2019-05-12 15:40:58 +09:00
Joehu
175daac16a Close beatmap options when suspending 2019-05-11 21:26:42 -07:00
Joehu
29cec54b3c Fix beatmap carousel overlapping beatmap info wedge 2019-05-11 20:08:45 -07: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
01eb1a34a9 Remove unused variable 2019-05-10 22:15:33 +09:00
smoogipoo
d2479acbf2 Fix incorrect value being clamped 2019-05-10 18:04:58 +09:00
Dean Herbert
fdf67aaa11 Clamp values 2019-05-10 17:18:39 +09:00
smoogipoo
6a957ad27f Fix pause triggered when already paused 2019-05-10 15:51:12 +09:00
smoogipoo
7c105fd99f Fix testcase players pausing on window unfocus 2019-05-10 15:39:25 +09:00
Dean Herbert
9248e6290c Use FrameStabilityClock to denote current position on song progress 2019-05-09 18:09:26 +09:00
Dean Herbert
5942072128 Add a tween when clicking to seek 2019-05-09 18:07:38 +09:00
Dan Balasescu
22940373a0
Merge branch 'master' into zoomablescrollcontainer-fix 2019-05-09 13:54:21 +09:00