6443 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Huo Yaoyuan	cd7c04c54d	Simplify misc null-coalescing expression.	2017-07-18 12:30:10 +08:00
Huo Yaoyuan	11cba0638d	Load UserProfileOverlay with a lower depth. ... This introduces a new level, so other overlays' depth are changed together.	2017-07-18 12:30:10 +08: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	4229f933fe	Rename link class, add hover colour	2017-07-18 10:51:11 +09:00
Dean Herbert	ae58e18178	Reorder code based on depth (and avoid possible conflicts)	2017-07-18 10:41:52 +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	440878945e	Remove remaining usages of AddDelay	2017-07-17 18:16:15 +03:00
Thomas Müller	546efc0181	Get rid of AddDelay & ResetDelay in osu.Game.Rulesets.Osu	2017-07-17 17:05:24 +03:00
Thomas Müller	87bcd526f3	Get rid of raw AddDelay calls within osu.Game	2017-07-17 16:51:21 +03: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
Thomas Müller	19fb03e737	Try different formatting style	2017-07-16 18:28:20 +03:00
Thomas Müller	e6916ec57b	Update framework	2017-07-16 17:48:47 +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	5372b94674	Remove some unnecessary usings	2017-07-14 19:35:44 +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
Thomas Müller	fd58c6e835	Nicer generic rolling counters	2017-07-14 19:14:07 +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
Thomas Müller	b5fbb26f8f	Merge branch 'master' of https://github.com/ppy/osu into better-transforms	2017-07-14 16:46:18 +03:00
Thomas Müller	c73a1ae058	Use TransformTo in rolling counters	2017-07-14 16:46:00 +03:00
MrTheMake	b01a6d46c9	Added beatmap lock functionallity to the music controller's test case	2017-07-14 12:54:37 +02: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	00a622da1a	Let disabled icon buttons be interactive again	2017-07-14 12:31:12 +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	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