smoogipoo
|
e0e75c7339
|
Fix incorrect room status
|
2018-12-25 11:24:46 +09:00 |
|
smoogipoo
|
02365ee5ba
|
Merge remote-tracking branch 'origin/master' into timeshift-wip
|
2018-12-22 23:23:21 +09:00 |
|
Dean Herbert
|
c6b37c45b5
|
Merge pull request #3902 from smoogipoo/disable-chat-avatar-click
Disable avatar clicks in chat tabs
|
2018-12-22 20:11:01 +09:00 |
|
Dean Herbert
|
31da77ad62
|
Merge pull request #3825 from peppy/user-registration
User registration
|
2018-12-22 20:06:53 +09:00 |
|
smoogipoo
|
40db23ff4c
|
Disable avatar clicks in chat tabs
|
2018-12-22 19:30:52 +09:00 |
|
smoogipoo
|
30dbc36fce
|
Don't clear username on logout
|
2018-12-22 17:54:19 +09:00 |
|
smoogipoo
|
0757beb3b8
|
Test for null before loading
|
2018-12-22 17:54:08 +09:00 |
|
smoogipoo
|
d9b8df1595
|
Merge remote-tracking branch 'origin/master' into user-registration
|
2018-12-22 17:19:28 +09:00 |
|
Dan Balasescu
|
6b3fb06b62
|
Merge pull request #3861 from peppy/improve-text-search
Improve the way text search works at song select
|
2018-12-22 16:52:33 +09:00 |
|
Dan Balasescu
|
e6c197e9aa
|
Merge branch 'master' into improve-text-search
|
2018-12-22 16:38:50 +09:00 |
|
Dan Balasescu
|
ddb1467609
|
Merge pull request #3900 from peppy/add-page-tooltip
Add tooltip text to results screen pages
|
2018-12-22 16:38:45 +09:00 |
|
Dean Herbert
|
005c6ff40c
|
Add tooltip text to results screen pages
|
2018-12-22 16:30:06 +09:00 |
|
smoogipoo
|
d00e280276
|
Merge remote-tracking branch 'origin/master' into timeshift-wip
|
2018-12-22 16:27:11 +09:00 |
|
Dean Herbert
|
b1eb543a50
|
Merge pull request #3899 from peppy/modular-results-screen
Modular results screen
|
2018-12-22 16:26:37 +09:00 |
|
smoogipoo
|
bb08bf10a0
|
Fix post-merge issues
|
2018-12-22 16:26:27 +09:00 |
|
smoogipoo
|
c2a00b84c7
|
Merge remote-tracking branch 'peppy/modular-results-screen' into timeshift-wip
# Conflicts:
# osu.Game/Screens/Multi/IMultiplayerScreen.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/Screens/Play/SoloResults.cs
# osu.Game/Screens/Ranking/IResultPageInfo.cs
# osu.Game/Screens/Ranking/ResultMode.cs
# osu.Game/Screens/Ranking/ResultModeButton.cs
# osu.Game/Screens/Ranking/ResultModeTabControl.cs
# osu.Game/Screens/Ranking/Results.cs
|
2018-12-22 16:22:02 +09:00 |
|
Dean Herbert
|
7e97d37df5
|
Merge remote-tracking branch 'upstream/master' into modular-results-screen
|
2018-12-22 16:20:39 +09:00 |
|
Dean Herbert
|
a35d9178f0
|
Quick rename
|
2018-12-22 16:20:29 +09:00 |
|
Dean Herbert
|
080552d5be
|
Merge pull request #3893 from peppy/rewrite-standalone-chat
Make standalone chat reuse more code from main chat overlay
|
2018-12-22 16:16:54 +09:00 |
|
Dan Balasescu
|
2c97409e2e
|
Merge branch 'master' into rewrite-standalone-chat
|
2018-12-22 16:07:27 +09:00 |
|
Dean Herbert
|
e7508cbd5e
|
Fix CI issues
|
2018-12-22 15:55:10 +09:00 |
|
Dean Herbert
|
e404a0bc20
|
Clean-ups and renames
|
2018-12-22 15:51:00 +09:00 |
|
smoogipoo
|
baed0ef3ba
|
Rename variable
|
2018-12-22 15:46:04 +09:00 |
|
smoogipoo
|
b9ec179713
|
Split out more requests + responses
|
2018-12-22 15:45:16 +09:00 |
|
smoogipoo
|
daa6292e08
|
Split results screen to allow for extensibility
|
2018-12-22 15:39:06 +09:00 |
|
smoogipoo
|
0e9991b81a
|
Merge remote-tracking branch 'origin/master' into timeshift-wip
|
2018-12-22 15:36:36 +09:00 |
|
Dean Herbert
|
e3308010c0
|
Merge pull request #3898 from peppy/leaderboard-modularity
Leaderboard modularity
|
2018-12-22 15:36:12 +09:00 |
|
smoogipoo
|
ac0e6f8d42
|
Fix post-merge issues
|
2018-12-22 15:35:22 +09:00 |
|
smoogipoo
|
bdb6e03dfb
|
Merge remote-tracking branch 'peppy/leaderboard-modularity' into timeshift-wip
# Conflicts:
# osu.Game/Online/Leaderboards/Leaderboard.cs
# osu.Game/Online/Leaderboards/LeaderboardScore.cs
# osu.Game/Screens/Ranking/Pages/ScoreResultsPage.cs
# osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
|
2018-12-22 15:33:26 +09:00 |
|
Dean Herbert
|
29fd1719da
|
Merge pull request #3896 from peppy/backwards-drawable-date
Allow DrawableDate to be used to display future dates
|
2018-12-22 15:29:05 +09:00 |
|
Dean Herbert
|
a15091be49
|
Merge pull request #3895 from peppy/default-osu-keys
Change osu! default keys back to Z/X
|
2018-12-22 15:28:02 +09:00 |
|
Dean Herbert
|
52c6d5bfd4
|
Move protected method down
|
2018-12-22 15:23:32 +09:00 |
|
Dean Herbert
|
787e65c3c5
|
Reduce generic-ness
|
2018-12-22 15:20:35 +09:00 |
|
smoogipoo
|
3570c35d7f
|
Make RoomScore derive ScoreInfo
|
2018-12-22 15:17:35 +09:00 |
|
Dan Balasescu
|
9391b92e1a
|
Merge pull request #3897 from peppy/clickable-avatars
Clickable avatars
|
2018-12-22 15:01:58 +09:00 |
|
smoogipoo
|
6afd2f7263
|
Adjust styling of disabled settings
|
2018-12-22 15:00:35 +09:00 |
|
smoogipoo
|
34fc740e1f
|
Implement testcase for room settings
|
2018-12-22 14:48:15 +09:00 |
|
Dean Herbert
|
23259b295c
|
Remove unnecessary using
|
2018-12-22 14:45:35 +09:00 |
|
smoogipoo
|
e657f13c15
|
Separate out Leaderboard into BeatmapLeaderboard
|
2018-12-22 14:44:36 +09:00 |
|
Dean Herbert
|
870d843fff
|
Fix username not displaying correctly in overlay
|
2018-12-22 14:40:55 +09:00 |
|
smoogipoo
|
b82bb0ea28
|
Mate RoomSettingsOverlay fill height
|
2018-12-22 14:40:10 +09:00 |
|
smoogipoo
|
09d7dc73dc
|
Allow channel manager and osugame to be null
|
2018-12-22 14:38:46 +09:00 |
|
smoogipoo
|
dbd391825a
|
Rework+fix TestCaseMultiHeader
|
2018-12-22 14:30:08 +09:00 |
|
smoogipoo
|
f47ac35522
|
Add click to avatar
|
2018-12-22 14:23:53 +09:00 |
|
Dean Herbert
|
621480af02
|
Add simple (non-automated) test
|
2018-12-22 14:21:21 +09:00 |
|
smoogipoo
|
7191233be8
|
Allow roommanager to be null
|
2018-12-22 14:14:14 +09:00 |
|
smoogipoo
|
21cfe5a3e6
|
Decouple header from matchscreen
|
2018-12-22 14:12:27 +09:00 |
|
smoogipoo
|
c06cf5d379
|
Decouple match info from match screen
|
2018-12-22 14:08:00 +09:00 |
|
smoogipoo
|
d28c754256
|
Fix negative dates, and time moving in opposite direction
|
2018-12-22 14:06:50 +09:00 |
|
smoogipoo
|
86ce0b5519
|
Make DrawableDate adjustable
|
2018-12-22 14:06:44 +09:00 |
|