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 |
|
smoogipoo
|
d93421b796
|
Merge remote-tracking branch 'Joehuu/master' into timeshift-wip
# Conflicts:
# osu.Game/Screens/Play/HUD/ModDisplay.cs
|
2018-12-22 14:02:45 +09:00 |
|
smoogipoo
|
f1a9a352fc
|
Cleanup bindable handling
|
2018-12-22 14:01:06 +09:00 |
|
smoogipoo
|
1cb69c3478
|
Split requests/responses into separate files
|
2018-12-22 12:50:37 +09:00 |
|
smoogipoo
|
dd0c04ea36
|
Move RoomManager to multiplayer screen
|
2018-12-22 12:45:36 +09:00 |
|
Dean Herbert
|
f0dfc75bb2
|
Change osu! default keys back to Z/X
A/S was no better as far as keyboard layout agnostic-ness. And people are confused if we change the defaults. Need to take a step back and reassess.
|
2018-12-22 09:49:09 +09:00 |
|
Dean Herbert
|
c1d316d06e
|
Merge pull request #3894 from Poyo-SSB/fix-hardrock-sliders
Fix extra hard-rock flipping for sliders
|
2018-12-22 09:45:36 +09:00 |
|
Poyo
|
08d7c2df70
|
Fix extra hard-rock flipping for sliders
|
2018-12-21 16:08:08 -08:00 |
|
Dean Herbert
|
396caae0a9
|
Remove redundant newline
|
2018-12-21 19:01:19 +09:00 |
|
smoogipoo
|
7e9cc4e876
|
Seed the results screen
|
2018-12-21 18:37:33 +09:00 |
|
smoogipoo
|
4149734f89
|
Add room leaderboard to results
|
2018-12-21 18:22:13 +09:00 |
|
Dean Herbert
|
81104f4803
|
Make standalone chat reuse more code from main chat overlay
|
2018-12-21 17:54:12 +09:00 |
|
smoogipoo
|
8a2cc64bfa
|
Split results screen to allow for extensibility
|
2018-12-21 16:34:03 +09:00 |
|
Dean Herbert
|
a54951b72d
|
Merge pull request #3889 from peppy/add-alt-select-support
Add ability to select chat tabs with alt-1-9
|
2018-12-21 15:02:52 +09:00 |
|
smoogipoo
|
fe6c369e07
|
Fix incorrect channel
|
2018-12-21 14:37:05 +09:00 |
|
Dean Herbert
|
6bca344e56
|
Merge branch 'master' into add-alt-select-support
|
2018-12-21 14:32:24 +09:00 |
|
smoogipoo
|
1df4826a1d
|
Merge remote-tracking branch 'origin/master' into timeshift-wip
|
2018-12-21 14:14:17 +09:00 |
|
Dean Herbert
|
1e39a4e09a
|
Merge pull request #3892 from smoogipoo/standalone-chat-fixes
Various standalone chat display fixes
|
2018-12-21 14:12:37 +09:00 |
|
smoogipoo
|
6a9b0a0ba3
|
Fix initial messages not being received
|
2018-12-21 14:02:36 +09:00 |
|