Commit Graph

15673 Commits

Author SHA1 Message Date
a2885a99cc Merge pull request #3921 from smoogipoo/fix-webrequest-cancellation
Fix cancelling completed webrequests throwing exceptions
2018-12-26 22:17:01 +09:00
fb15806c98 Merge branch 'master' into fix-webrequest-cancellation 2018-12-26 21:21:29 +09:00
bee4e8ad28 Fix cancelled webrequests triggering exceptions 2018-12-26 21:17:10 +09:00
bef3c585c3 Merge pull request #3912 from peppy/updateable-beatmap-sprite
Add Updateable beatmap sprite
2018-12-26 20:56:04 +09:00
ae47eb61ca Fix test not working when not logged in 2018-12-26 20:42:47 +09:00
e317b047f8 Merge remote-tracking branch 'upstream/master' into updateable-beatmap-sprite 2018-12-26 18:49:41 +09:00
edfb027ff2 Update framework 2018-12-26 18:49:33 +09:00
029bbbc869 Merge pull request #3917 from peppy/better-login-messaging
Add better messaging when connecting or failing
2018-12-26 18:35:34 +09:00
63847890d1 Add better messaging when connecting or failing 2018-12-26 18:07:33 +09:00
7c1e3d66eb Merge pull request #3916 from smoogipoo/fix-getuser-request-failing
Fix API get user request never failing
2018-12-26 16:32:01 +09:00
aeb2186539 Fix api get user request never failing 2018-12-26 16:06:39 +09:00
2b1466ef58 Merge pull request #3915 from peppy/rider-live-tempaltes
Add rider live templates
2018-12-26 14:33:53 +09:00
3370de3c2e Add rider live templates 2018-12-26 11:53:24 +09:00
c902c1587a Add tests and modify fallback logic 2018-12-25 19:17:32 +09:00
c45c34d400 Make beatmap importing possible elsewhere in tests 2018-12-25 19:17:21 +09:00
96c9e5f209 Make DefaultBeatmap readonly 2018-12-25 18:34:45 +09:00
9542e3e24a Add Updateable beatmap sprite 2018-12-25 18:04:13 +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
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
b1eb543a50 Merge pull request #3899 from peppy/modular-results-screen
Modular results screen
2018-12-22 16:26:37 +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
daa6292e08 Split results screen to allow for extensibility 2018-12-22 15:39:06 +09:00
e3308010c0 Merge pull request #3898 from peppy/leaderboard-modularity
Leaderboard modularity
2018-12-22 15:36:12 +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
52c6d5bfd4 Move protected method down 2018-12-22 15:23:32 +09:00
787e65c3c5 Reduce generic-ness 2018-12-22 15:20:35 +09:00
9391b92e1a Merge pull request #3897 from peppy/clickable-avatars
Clickable avatars
2018-12-22 15:01:58 +09:00
23259b295c Remove unnecessary using 2018-12-22 14:45:35 +09:00
e657f13c15 Separate out Leaderboard into BeatmapLeaderboard 2018-12-22 14:44:36 +09:00
870d843fff Fix username not displaying correctly in overlay 2018-12-22 14:40:55 +09:00
f47ac35522 Add click to avatar 2018-12-22 14:23:53 +09:00
621480af02 Add simple (non-automated) test 2018-12-22 14:21:21 +09:00
d28c754256 Fix negative dates, and time moving in opposite direction 2018-12-22 14:06:50 +09:00