Dean Herbert
|
cb3402098a
|
Merge remote-tracking branch 'upstream/master' into user-profile-fixes
|
2017-07-20 19:32:00 +09:00 |
|
Dean Herbert
|
3bdd4d7d02
|
Centralise TrackManager.AddItem logic to avoid duplicate adds
|
2017-07-20 17:46:33 +09:00 |
|
Dean Herbert
|
67b95926c4
|
Remove usage of SetExclusive
Also immediately disposes WorkingBeatmaps on ValueChanged.
|
2017-07-20 16:45:44 +09:00 |
|
Jorolf
|
bac8693c81
|
Merge branch 'user-profile-fixes' of github.com:Jorolf/osu into user-profile-fixes
|
2017-07-20 01:08:42 +02:00 |
|
Jorolf
|
e0fb2563b5
|
remove using
|
2017-07-20 01:08:26 +02:00 |
|
jorolf
|
c2a2f77210
|
Merge branch 'master' into user-profile-fixes
|
2017-07-20 01:06:36 +02:00 |
|
Jorolf
|
b016103894
|
add link to user page
|
2017-07-20 01:03:00 +02:00 |
|
Dean Herbert
|
2c5019ff7c
|
Forward action in saner way
|
2017-07-19 18:22:46 +09:00 |
|
Dean Herbert
|
b6b7ae47db
|
Merge branch 'master' into user-profile-fixes
|
2017-07-19 18:15:38 +09:00 |
|
Dean Herbert
|
2eccb3822a
|
Make link text not suck
|
2017-07-19 17:54:04 +09:00 |
|
Dean Herbert
|
59416584c1
|
Don't show theme song in playlist
|
2017-07-19 15:16:35 +09:00 |
|
Thomas Müller
|
a225b542d5
|
Sender is always non-null
|
2017-07-18 12:35:36 +03:00 |
|
Thomas Müller
|
fce5a191f1
|
Migrate padding into the scroll content to not cut off effects
|
2017-07-18 12:26:27 +03:00 |
|
Thomas Müller
|
e58ea97604
|
Improve design as requested
|
2017-07-18 12:26:05 +03:00 |
|
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
|
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
|
4229f933fe
|
Rename link class, add hover colour
|
2017-07-18 10:51:11 +09:00 |
|
Jorolf
|
9c70d03a33
|
replace SpriteText with OsuSpriteText
|
2017-07-17 21:12:50 +02:00 |
|
Jorolf
|
80dc888769
|
address CI concerns
|
2017-07-17 21:11:54 +02:00 |
|
Jorolf
|
edd4e622cf
|
add hyper links to twitter, website and skype
|
2017-07-17 20:31:10 +02:00 |
|
Jorolf
|
b9eb7a8445
|
make chat message users open UserProfileOverlay
|
2017-07-17 20:26:55 +02:00 |
|
Jorolf
|
689866f5dd
|
minor improvements
|
2017-07-17 20:25:57 +02: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
|
fa0c0e3b48
|
Merge branch 'master' into fix-track-rotation
|
2017-07-14 19:38:48 +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
|
3914b3ba13
|
Merge branch 'master' into right-mouse-scrollbar
|
2017-07-14 19:15:00 +10:00 |
|
Dean Herbert
|
9dba363b08
|
Use button boundaries to decide when to expand sidebar
|
2017-07-14 17:57:01 +09:00 |
|
Dean Herbert
|
b957bca4c5
|
Merge branch 'master' into settings-improvements
|
2017-07-14 17:27:09 +09:00 |
|
Dean Herbert
|
3aeed86392
|
Merge branch 'master' into drawable-room-update
|
2017-07-14 15:29:27 +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
|
ce204b8e7b
|
Merge remote-tracking branch 'ppy/master' into right-mouse-scrollbar
|
2017-07-14 06:23:07 +09: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
|
fc28617099
|
Merge remote-tracking branch 'upstream/master' into ruleset-settings
|
2017-07-13 15:35:53 +09:00 |
|
Dean Herbert
|
de46f3ab07
|
Remove all unnecessary parenthesis where object initialisers are used
Enforces at CI.
|
2017-07-13 15:11:33 +09:00 |
|