1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-12 17:57:21 +08:00

1313 Commits

Author SHA1 Message Date
Jorolf
b016103894 add link to user page 2017-07-20 01:03:00 +02:00
Thomas Müller
c4619f614a Merge branch 'master' of github.com:ppy/osu into better-transforms
# Conflicts:
#	osu-framework
2017-07-19 19:15:51 +02:00
MrTheMake
6ff2b73c30 Merge branch 'master' of https://github.com/ppy/osu into musiccontroller-canbeatmapchange 2017-07-19 16:50:29 +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
4d8261fe0b Merge branch 'master' of https://github.com/ppy/osu into better-transforms
# Conflicts:
#	osu-framework
#	osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
#	osu.Game/Overlays/DragBar.cs
2017-07-18 15:16:02 +03: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
Thomas Müller
87bcd526f3 Get rid of raw AddDelay calls within osu.Game 2017-07-17 16:51:21 +03: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
Thomas Müller
19fb03e737 Try different formatting style 2017-07-16 18:28:20 +03:00
Thomas Müller
032e9df67b ApplyDelay -> AddDelay 2017-07-16 17:47:29 +03:00
Thomas Müller
99221260c4 Replace several usages of BeginDelayedSequence with LINQ-style 2017-07-16 17:42:01 +03:00
Thomas Müller
71105bb9ee Delay -> ApplyDelay; DelayReset -> ResetDelay 2017-07-16 14:06:46 +03:00
Thomas Müller
6063219b72 Update framework 2017-07-16 13:59:26 +03:00
Thomas Müller
a5e610a7ba Update framework and fix compilation
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
2017-07-14 19:18:12 +03: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
MrTheMake
c0fd4a765e Removed unused variable 2017-07-14 12:46:07 +02:00
MrTheMake
d2c18026f2 Removed unnecessary variables 2017-07-14 12:45:24 +02:00
MrTheMake
a95339dc1d Removed the reopening of the playlist overlay 2017-07-14 12:37:56 +02:00
MrTheMake
c053733ea9 Updated to use ppy's implementation 2017-07-14 12:09:55 +02:00
MrTheMake
8e0d59bfed Updated to use ppy's implementation 2017-07-14 12:08:56 +02: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