Commit Graph

4084 Commits

Author SHA1 Message Date
f766068e17 Remove local implementation of bindable in OsuCheckbox (#5046)
Remove local implementation of bindable in OsuCheckbox
2019-06-21 21:08:09 +09:00
6627cdefd2 Merge branch 'master' into tournament-tools 2019-06-21 15:52:47 +09:00
c79c4641f3 Merge branch 'master' into use-modelbackeddrawable 2019-06-21 14:26:07 +09:00
8ab7a8641b Add comment for why it's not a fill flow 2019-06-21 12:42:35 +09:00
0571bbd555 Merge branch 'master' into carousel-gradient 2019-06-21 12:40:24 +09:00
65c84428cc Fix position of gradient in beatmap carousel 2019-06-20 15:05:15 +09:00
ca919f02e6 Remove bad words on code comments 2019-06-19 21:33:58 -07:00
133c1fc0f1 Merge branch 'master' into remove-osu-checkbox-bindable 2019-06-20 11:33:39 +09:00
dd926f55bd Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-06-19 14:55:34 +09:00
3043f42eb5 Merge branch 'master' into fix-multiplayer-audio 2019-06-19 14:36:05 +09:00
f26fe53feb Fix startup crash if main menu does not load fast enough 2019-06-19 13:16:19 +09:00
6426983de0 Move logic out of update (and simplify, hopefully) 2019-06-19 13:15:58 +09:00
fec0db8fe1 Merge UpdateableAvatar.cs and Avatar.cs + Rename Avatar to DrawableAvatar 2019-06-17 21:55:07 +03:00
d665f1fe4b Seperate drawable and updateable flag from Country + Use UpdateableFlag 2019-06-17 20:57:57 +03:00
794ba17a2f Seperate UpdateableRank from DrawableRank and use it 2019-06-17 20:04:09 +03:00
26d5c2d85a Remove local implementation of bindable in OsuCheckbox 2019-06-17 19:37:24 +09:00
b259710a62 Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-06-17 19:30:17 +09:00
c1d2fff651 Use RestartPoint 2019-06-17 12:44:19 +09:00
bc35a30a25 Fix audio being dimmed during multiplayer 2019-06-17 12:27:53 +09:00
1a9efb3d7a Fix editor play button 2019-06-15 11:05:58 -07:00
2b48f5d3e0 Tidy up updateMetrics flow 2019-06-15 14:45:51 +09:00
587edcb716 Merge branch 'master' into fix-beatmapoverlay-graphs 2019-06-15 13:42:13 +09:00
1b75fbed9a Merge remote-tracking branch 'upstream/master' into update-scrollcontainer 2019-06-14 23:25:17 +09:00
bc574520bf Update ScrollContainer usages in line with framework changes 2019-06-14 15:55:32 +09:00
15b9b53d35 Fix IconButtons not being scaled correctly 2019-06-14 13:40:32 +09:00
f54f6e552b Fix beatmap details potentially using the incorrect metrics 2019-06-13 18:04:42 +09:00
583bb53f53 Remove GetBeatmapDetailsRequest 2019-06-13 16:57:19 +09:00
0a79b444d9 Move metrics to beatmap set 2019-06-13 16:52:49 +09:00
830ddbc2de Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-06-13 12:49:52 +09:00
021d0273f9 Split out user activity from user status (#4619)
Split out user activity from user status

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-12 20:14:03 +09:00
f358fce9ab Move activity (writable) bindable to APIAccess so it correctly transfers between users 2019-06-12 18:04:57 +09:00
243cd517ad Merge remote-tracking branch 'origin/master' into backgrounded-beatmap-status-lookups
# Conflicts:
#	osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
2019-06-12 17:24:16 +09:00
20b43c20c8 Rename variables to remove redundant "screen" terminology 2019-06-12 16:33:15 +09:00
13234fb4a4 Adjust comments a bit 2019-06-12 16:07:35 +09:00
a9c229b1ec Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-06-12 16:00:35 +09:00
fc1f778b82 Remove implicit null 2019-06-12 15:53:53 +09:00
5d3fa51360 Merge remote-tracking branch 'origin/master' into selection-update 2019-06-12 15:10:57 +09:00
15893bbb75 Drop UserActivity prefix for subclasses nested in UserActivity + Change status messages. 2019-06-11 19:41:48 +02:00
6c74998487 Set ScreenActivity to InitialScreenActivity only when ScreenActivity hasn't been set manually before. 2019-06-11 19:24:36 +02:00
606be3d7ce Merge branch 'master' into backgrounded-beatmap-status-lookups 2019-06-12 00:22:47 +09:00
00ee45fe46 Merge remote-tracking branch 'origin/update-visibility-container' into update-framework 2019-06-11 19:36:13 +09:00
591be33fc2 Merge branch 'master' into async-results-pages 2019-06-11 18:45:06 +09:00
609a82bc94 Update VisibilityContainer usage in line with framework 2019-06-11 15:13:58 +09:00
141775d98c Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-06-10 21:41:00 +02:00
e87123342c Load results pages asynchronously
Reduces performance burden when first displaying pages. Closes #4977.
2019-06-10 23:51:09 +09:00
d7cb932606 Merge branch 'master' into selection-update 2019-06-10 17:51:40 +09:00
600503ec8e Use Task.Run/Wait to avoid warnings 2019-06-10 13:42:29 +09:00
f090e292c9 Move ArchiveModelManager import process to async flow 2019-06-10 13:42:22 +09:00
4f6978f2aa Apply review suggestions. 2019-06-09 20:01:19 +02:00
5c2ea0b1a7 Move dispose to end of file 2019-06-10 01:14:46 +09:00