6024 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jorolf	e0fb2563b5	remove using	2017-07-20 01:08:26 +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
Dan Balasescu	285790bae0	Merge pull request #1026 from peppy/beatmap-delete-fixes ... Fix crashes related to deleting/importing beatmaps	2017-07-19 17:46:49 +09:30
Dan Balasescu	42af26a5a5	Merge branch 'master' into beatmap-delete-fixes	2017-07-19 17:34:12 +09:30
Dan Balasescu	11eecdd281	Merge pull request #1028 from peppy/fix-flashy-sides ... Fix main menu flashy sides moving too much	2017-07-19 17:26:26 +09:30
Dean Herbert	c34856922c	Gratify CI	2017-07-19 16:34:18 +09:00
Dean Herbert	2a2f4e2a8b	Ensure side flashes are not visible during moving transitions	2017-07-19 16:13:01 +09:00
Dean Herbert	2b1e19814c	Side flashes should not be affected by parallax	2017-07-19 16:07:11 +09:00
Dean Herbert	6f59e5feec	Add null check on stream	2017-07-19 14:56:27 +09:00
Dean Herbert	f00140f0a4	Avoid crashes on attempting to import the same path twice in quick succession	2017-07-19 14:56:24 +09:00
Dean Herbert	5761eb30a0	Fix nullref error on re-importing a DeletePending beatmap ... Callback was expecting the beatmap to be populated where it wasn't being.	2017-07-19 14:56:20 +09:00
Dean Herbert	11ddded6fc	Merge pull request #1023 from Tom94/custom-chat-colours ... Use a background for custom-coloured users	2017-07-19 09:09:56 +09:00
Thomas Müller	6d8bdadf2d	Merge branch 'master' of https://github.com/ppy/osu into custom-chat-colours	2017-07-18 12:35:48 +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
Dean Herbert	b33c8226c1	Merge pull request #1024 from Tom94/fix-broken-tooltip ... Fix OsuTooltipContainer.PopIn not overriding PopOut transforms	2017-07-18 18:11:26 +09:00
Thomas Müller	b2dd43075f	Update framework	2017-07-18 11:57:41 +03:00
Thomas Müller	7acff29bd3	Fix OsuTooltipContainer.PopIn not overriding PopOut transforms	2017-07-18 11:53:56 +03:00
Thomas Müller	52acd23a5a	Update framework	2017-07-18 10:54:57 +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	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	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
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