Commit Graph

15648 Commits

Author SHA1 Message Date
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
Dean Herbert
81104f4803 Make standalone chat reuse more code from main chat overlay 2018-12-21 17:54:12 +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
Dean Herbert
6bca344e56
Merge branch 'master' into add-alt-select-support 2018-12-21 14:32:24 +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
smoogipoo
6b6629e9fd Fix not posting to the correct channel 2018-12-21 14:02:29 +09:00
Dean Herbert
59452800ed Update framework 2018-12-21 13:33:06 +09:00
Dan Balasescu
e8a03a94d1
Merge pull request #3887 from peppy/standalone-chat
Add a stand-alone chat display component
2018-12-21 12:47:01 +09:00
Dan Balasescu
3d4edd9121
Merge branch 'master' into standalone-chat 2018-12-21 12:31:33 +09:00
Dan Balasescu
a18b28388d
Merge pull request #3890 from peppy/netcoreapp22-target
Fix targeting netcoreapp2.1 in many places
2018-12-21 12:20:22 +09:00
Dean Herbert
e26958f901 Fix targeting netcoreapp2.1 in many places 2018-12-21 10:24:32 +09:00
Dean Herbert
aaac45ab8c Add ability to select chat tabs with alt-1-9 2018-12-20 21:50:47 +09:00
Dean Herbert
f195d6cb23
Merge pull request #3180 from WebFreak001/mod-fl2
Add "Blinds" mod
2018-12-20 20:25:26 +09:00
Dean Herbert
ce414ed7d0
Merge branch 'master' into mod-fl2 2018-12-20 19:56:25 +09:00
Dean Herbert
abad9b8721
Merge pull request #3888 from plankp/patch-1
Update README about SDK version
2018-12-20 19:50:52 +09:00
Paul Teng
36f57a7abb
Update README.md 2018-12-20 05:49:05 -05:00
Dean Herbert
ef9d93ff6b Remove mod multipliers
We decided that mods shouldn't be interacting with other mods. This can be added once we have the ability to have per-mod settings, as a difficulty setting local to blinds.
2018-12-20 19:46:39 +09:00
Dean Herbert
d3368df94d Simplify changes to RulesetContainer 2018-12-20 19:35:32 +09:00
Dean Herbert
bc8b0485d8 Add textbox/posting support 2018-12-20 18:49:03 +09:00
Dean Herbert
65447d6f4a Add optional parameters to target messages at a specific channel 2018-12-20 17:01:08 +09:00