Commit Graph

15805 Commits

Author SHA1 Message Date
755c6b9243 Make room settings scroll 2018-12-26 15:03:35 +09:00
ce33c301f6 Merge remote-tracking branch 'upstream/master' into timeshift-wip 2018-12-26 14:46:17 +09:00
2b1466ef58 Merge pull request #3915 from peppy/rider-live-tempaltes
Add rider live templates
2018-12-26 14:33:53 +09:00
e9556afe22 Don't use all uppercase (is applied automatically) 2018-12-26 14:26:35 +09:00
e4a72c0c64 Fix failing testcase 2018-12-26 13:18:36 +09:00
3370de3c2e Add rider live templates 2018-12-26 11:53:24 +09:00
6a5f0eca18 Fix various elements flashing 2018-12-25 18:07:50 +09:00
1dd2a4e368 Fix host info not working 2018-12-25 18:07:19 +09:00
2f32c4d4d1 Fix title of match song select 2018-12-25 17:17:51 +09:00
d4f5a8507c Exit from match screen on escape 2018-12-25 17:14:56 +09:00
91b83cd4b8 Fix leaderboard being queried on room creation 2018-12-25 13:57:25 +09:00
bcd3584df0 Merge remote-tracking branch 'origin/master' into timeshift-wip 2018-12-25 12:04:39 +09:00
23d21a45e5 More automated tests 2018-12-25 11:59:08 +09:00
626ec85ae8 Remove IHasFilterableChildren from class 2018-12-25 11:58:28 +09:00
6712a68797 Create IRoomManager interface, add test for RoomsContainer 2018-12-25 11:45:50 +09:00
f79aa07d02 Fix enddate not being bound to 2018-12-25 11:31:36 +09:00
e0e75c7339 Fix incorrect room status 2018-12-25 11:24:46 +09:00
9368054d47 Merge pull request #3908 from VINXIS/patch-1
Implement MBMasher's FL change into osu!'s ppcalc
2018-12-24 14:54:42 +09:00
227c63dd1c numtotalhits -> totalHits 2018-12-23 22:23:43 -07:00
8020ac26fb MBMasher's FL change 2018-12-23 22:14:28 -07:00
02365ee5ba Merge remote-tracking branch 'origin/master' into timeshift-wip 2018-12-22 23:23:21 +09:00
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
31da77ad62 Merge pull request #3825 from peppy/user-registration
User registration
2018-12-22 20:06:53 +09:00
40db23ff4c Disable avatar clicks in chat tabs 2018-12-22 19:30:52 +09:00
30dbc36fce Don't clear username on logout 2018-12-22 17:54:19 +09:00
0757beb3b8 Test for null before loading 2018-12-22 17:54:08 +09:00
d9b8df1595 Merge remote-tracking branch 'origin/master' into user-registration 2018-12-22 17:19:28 +09:00
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
e6c197e9aa Merge branch 'master' into improve-text-search 2018-12-22 16:38:50 +09:00
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
005c6ff40c Add tooltip text to results screen pages 2018-12-22 16:30:06 +09:00
d00e280276 Merge remote-tracking branch 'origin/master' into timeshift-wip 2018-12-22 16:27:11 +09:00
b1eb543a50 Merge pull request #3899 from peppy/modular-results-screen
Modular results screen
2018-12-22 16:26:37 +09:00
bb08bf10a0 Fix post-merge issues 2018-12-22 16:26:27 +09:00
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
7e97d37df5 Merge remote-tracking branch 'upstream/master' into modular-results-screen 2018-12-22 16:20:39 +09:00
a35d9178f0 Quick rename 2018-12-22 16:20:29 +09:00
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
2c97409e2e Merge branch 'master' into rewrite-standalone-chat 2018-12-22 16:07:27 +09:00
e7508cbd5e Fix CI issues 2018-12-22 15:55:10 +09:00
e404a0bc20 Clean-ups and renames 2018-12-22 15:51:00 +09:00
baed0ef3ba Rename variable 2018-12-22 15:46:04 +09:00
b9ec179713 Split out more requests + responses 2018-12-22 15:45:16 +09:00
daa6292e08 Split results screen to allow for extensibility 2018-12-22 15:39:06 +09:00
0e9991b81a Merge remote-tracking branch 'origin/master' into timeshift-wip 2018-12-22 15:36:36 +09:00
e3308010c0 Merge pull request #3898 from peppy/leaderboard-modularity
Leaderboard modularity
2018-12-22 15:36:12 +09:00
ac0e6f8d42 Fix post-merge issues 2018-12-22 15:35:22 +09:00
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
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
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