|
|
6063e7a69f
|
Merge branch 'master' into one-hit-screen
|
2019-06-26 11:34:54 +09:00 |
|
|
|
446fbce81c
|
Add base class for startup screens
Avoids missing adding changes to screens like Disclaimer, which may not be shown in debug builds.
|
2019-06-26 01:36:17 +09:00 |
|
|
|
40cf573368
|
Fix pause not correctly showing pause screen
|
2019-06-25 23:15:58 +09:00 |
|
|
|
983cabdb98
|
Disallow back button on disclaimer screen
|
2019-06-25 22:27:50 +09:00 |
|
|
|
f9dad0f640
|
Merge remote-tracking branch 'upstream/master' into gamewide-backbutton
|
2019-06-25 20:23:49 +09:00 |
|
|
|
aa81c95f30
|
Remove unnecessary extra property
|
2019-06-25 18:38:14 +09:00 |
|
|
|
531b107a98
|
Exit match before exiting multiplayer
|
2019-06-25 18:33:26 +09:00 |
|
|
|
1a26608ba9
|
Close mod select before exiting song selection
|
2019-06-25 18:33:21 +09:00 |
|
|
|
d9927204f8
|
Relieve OsuScreen of back button input duties
|
2019-06-25 18:33:18 +09:00 |
|
|
|
8c96e4c1fa
|
Move back button to OsuGame
|
2019-06-25 18:33:08 +09:00 |
|
|
|
7bc7df2249
|
Reduce background brightness at PlayerLoader
|
2019-06-25 17:22:10 +09:00 |
|
|
|
f91467eddc
|
Fix licence header
|
2019-06-24 18:34:23 +09:00 |
|
|
|
fad1ced1b5
|
Add correct conditionals to allow exit
|
2019-06-24 18:15:27 +09:00 |
|
|
|
d70248338d
|
Merge remote-tracking branch 'upstream/master' into quickEscape
|
2019-06-24 18:14:48 +09:00 |
|
|
|
8d6fc3edf0
|
Fix multiplayer create button appearing in match song selection
|
2019-06-24 11:54:41 +09:00 |
|
|
|
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 |
|
