4074 Commits

Author	SHA1	Message	Date
Dean Herbert	da92fccdb0	Merge branch 'master' into non-null-beatmap	2017-07-19 18:32:42 +09:00
Dean Herbert	d7dddec328	Set zero-difficulty values local to the dummy beatmap	2017-07-19 18:32:11 +09: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	0b53f1a7e3	Reference system	2017-07-19 18:09:59 +09:00
Dean Herbert	a01209cfe0	Simplify comparator	2017-07-19 18:09:59 +09:00
Dean Herbert	35157ca6b8	Make DefaultBeatmap private get.	2017-07-19 18:09:59 +09:00
Dean Herbert	2eccb3822a	Make link text not suck	2017-07-19 17:54:04 +09:00
Dan Balasescu	42af26a5a5	Merge branch 'master' into beatmap-delete-fixes	2017-07-19 17:34:12 +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	c8593a38c8	Remove incorrect looping reset behaviour ... Note that tracks' looping is never restored now. There's unfortunately no easy way around this, but it shouldn't have any side-effects for now.	2017-07-19 15:55:16 +09:00
Dean Herbert	64ebc01a3b	Remove many now unnecessary null-checks	2017-07-19 15:45:23 +09:00
Dean Herbert	8e8767cd37	Give song select a better default background whecn the beatmap's can't be loaded	2017-07-19 15:16:55 +09:00
Dean Herbert	d0dea33faa	Make Beatmap (bindable) non-nullable.	2017-07-19 15:16:53 +09:00
Dean Herbert	0846414c5b	Simplify state changes	2017-07-19 15:16:51 +09:00
Dean Herbert	632d2e8ba5	Dummy beatmap has dummy ruleset	2017-07-19 15:16:48 +09:00
Dean Herbert	f168ee660c	Move dummy to BeatmapDatabase	2017-07-19 15:16:43 +09:00
Dean Herbert	3289d93f22	Give the dummy beatmap a background	2017-07-19 15:16:42 +09:00
Dean Herbert	007b343854	Fix incorrect equality check when TimingPointAt returns a default T	2017-07-19 15:16:40 +09:00
Dean Herbert	21984ba764	Move DummyWorkingBeatmap to a more global level (OsuScreen)	2017-07-19 15:16:39 +09:00
Dean Herbert	6016310b09	Use a better default for difficulty values	2017-07-19 15:16:37 +09:00
Dean Herbert	df60fc0f0a	Stop playing previous beatmap even if new beatmap has no track	2017-07-19 15:16:36 +09:00
Dean Herbert	59416584c1	Don't show theme song in playlist	2017-07-19 15:16:35 +09:00
Dean Herbert	e47faf4e85	Add a dummy beatmap provider for use in BeatmapInfoWedge	2017-07-19 15:16:33 +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
Thomas Müller	3ba119c115	Ensure toolbar disappears when osu logo transition is cancelled	2017-07-18 17:09:53 +03:00
Thomas Müller	b40c897dbd	Fix osu logo shockwave playing when transition is aborted ... This is a very nice use-case scenario for TransformSequence.OnComplete	2017-07-18 15:28:56 +03: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	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
Thomas Müller	7acff29bd3	Fix OsuTooltipContainer.PopIn not overriding PopOut transforms	2017-07-18 11:53:56 +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	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	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
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
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	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	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	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	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	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	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
Dean Herbert	03e4b2a599	Add default status colour	2017-07-13 14:55:19 +09:00
Dean Herbert	b13e8599f1	Hide the login overlay when the user panel container by it is clicked	2017-07-13 14:46:17 +09:00
Dean Herbert	d1a5a042d7	Avoid storing locals in UserPanel. ... Also make clickable region more correct.	2017-07-13 14:34:51 +09:00
Dean Herbert	b79e309c2f	Don't lock scroll position of SectionsContainer header elements on negative scroll ... Feels better in all cases.	2017-07-13 14:24:41 +09:00
Dean Herbert	3c7cd97d42	Vertically center "coming soon" text	2017-07-13 14:24:08 +09:00
Dean Herbert	4cf409ab35	Adjust padding slightly	2017-07-13 14:23:52 +09:00
Dean Herbert	c7a13740f9	Move sections to own namespace	2017-07-13 13:53:45 +09:00
Dean Herbert	c02a85bc4a	Formatting	2017-07-13 13:52:40 +09:00
Dean Herbert	3a4150c6c3	Merge remote-tracking branch 'upstream/master' into profile ... # Conflicts: # osu.Game/Graphics/Containers/SectionsContainer.cs	2017-07-13 13:44:21 +09:00
DrabWeb	b196b1d3c6	CI fixes, switch RoomInspector to use BeatmapSetCover.	2017-07-13 01:24:59 -03:00
DrabWeb	fea40ccc1a	Share BeatmapSet cover sprite code.	2017-07-13 01:17:47 -03:00
DrabWeb	0624f578eb	Update with online beatmap changes.	2017-07-13 01:06:46 -03:00
DrabWeb	dc5ec319a2	Merge https://github.com/ppy/osu into drawable-room-update	2017-07-13 01:00:32 -03:00
Dean Herbert	f142bd0dc0	Improve formatting of panel creation code	2017-07-13 12:52:51 +09:00
DrabWeb	321ae42351	Formatting.	2017-07-13 00:27:41 -03:00
Dean Herbert	8045e0566f	Use a bindable for the current query. ... Aso debounce and don't require hitting enter.	2017-07-13 12:22:51 +09:00
Dean Herbert	4e1a998f9d	Don't return so early on empty search (never clears results)	2017-07-13 12:20:32 +09:00
Dean Herbert	e30f0a2e69	Avoid potentially calling updateSearch more than once in a single update	2017-07-13 12:20:07 +09:00
DrabWeb	931adcf677	Typo.	2017-07-13 00:13:56 -03:00
DrabWeb	ca12fd3042	Better medal sprite loading, fade in particles, visual test update.	2017-07-13 00:13:18 -03:00
Dean Herbert	190ea3bfab	Remove unnused variable	2017-07-13 11:06:28 +09:00
Dean Herbert	3f2f42d13c	Always load high resolution for now ... Also rename GetBackground to CreateBackground, since it's returning a new instance.	2017-07-13 10:30:09 +09:00
Dean Herbert	2c1f3de47a	Rename 2X resources to be defaults	2017-07-13 10:27:39 +09:00
Dean Herbert	56c817e4b6	Merge branch 'master' into osu-direct-search	2017-07-13 10:16:27 +09:00
Dean Herbert	9d47dd9ff9	Add support for right mouse absolute scrolling (when enabled) ... Will likely need to be bindable when hooked up to settings and actually used.	2017-07-12 18:57:44 +09:00
EVAST9919	0b1db1502d	removed useless bool	2017-07-12 09:42:38 +03:00
EVAST9919	ab8fb2edab	Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_overlay_fix	2017-07-12 09:31:56 +03:00
Dean Herbert	04e99d1369	Only apply disable rules when in a screen stack.	2017-07-12 13:40:17 +09:00
Dean Herbert	54f6befd67	Merge branch 'master' into fix-track-rotation	2017-07-12 13:18:16 +09:00
Dean Herbert	0322e66c25	Merge remote-tracking branch 'upstream/master' into container-collection-readonlylist	2017-07-12 13:07:23 +09:00
Dean Herbert	e1e7cb7178	Remove unnecessary using statements	2017-07-12 12:55:52 +09:00
Dean Herbert	c8c1dcae28	Fix incorrect filename	2017-07-12 12:55:40 +09:00
Thomas Müller	9d523ea012	Update framework	2017-07-12 11:06:13 +09:00
DrabWeb	204d2ee43d	Convert MedalOverlay animation durations to constants.	2017-07-11 22:43:16 -03:00
DrabWeb	29cdbc65bc	CI fixes.	2017-07-11 22:38:13 -03:00
DrabWeb	aef2a3bdda	Cleanup.	2017-07-11 22:26:58 -03:00
DrabWeb	16bb96e6aa	Async medal sprite loading.	2017-07-11 22:12:49 -03:00
Seth	b30721edbe	Merge branch 'master' into drawable-room-update	2017-07-11 20:42:44 -03:00
Jorolf	f7c9e449d4	add ruleset settings	2017-07-11 20:25:24 +02:00
Thomas Müller	4045083dcd	Update sorting comparers in line with framework changes	2017-07-11 21:21:58 +03:00
Dean Herbert	9bbcc0526d	Disable beatmap changes in specified screens	2017-07-11 18:39:10 +09:00
Dean Herbert	773ef26ce3	Make MusicController support disabled beatmap bindable	2017-07-11 18:38:49 +09:00
Dean Herbert	1bd3519ecb	Have beatmap return a zero-length TrackVirtual instead of null on load failure	2017-07-11 18:38:27 +09:00
Dean Herbert	311c2aec1c	Fix next track not automatically playing when music controller is not visible	2017-07-11 17:53:36 +09:00
Dean Herbert	cbb521e395	Merge master in	2017-07-11 15:11:44 +09:00
DrabWeb	2ee0f3f5f6	Update with framework changes.	2017-07-11 02:11:08 -03:00
DrabWeb	202e3ca530	Merge https://github.com/ppy/osu into medal-splash	2017-07-11 02:00:36 -03:00
DrabWeb	a9ff0b5317	Make SlimMenu more opaque.	2017-07-11 01:59:52 -03:00
DrabWeb	b448603d6c	CI fixes.	2017-07-11 01:42:51 -03:00
DrabWeb	fc7b4ceff1	Fix osu!direct visual test initially not having a mode selected.	2017-07-11 01:30:59 -03:00
Dean Herbert	a9c50786b2	Fix osu! logo on main menu ending up in the wrong place ... Also switch to using BeginDelayedSequence where possible.	2017-07-11 13:27:45 +09:00
DrabWeb	c449491c04	Fix RoomInspector covers.	2017-07-11 01:18:16 -03:00
DrabWeb	fbe414d780	Cleanup.	2017-07-11 01:03:38 -03:00
DrabWeb	69b290519f	Better BeatmapSetOnlineInfo comments.	2017-07-11 00:28:25 -03:00
DrabWeb	84701846ec	Merge https://github.com/ppy/osu into osu-direct-search	2017-07-11 00:26:49 -03:00
Huo Yaoyuan	752f625a62	Set relative axes inside AsyncLoadWrapper.	2017-07-11 09:19:36 +08:00
Huo Yaoyuan	fd4a054921	Merge branch 'master' into profile	2017-07-11 09:16:32 +08:00