Dean Herbert
|
e317b047f8
|
Merge remote-tracking branch 'upstream/master' into updateable-beatmap-sprite
|
2018-12-26 18:49:41 +09:00 |
|
Dean Herbert
|
edfb027ff2
|
Update framework
|
2018-12-26 18:49:33 +09:00 |
|
Dan Balasescu
|
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 |
|
Dean Herbert
|
63847890d1
|
Add better messaging when connecting or failing
|
2018-12-26 18:07:33 +09:00 |
|
Dean Herbert
|
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 |
|
smoogipoo
|
aeb2186539
|
Fix api get user request never failing
|
2018-12-26 16:06:39 +09:00 |
|
Dan Balasescu
|
2b1466ef58
|
Merge pull request #3915 from peppy/rider-live-tempaltes
Add rider live templates
|
2018-12-26 14:33:53 +09:00 |
|
Dean Herbert
|
3370de3c2e
|
Add rider live templates
|
2018-12-26 11:53:24 +09:00 |
|
Dean Herbert
|
c902c1587a
|
Add tests and modify fallback logic
|
2018-12-25 19:17:32 +09:00 |
|
Dean Herbert
|
c45c34d400
|
Make beatmap importing possible elsewhere in tests
|
2018-12-25 19:17:21 +09:00 |
|
smoogipoo
|
96c9e5f209
|
Make DefaultBeatmap readonly
|
2018-12-25 18:34:45 +09:00 |
|
Dean Herbert
|
9542e3e24a
|
Add Updateable beatmap sprite
|
2018-12-25 18:04:13 +09:00 |
|
Dan Balasescu
|
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 |
|
VINXIS
|
227c63dd1c
|
numtotalhits -> totalHits
|
2018-12-23 22:23:43 -07:00 |
|
VINXIS
|
8020ac26fb
|
MBMasher's FL change
|
2018-12-23 22:14:28 -07: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 |
|
Dean Herbert
|
b1eb543a50
|
Merge pull request #3899 from peppy/modular-results-screen
Modular results screen
|
2018-12-22 16:26:37 +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
|
daa6292e08
|
Split results screen to allow for extensibility
|
2018-12-22 15:39:06 +09:00 |
|
Dean Herbert
|
e3308010c0
|
Merge pull request #3898 from peppy/leaderboard-modularity
Leaderboard modularity
|
2018-12-22 15:36:12 +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 |
|
Dan Balasescu
|
9391b92e1a
|
Merge pull request #3897 from peppy/clickable-avatars
Clickable avatars
|
2018-12-22 15:01:58 +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
|
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
|
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 |
|
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 |
|