Thomas Müller
|
c8eeea64c3
|
Merge branch 'master' of https://github.com/ppy/osu into custom-chat-colours
|
2017-07-18 10:54:15 +03:00 |
|
Thomas Müller
|
e72c009dd7
|
Highlight custom-named users
|
2017-07-18 10:53:41 +03:00 |
|
Dean Herbert
|
0034b718a9
|
Merge pull request #966 from jai-sharma/remove-dragbar
Remove DragBar and replace with classes that inherit SliderBar
|
2017-07-18 15:43:40 +09:00 |
|
Dean Herbert
|
4b4b03756a
|
Don't use dodgy OnLoaded "event"
|
2017-07-18 15:37:58 +09:00 |
|
Dean Herbert
|
82217be988
|
Fix dodgy event clearing
Also use local ariables where possible.
|
2017-07-18 15:24:52 +09:00 |
|
Dean Herbert
|
c5d23daa6b
|
Merge remote-tracking branch 'upstream/master' into remove-dragbar
# Conflicts:
# osu.Game/Overlays/DragBar.cs
|
2017-07-18 13:44:23 +09:00 |
|
Dean Herbert
|
ef869cb501
|
Merge pull request #949 from MrTheMake/songselect-preview-fix
Fix not applying song select preview seek
|
2017-07-18 13:09:59 +09:00 |
|
Dean Herbert
|
b5035ec245
|
Merge branch 'master' into songselect-preview-fix
|
2017-07-18 13:05:03 +09:00 |
|
Dean Herbert
|
406cf9d0d4
|
Merge pull request #936 from huoyaoyuan/profile
Basic User Profile Page
|
2017-07-17 14:10:52 +09:00 |
|
Dean Herbert
|
93290ef966
|
Rename populate method
|
2017-07-17 13:56:50 +09:00 |
|
Dean Herbert
|
a63124c935
|
User property instead of weirdly named method
|
2017-07-17 13:39:29 +09:00 |
|
Dean Herbert
|
f322c264a0
|
One constant per line
|
2017-07-17 13:24:05 +09:00 |
|
Dean Herbert
|
5d77a5f988
|
Allow closing profile by clicking basically anywhere
|
2017-07-17 10:15:55 +09:00 |
|
Huo Yaoyuan
|
26b36c08a3
|
Prefer ScrollTo in SectionsContainer.
|
2017-07-14 22:56:27 +08:00 |
|
Huo Yaoyuan
|
6cf36da389
|
Merge branch 'master' into profile
|
2017-07-14 22:52:19 +08:00 |
|
Dan Balasescu
|
aa15d369c3
|
Merge pull request #1009 from peppy/fix-track-rotation
Fix track rotation
|
2017-07-14 19:48:43 +10:00 |
|
Dan Balasescu
|
fa0c0e3b48
|
Merge branch 'master' into fix-track-rotation
|
2017-07-14 19:38:48 +10:00 |
|
Dan Balasescu
|
68d1e920fd
|
Merge pull request #1016 from peppy/settings-improvements
Settings improvements
|
2017-07-14 19:32:08 +10:00 |
|
Dan Balasescu
|
c13dc943f8
|
Merge branch 'master' into fix-track-rotation
|
2017-07-14 19:25:54 +10:00 |
|
Dan Balasescu
|
a6d917285a
|
Merge branch 'master' into settings-improvements
|
2017-07-14 19:22:45 +10:00 |
|
Dan Balasescu
|
cb213a5f0f
|
Merge pull request #1013 from peppy/right-mouse-scrollbar
Add support for right mouse absolute scrolling (when enabled)
|
2017-07-14 19:22:29 +10:00 |
|
Dan Balasescu
|
3914b3ba13
|
Merge branch 'master' into right-mouse-scrollbar
|
2017-07-14 19:15:00 +10:00 |
|
Dean Herbert
|
b7612af20c
|
Make comment different
|
2017-07-14 18:08:47 +09:00 |
|
Dean Herbert
|
9dba363b08
|
Use button boundaries to decide when to expand sidebar
|
2017-07-14 17:57:01 +09:00 |
|
Dan Balasescu
|
3702d4b921
|
Merge branch 'master' into settings-improvements
|
2017-07-14 18:43:08 +10:00 |
|
Dean Herbert
|
36594afee3
|
Merge pull request #978 from EVAST9919/mods_overlay_fix
Hide "Unranked" text in ModDisplay if play is ranked
|
2017-07-14 17:36:46 +09:00 |
|
Dean Herbert
|
95a40e39ec
|
Merge branch 'master' into mods_overlay_fix
|
2017-07-14 17:31:52 +09:00 |
|
Dean Herbert
|
b957bca4c5
|
Merge branch 'master' into settings-improvements
|
2017-07-14 17:27:09 +09:00 |
|
Dean Herbert
|
e433684899
|
Merge pull request #970 from DrabWeb/drawable-room-update
DrawableRoom design update
|
2017-07-14 15:35:44 +09:00 |
|
Dean Herbert
|
3aeed86392
|
Merge branch 'master' into drawable-room-update
|
2017-07-14 15:29:27 +09:00 |
|
Dean Herbert
|
e2223a24f6
|
Merge pull request #1012 from DrabWeb/medal-splash
Medal splash
|
2017-07-14 14:47:24 +09:00 |
|
Dean Herbert
|
bce4b838d8
|
Formatting
|
2017-07-14 14:40:50 +09:00 |
|
Dean Herbert
|
133bcdec7a
|
Move async loading to a higher level to simplify logic
|
2017-07-14 14:39:15 +09:00 |
|
Dean Herbert
|
980fb18ed6
|
Remove unnecessary alpha/alwayspresent changes
|
2017-07-14 14:30:35 +09:00 |
|
Dean Herbert
|
20052b060c
|
Nest delays and implement IStateful, allowing for flushing on early dismiss
Note that this will break rotation loops until https://github.com/ppy/osu-framework/issues/900 is addressed.
|
2017-07-14 13:25:31 +09:00 |
|
Dean Herbert
|
ab5341eadc
|
Merge remote-tracking branch 'upstream/master' into DrabWeb/medal-splash
|
2017-07-14 09:46:36 +09:00 |
|
Dean Herbert
|
e3ff79fdd1
|
Merge pull request #1018 from Nabile-Rahmani/skip-button-fix
Make the skip button clickable only once.
|
2017-07-14 09:45:16 +09:00 |
|
Dean Herbert
|
6c9219856d
|
Add comment
|
2017-07-14 09:39:40 +09:00 |
|
Dean Herbert
|
b1d447bf71
|
Add missing access modifier
|
2017-07-14 07:05:39 +09:00 |
|
Dean Herbert
|
bfa6a9aa4e
|
Add missing licence header
|
2017-07-14 06:43:33 +09:00 |
|
Nabile Rahmani
|
840cc918ea
|
Use Enabled instead of a private field.
|
2017-07-13 23:35:19 +02:00 |
|
Dean Herbert
|
a6ac61f735
|
Update framework
|
2017-07-14 06:24:07 +09:00 |
|
Dean Herbert
|
ce204b8e7b
|
Merge remote-tracking branch 'ppy/master' into right-mouse-scrollbar
|
2017-07-14 06:23:07 +09:00 |
|
Nabile Rahmani
|
8014cd55a2
|
Make the skip button clickable only once.
|
2017-07-13 21:59:17 +02:00 |
|
Dean Herbert
|
2ff92ac25a
|
Contract sidebar on click
Also makes queueing of expand more correct.
|
2017-07-13 17:09:12 +09:00 |
|
Dean Herbert
|
939e167d6a
|
Correct offset settings vertically based on toolbar visibility
|
2017-07-13 17:09:12 +09:00 |
|
Dean Herbert
|
f4fd263671
|
Fix settings not offsetting scroll operations by fixed header content
|
2017-07-13 17:09:12 +09:00 |
|
Dean Herbert
|
8460e29bcb
|
Sidebar now pushes full settings out further
|
2017-07-13 17:09:12 +09:00 |
|
Dean Herbert
|
61c45b0b44
|
Merge pull request #1003 from Jorolf/ruleset-settings
Add ruleset settings
|
2017-07-13 17:08:51 +09:00 |
|
Dean Herbert
|
d3f5de9bf9
|
Move to UI namespace
|
2017-07-13 15:44:42 +09:00 |
|