3255 Commits

Author	SHA1	Message	Date
Dean Herbert	0332348b24	Correctly display default audio device on OSD	2017-05-19 22:51:09 +09:00
Dean Herbert	5bcef91b89	Add padding to setting value on on screen display ... Long audio device names were destroying all padding.	2017-05-19 22:49:47 +09:00
Dean Herbert	04f7acb68a	Add setting checkbox to toggle debug logs	2017-05-19 22:47:15 +09:00
Dean Herbert	674731f9bb	Add sound back to skip action	2017-05-19 22:23:48 +09:00
Dean Herbert	60f960aafd	Fix audio clock breakage.	2017-05-19 22:19:20 +09:00
Dean Herbert	20156d26f9	Don't rely on parent's clock	2017-05-19 22:12:09 +09:00
Dean Herbert	aef82acb0d	Update skip button design	2017-05-19 21:54:14 +09:00
Dean Herbert	da31d129ee	Merge branch 'master' into mania-beatmap-conversion	2017-05-19 18:18:59 +09:00
Dean Herbert	a7d16ac213	Move skip logic to inside SkipButton	2017-05-19 18:18:21 +09:00
smoogipooo	9191c4f3e3	Remove LegacyBeatmapConverter.	2017-05-19 16:31:56 +09:00
Dean Herbert	36b628bbcc	Merge branch 'master' into fix-early-inactive-pause	2017-05-19 16:21:20 +09:00
smoogipooo	67cf64062a	Add flag to determine whether the beatmap requested for conversion is for the current ruleset.	2017-05-19 16:02:40 +09:00
Dan Balasescu	0e469feb17	Merge branch 'master' into fix-unnecessary-seeks	2017-05-19 15:10:13 +09:00
Dean Herbert	bfd37d0350	Fix audio beginning to play when potentially paused due to inactive window ... Also removes all usage of Delay() in Player. Resolves #793.	2017-05-19 13:53:09 +09:00
Dean Herbert	5ae3a7143e	Fix audio seeking when entering play mode in certain cases ... Resolves #794	2017-05-19 13:23:11 +09:00
Dean Herbert	c51d640241	Add support for searching beatmap author at song select ... Resolves #792	2017-05-19 13:13:27 +09:00
Javier Flores	793b760ff2	Cleanup logic	2017-05-18 20:19:00 -05:00
DrabWeb	a5fa7e1a7d	Result counts displaying	2017-05-18 17:43:39 -03:00
DrabWeb	1d1375c4d4	Remove commented line	2017-05-18 17:13:53 -03:00
DrabWeb	ca6826f3ba	Fix incorrect height between sort tabs and ruleset toggle buttons	2017-05-18 17:12:57 -03:00
DrabWeb	c8102db780	Fix visual test crash	2017-05-18 16:54:50 -03:00
DrabWeb	065f4faa70	Fix ruleset toggle buttons not updating when changing from the toolbar	2017-05-18 16:34:34 -03:00
DrabWeb	0b480fe327	ModeToggleButton -> RulesetToggleButton	2017-05-18 16:17:16 -03:00
DrabWeb	c2880676db	Added displaying sets	2017-05-18 16:15:49 -03:00
DrabWeb	c3fb1ab7c6	Mapper -> Author, use BeatmapSetInfo for metadata	2017-05-18 15:01:01 -03:00
DrabWeb	ab1401054d	Added result counts (visually)	2017-05-18 14:08:14 -03:00
DrabWeb	9f36a39c59	More cleanup	2017-05-18 13:57:19 -03:00
Dean Herbert	3004a44b98	Further colour adjustments	2017-05-18 22:21:41 +09:00
Dean Herbert	c78dfb4a13	Oops colours were wrong	2017-05-18 21:56:19 +09:00
Dean Herbert	e3ae2bca6d	Design improvements ... paired with smoogi	2017-05-18 21:38:19 +09:00
Huo Yaoyuan	ff5854d6bf	Merge branch 'master' into generic-interface	2017-05-18 19:19:40 +08:00
smoogipooo	afd3eb4b8d	Implement things a bit more to remove warnings.	2017-05-18 18:04:32 +09:00
smoogipooo	eebd5a910e	Merge remote-tracking branch 'origin/master' into mania-beatmap-conversion	2017-05-18 11:59:31 +09:00
DrabWeb	b26c8dd1c7	Added temporary difficulties on the panels	2017-05-17 18:42:40 -03:00
Huo Yaoyuan	cd065b8ff3	Add back GetHashCode.	2017-05-18 05:27:20 +08:00
DrabWeb	b3ef8b8fd4	Design updates	2017-05-17 18:10:29 -03:00
DrabWeb	cabfe72c92	Changed DirectPanel to a base class for DirectGridPanel and DirectListPanel	2017-05-17 18:02:33 -03:00
Huo Yaoyuan	ffbab6bfeb	Tidy up DrawableChannel.	2017-05-18 04:08:47 +08:00
DrabWeb	5fb445e3fe	Basic direct panel, minor cleanups	2017-05-17 16:37:34 -03:00
Huo Yaoyuan	88f8619e9a	More missed exceptions.	2017-05-18 02:46:12 +08:00
Huo Yaoyuan	23e2d3ef07	Use GroupBy in ChatOverlay.	2017-05-18 02:40:36 +08:00
Huo Yaoyuan	e2b1fcc088	Use string.Join in GetMessagesRequest.	2017-05-18 02:40:33 +08:00
Huo Yaoyuan	b5d7211cd6	Expire placeholder text.	2017-05-18 02:40:29 +08:00
Huo Yaoyuan	65ff66682a	Merge branch 'master' into generic-interface	2017-05-18 02:40:05 +08:00
Dan Balasescu	32c471d285	Merge branch 'master' into pause-container	2017-05-18 01:22:37 +09:00
Dean Herbert	8084c575ef	Merge branch 'master' into fix-fail-pause-conflict	2017-05-17 23:32:41 +09:00
Javier Flores	f4c7a02a6f	Fix having negative beat when it should be 0	2017-05-17 09:23:04 -05:00
Dean Herbert	25f217505e	Merge branch 'master' into song-select-selection-fixes	2017-05-17 23:17:10 +09:00
Dean Herbert	1278d9c53d	Merge branch 'master' into bad-bad-ratio-container	2017-05-17 23:01:56 +09:00
Dean Herbert	d606b5b3a7	Fix CI warning	2017-05-17 22:13:56 +09:00
Dean Herbert	41c252760d	Move all pause logic into PauseContainer	2017-05-17 21:57:01 +09:00
smoogipooo	74c23ff6d8	Add base for event parsing code.	2017-05-17 20:46:23 +09:00
Dean Herbert	88a70e407c	Fix and simplifty pause logic ... Resolves #770	2017-05-17 20:11:41 +09:00
Huo Yaoyuan	6c9505fa3a	Handle possible nulls.	2017-05-17 18:11:38 +08:00
Huo Yaoyuan	b9b45493e6	Use generic IComparable together with IEqutable for Message.	2017-05-17 18:02:17 +08:00
Dean Herbert	cba7796777	Fix ratio container being added to a level too high ... That's a bad ratio container! How did we not notice this until now?	2017-05-17 18:49:30 +09:00
DrabWeb	9ba356f2c6	Added osu!direct header and filter control	2017-05-17 05:58:34 -03:00
Dan Balasescu	b21be8f3f5	Merge branch 'master' into fix-chat-after-disconnect	2017-05-17 17:51:35 +09:00
Dean Herbert	7bb38e927b	Fix song select reverting to first difficulty of current group on entering	2017-05-17 17:33:20 +09:00
Dean Herbert	cab12ee55a	Reduce the possibility of recomputing drawables when underlying beatmap hasn't changed	2017-05-17 17:33:16 +09:00
ColdVolcano	198542465b	More CI fixes	2017-05-17 01:37:31 -05:00
ColdVolcano	387d26a576	CI Fixes	2017-05-17 01:26:34 -05:00
ColdVolcano	5f192cae7b	Add missing licence header	2017-05-17 01:18:56 -05:00
ColdVolcano	0801a211da	Add a base container with beat syncing logic	2017-05-17 01:14:04 -05:00
Dean Herbert	78c1d4581f	Revert "Use generic IComparable for message." ... This reverts commit aaaee5ed10.	2017-05-17 13:44:43 +09:00
smoogipooo	9565bb9572	Fix hold notes - remove glow for now. ... # Conflicts: # osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs # osu.Game.Rulesets.Mania/Objects/Drawables/DrawableManiaHitObject.cs	2017-05-17 13:09:49 +09:00
smoogipooo	17466a662c	Add hold note conversion.	2017-05-17 13:09:07 +09:00
Dean Herbert	231f7939a6	Fix channels being unnecessarily recycled on disconnect ... Resolves #768	2017-05-17 12:42:02 +09:00
Dean Herbert	12cb530358	Merge branch 'master' into tidy-up	2017-05-17 09:24:11 +09:00
nyaamara	a3e93afb37	Merge pull request #3 from ppy/master ... cool	2017-05-16 16:57:45 -04:00
nyaamara	b22c84287a	Fix typo.	2017-05-16 16:54:33 -04:00
Huo Yaoyuan	e2a7f00a52	Remove unused namespace.	2017-05-16 22:20:05 +08:00
Huo Yaoyuan	f1d5a92950	Use generic IEqutable to avoid typeless Equals.	2017-05-16 21:49:38 +08:00
Huo Yaoyuan	aaaee5ed10	Use generic IComparable for message.	2017-05-16 21:46:22 +08:00
Huo Yaoyuan	e911441394	Why AbandonedMutexException?	2017-05-16 21:23:14 +08:00
Huo Yaoyuan	d929de466a	DateDisplay -> DateTimeDisplay for more exactly.	2017-05-16 21:16:52 +08:00
Huo Yaoyuan	d213706d07	Use DateTimeOffset.	2017-05-16 21:14:50 +08:00
Huo Yaoyuan	b9a40a841b	Use IsAssignableFrom.	2017-05-16 21:04:54 +08:00
Dean Herbert	5a9745b492	Update API endpoint	2017-05-16 21:37:55 +09:00
Dan Balasescu	be3953aeb2	Merge branch 'master' into general-fixes	2017-05-16 20:52:38 +09:00
Dan Balasescu	a7df99c6d2	Merge branch 'master' into fix-guest-user	2017-05-16 20:46:28 +09:00
Dean Herbert	85daddcf6f	Merge branch 'master' into mania-timing-sections	2017-05-16 20:12:26 +09:00
Dean Herbert	041d4f93c0	Fix typo	2017-05-16 20:08:22 +09:00
Dean Herbert	fdf0137fc2	Remove incorrect padding	2017-05-16 19:58:34 +09:00
Dean Herbert	23807aa3b9	Better handling of logged in state	2017-05-16 19:55:45 +09:00
Dean Herbert	2384f7b0c1	Ensure LocalUser is never null	2017-05-16 19:49:50 +09:00
Dean Herbert	a209a738ea	Merge branch 'master' into player-fixes	2017-05-16 19:11:23 +09:00
Dan Balasescu	ca9c52ce38	Merge branch 'master' into player-fixes	2017-05-16 18:54:55 +09:00
Dean Herbert	0c7ceea4fd	Merge branch 'master' into on-screen-display	2017-05-16 18:54:54 +09:00
Dean Herbert	71b14bb8af	Merge branch 'master' into fix-duplicate-channels	2017-05-16 18:50:21 +09:00
Dan Balasescu	0215b45088	Merge branch 'master' into player-fixes	2017-05-16 18:39:21 +09:00
smoogipooo	6231a19b8c	Merge remote-tracking branch 'origin/master' into mania-timing-sections	2017-05-16 18:35:32 +09:00
Dean Herbert	712bd21e25	Fix duplicate channels being created on connection loss ... Resolves #763	2017-05-16 18:28:42 +09:00
Dean Herbert	3673e4af1f	Fade bold state of chat tabs better	2017-05-16 18:00:29 +09:00
Dean Herbert	6487bf45cf	Eagerly attempt to pause the game when the window is not focused	2017-05-16 17:59:14 +09:00
Dean Herbert	b016d53b85	Fix TwoLayerButton not capturing MouseDown events ... Caused clicks to pass through the skip button to the progress bar.	2017-05-16 17:59:07 +09:00
Dean Herbert	0feaa407f2	Merge branch 'margin-padding-namespace' into on-screen-display	2017-05-16 16:40:06 +09:00
Dean Herbert	89e2a39d14	Merge remote-tracking branch 'upstream/master' into margin-padding-namespace	2017-05-16 16:36:34 +09:00
Dan Balasescu	91de72e161	Merge branch 'master' into on-screen-display	2017-05-16 16:27:19 +09:00
Dan Balasescu	fe3d035474	Merge branch 'master' into general-fixes	2017-05-16 16:16:43 +09:00
Dan Balasescu	83a8a27161	Merge branch 'master' into logo-shockwave	2017-05-16 16:10:34 +09:00
Dean Herbert	f0ea445e46	Fix initial requests of channel mesages not being performed ... fetchReq was being set even for initial lookups, which caused only one to run, and subsequent requests to be excessive to try and catch up.	2017-05-16 15:59:01 +09:00
Dan Balasescu	2ad9aa2ae5	Merge branch 'master' into chat-error-messages	2017-05-16 15:12:59 +09:00
Dean Herbert	5e5ad9a899	Add basic on-screen display	2017-05-16 15:03:03 +09:00
Dean Herbert	e09f1c7c91	Remove AudioDevice from game-level setting ... Should be (and is already) in FrameworkConfig.	2017-05-16 12:59:47 +09:00
Dean Herbert	efab186384	Update namespaces in line with framework	2017-05-16 12:50:30 +09:00
Dean Herbert	23760d6805	Adjust osu! logo metrics and add shockwave impact animation	2017-05-15 19:36:03 +09:00
Dean Herbert	3b1d5ce7df	CI fix	2017-05-15 13:31:51 +09:00
Dean Herbert	dcd4b4450d	Add error message in chat when attempting to use commands	2017-05-15 13:26:35 +09:00
Dean Herbert	1f3039926f	Reword settings text slightly	2017-05-15 12:57:55 +09:00
Dean Herbert	f730769186	Rewrite to make better	2017-05-15 12:54:56 +09:00
Dean Herbert	3b87a938db	Merge branch 'master' into cursor_size.	2017-05-15 12:23:49 +09:00
Dean Herbert	622b155fda	OsuConfig -> OsuSetting	2017-05-15 10:56:27 +09:00
Dean Herbert	eaaba11586	Change all instances of options to settings where applicable	2017-05-15 10:55:29 +09:00
EVAST9919	b6460d89c9	Cleanup	2017-05-14 10:26:52 +03:00
EVAST9919	49f5364e9e	CI fixes	2017-05-14 07:35:23 +03:00
EVAST9919	12dab6f75c	iplemented stable-like algorithm	2017-05-14 07:28:12 +03:00
EVAST9919	ca6df533bd	Automatic gameplay cursor size	2017-05-13 03:46:37 +03:00
Dean Herbert	fd9218b6d5	Use FirstOrDefault	2017-05-12 20:48:25 +09:00
Dean Herbert	24db423c4f	Merge remote-tracking branch 'upstream/master' into playlist-commit	2017-05-12 20:39:50 +09:00
Dean Herbert	e096dd8126	Merge branch 'master' into fix-beatmap-population	2017-05-12 20:30:06 +09:00
Dan Balasescu	815379646c	Merge branch 'master' into new-option-search	2017-05-12 20:22:11 +09:00
Dan Balasescu	d60da82c4c	Merge branch 'master' into fix-beatmap-population	2017-05-12 20:15:10 +09:00
Dean Herbert	6c117f15af	Remove unnecessary usings	2017-05-12 20:06:38 +09:00
Dean Herbert	a9b3f74218	Fix ruleset not always getting populated in a WorkingBeatmap	2017-05-12 20:05:44 +09:00
Dean Herbert	d3770d8395	Merge branch 'master' into chat-design-update	2017-05-12 19:57:57 +09:00
Dean Herbert	d2e066ca35	Move SearchTextBox to better namespace ... Is being used in multiple places now.	2017-05-12 19:57:06 +09:00
Dan Balasescu	a5ff3f4d32	Merge branch 'master' into resizable-chat	2017-05-12 19:46:11 +09:00
Dan Balasescu	8ec79f788a	Merge branch 'master' into multiple-chat-channels	2017-05-12 19:35:12 +09:00
Dean Herbert	bc5bcfa66a	Make tab background opaque when chat is fullscreen	2017-05-12 19:15:04 +09:00
Dean Herbert	cf239f4d9c	Move chat into main content ... Also changes the way parallax is applied to OsuScreens game-wide.	2017-05-12 19:03:21 +09:00
EVAST9919	9a04069123	removed useless booleans, using nullables instead	2017-05-12 10:16:31 +03:00
Dean Herbert	dbf60d24bf	Second design update pass.	2017-05-12 15:39:00 +09:00
Dean Herbert	6ea65009c4	Initial design update pass	2017-05-12 15:38:55 +09:00
Dean Herbert	c4a93cbc85	Move drawable chat related classes to better namespace	2017-05-12 15:38:51 +09:00
Dean Herbert	9cf4998701	Make chat resizable via drag, save user set size	2017-05-12 15:36:37 +09:00
EVAST9919	34b4efc4e9	Applied suggested changes	2017-05-12 08:12:34 +03:00
Dean Herbert	f248efb01f	CI Fixes	2017-05-12 13:25:50 +09:00
EVAST9919	79ed92a0d7	Simplified logic	2017-05-12 01:48:28 +03:00
EVAST9919	1f34cec5ce	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-11 22:22:57 +03:00
Dean Herbert	ffa59c6cb3	Support read-only channels, post to correct channel. ... Also cache drawable channels better.	2017-05-11 23:51:26 +09:00
Dean Herbert	a77049213d	Add basic hard-coded inefficient multi-channel support.	2017-05-11 23:10:48 +09:00
Dean Herbert	f044b95ce8	Allow OsuTabControl to handle non-enum types.	2017-05-11 23:10:19 +09:00
Dan Balasescu	f5399f7f2b	Merge branch 'master' into mania-timing-sections	2017-05-11 22:02:58 +09:00
smoogipooo	9477024e7b	Merge remote-tracking branch 'origin/master' into mania-timing-sections	2017-05-11 21:48:20 +09:00
Dan Balasescu	02532e1dc8	Merge branch 'master' into general-fixes	2017-05-11 21:28:54 +09:00
Dean Herbert	9a1c662d1f	Update framework	2017-05-11 21:25:43 +09:00
Dan Balasescu	08f5cbca51	Merge branch 'master' into oauth-fixes	2017-05-11 21:07:13 +09:00
Dean Herbert	ca32caf9e4	Merge branch 'master' into new-option-search	2017-05-11 21:04:37 +09:00
smoogipooo	0739a76497	Make the playfield work in TestCaseGamefield.	2017-05-11 20:04:45 +09:00
Dean Herbert	c3d2cdd2f2	Fix typo	2017-05-11 19:49:28 +09:00
Dean Herbert	4e881644f6	Add thread-safety on access token validation logic.	2017-05-11 19:39:01 +09:00
Dean Herbert	7d221802a2	Fix refresh tokens not working correctly ... Turns out there's plenty of slashes in refresh tokens.	2017-05-11 19:38:57 +09:00
Dean Herbert	b258109a9e	Fix chat input box not always keeping focus as expected	2017-05-11 19:38:36 +09:00
Dean Herbert	a2f6d8a3e6	Fix broken test cases, remove some recursive lookup methods.	2017-05-11 19:38:28 +09:00
Dean Herbert	6fd95e0c52	Fix post-merge breakage	2017-05-11 17:16:01 +09:00
Dean Herbert	bc54b3c85f	Merge branch 'master' into mania-notes	2017-05-11 17:13:29 +09:00
Dean Herbert	b0e522345c	Combine DrawableHitObject classes into one	2017-05-11 17:07:46 +09:00
smoogipooo	c0c33c09ab	Fix merge error.	2017-05-11 16:08:54 +09:00
Dean Herbert	ec67b617ae	Add OptionsHeader class ... Makes search textbox anchor correctly. Also improves visual styling.	2017-05-11 16:06:18 +09:00
smoogipooo	a762f820c6	Fix possible nullrefs.	2017-05-11 14:50:18 +09:00
smoogipooo	2d2d1beddd	More concrete method to determine if all hit objects have been judged. ... Covers the case where nested hit objects are involved.	2017-05-11 14:48:08 +09:00
smoogipooo	6445bea864	Make Playfield.HitObjects internal to playfields. ... Because not all playfields will be using this.	2017-05-11 14:44:11 +09:00
Dean Herbert	df48204403	Fix OptionsOverlay stealing focus itself.	2017-05-11 13:56:21 +09:00
Dean Herbert	7d8af5f1da	Use SearchTextBox ... Correctly handle focus.	2017-05-11 13:23:31 +09:00
smoogipooo	94585672b6	Merge remote-tracking branch 'origin/master' into mania-notes	2017-05-11 13:01:00 +09:00
Dean Herbert	6c5490e31c	Merge remote-tracking branch 'upstream/master' into new-option-search	2017-05-11 12:59:19 +09:00
Dean Herbert	70ef503403	Merge branch 'master' into metadata	2017-05-11 12:23:00 +09:00
Dean Herbert	262b42efe3	Merge branch 'master' into new-option-search	2017-05-11 12:20:58 +09:00
EVAST9919	ea0add2354	Fixed update condition	2017-05-11 02:34:57 +03:00
EVAST9919	d55c97a08a	Stop progress as soon as we at 100%	2017-05-11 01:48:46 +03:00
EVAST9919	5b469eff69	Fixes	2017-05-10 10:33:02 +03:00
EVAST9919	d8f9e71b84	Applied suggested changes	2017-05-10 10:14:44 +03:00
EVAST9919	7b17e331c4	cleanups	2017-05-10 03:45:31 +03:00
EVAST9919	113df86304	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-10 03:23:51 +03:00
smoogipooo	e1ed785cbf	Update framework.	2017-05-09 21:00:40 +09:00
smoogipooo	89bfc0ff22	Fix exception.	2017-05-09 20:55:38 +09:00
smoogipooo	ea76eff1e1	Merge remote-tracking branch 'origin/master' into mania-notes	2017-05-09 19:31:35 +09:00
EVAST9919	315f1f1256	CI fixes	2017-05-09 06:23:03 +03:00
EVAST9919	2c92ee432b	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-09 06:05:46 +03:00
EVAST9919	2826c663fd	Apply suggested changes	2017-05-09 06:05:37 +03:00
Dean Herbert	ab1768ef80	Merge branch 'master' into tidy-up	2017-05-09 10:27:29 +09:00
EVAST9919	de2486b8e6	Moved timeLeft recalculation to property	2017-05-08 20:36:02 +03:00
EVAST9919	17d1ecb8f5	Use float type for progress value	2017-05-08 19:42:36 +03:00
Jorolf	9aaac4ab0c	Merge branch 'new-option-search' of github.com:Jorolf/osu into new-option-search	2017-05-08 18:30:33 +02:00
Jorolf	86f0173c6b	fix license header	2017-05-08 18:30:00 +02:00
EVAST9919	4b5e24cc36	Changed logic a bit	2017-05-08 19:14:19 +03:00
jorolf	3abf1b2a0b	Merge branch 'master' into new-option-search	2017-05-08 17:25:47 +02:00
EVAST9919	ae2186970c	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-08 18:16:16 +03:00
Huo Yaoyuan	cb21e98ae1	MatchCreate.ValidForResume = false.	2017-05-08 19:55:04 +08:00
Huo Yaoyuan	01616cc27c	Avoid extra MemoryStream in ArchiveReader.	2017-05-08 19:41:22 +08:00
Huo Yaoyuan	ced2332d20	Handle overlay in ToolbarOverlayToggleButton.	2017-05-08 19:37:41 +08:00
Huo Yaoyuan	e466380ee2	Generic infer for IJsonSerializable.DeepClone.	2017-05-08 19:33:37 +08:00
Huo Yaoyuan	345f80b775	Simplify constructor of SampleInfoList.	2017-05-08 19:30:55 +08:00
Huo Yaoyuan	dff05bec79	Use readonly fields.	2017-05-08 18:56:04 +08:00
Huo Yaoyuan	4c26a02e99	Remove unnecessary arguments in WorkingBeatmap's constructor.	2017-05-08 16:42:53 +08:00
Dean Herbert	9f1f926634	Add non-null assurance.	2017-05-08 12:45:55 +09:00
smoogipooo	e3b01e7b8c	Merge branch 'master' into mania-notes ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj	2017-05-08 12:12:40 +09:00
Dean Herbert	a38e95c607	Merge branch 'master' into master	2017-05-08 11:59:01 +09:00
Dean Herbert	48368779ab	Avoid polluting Player with HUD-specific code.	2017-05-08 11:48:40 +09:00
Dean Herbert	10910cfcef	Make field readonly.	2017-05-08 11:47:06 +09:00
Dean Herbert	2f4fad9d41	Refactor colour selection.	2017-05-08 11:33:22 +09:00
Dean Herbert	df4a737c9b	Merge remote-tracking branch 'ppy/master' into hud-mod-display	2017-05-08 10:56:34 +09:00
Dean Herbert	5131371c93	Merge branch 'master' into new-option-search	2017-05-08 10:49:49 +09:00
DrabWeb	de8428c95b	Make requested changes	2017-05-07 22:23:33 -03:00
Dan Balasescu	11c2e66cee	Merge branch 'master' into option-item-refactor	2017-05-08 10:13:21 +09:00
Dan Balasescu	fbf05f12fc	Use controlWithCurrent as per comment.	2017-05-08 10:11:45 +09:00
EVAST9919	f0145c7f4f	Trying to woke up AppVeyor	2017-05-08 02:16:56 +03:00
EVAST9919	926ed907c2	CI fixes	2017-05-08 02:00:21 +03:00
EVAST9919	dda25219bc	code fixes	2017-05-08 01:54:31 +03:00
EVAST9919	c3a42ded36	Fixed Graph/seeking offset	2017-05-08 01:23:51 +03:00
EVAST9919	531f2c410a	removed useless variable	2017-05-08 00:26:34 +03:00
EVAST9919	ea28a9f7ce	Adjust values	2017-05-08 00:16:58 +03:00
Jorolf	3c4faae554	add search box and the ability to search	2017-05-07 20:35:57 +02:00
Huo Yaoyuan	4f8549f220	Standardise usages of exceptions.	2017-05-07 00:38:17 +08:00
Jorolf	ef02f80881	Merge branch 'option-item-refactor' of git://github.com/peppy/osu into new-option-search	2017-05-06 17:55:28 +02:00
EVAST9919	d06b5783cb	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-06 17:33:51 +03:00
Huo Yaoyuan	f37c857af8	CI fixes.	2017-05-06 16:06:38 +08:00
Huo Yaoyuan	767cfaaac3	Access database recursively.	2017-05-06 15:37:53 +08:00
Huo Yaoyuan	146d57953d	Use metadata field of WorkingBeatmap.	2017-05-06 14:57:11 +08:00
Huo Yaoyuan	4f49151984	Make metadata a member of WorkingBeatmap.	2017-05-06 14:52:28 +08:00
skettios	36dff94802	removed check if ModSelectOverlay is open	2017-05-05 18:16:48 -07:00
skettios	d129bd0c1f	Fix ModSelectOverlay accepting escape when it shouldn't ... Because PlaySongSelect is suspending when selecting a song, we don't actually hide ModSelectOverlay.	2017-05-05 17:03:24 -07:00
WebFreak001	5aecc3d761	Made cursortrail work with multiple positions	2017-05-05 17:44:51 +02:00
DrabWeb	81d67cbe06	Play first visible set in playlist when commiting in the search field.	2017-05-05 01:59:24 -03:00
Dean Herbert	4b385ded26	Tidy up ModIcon.	2017-05-05 13:22:10 +09:00
Dean Herbert	44f06e5423	Add hover expand support.	2017-05-05 13:17:36 +09:00
Dean Herbert	9c4f813da1	Remove unnecessary hide/show logic. ... Also change the way the overlay appears when actually playing.	2017-05-05 13:14:44 +09:00
Dean Herbert	b547dd6893	CI Fixes.	2017-05-05 13:06:54 +09:00
Dean Herbert	c9ba1ac4f6	Adjust namespaces. ... Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.	2017-05-05 13:00:05 +09:00
Dean Herbert	6298b3effd	Refactor ModSection and ModIcon to avoid null mods.	2017-05-05 12:16:41 +09:00
EVAST9919	95f6c999bd	Adjust scale and CI fixes	2017-05-04 17:59:01 +03:00
EVAST9919	66c858030a	Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor	2017-05-04 17:35:41 +03:00
Dean Herbert	98b3b82c07	Apply CI fixes.	2017-05-04 23:32:27 +09:00
EVAST9919	475eb6fe5f	Cleanup	2017-05-04 17:29:52 +03:00
Dean Herbert	153951d3dd	Add OptionItem class ... Allow for centalised logic for all option UI controls.	2017-05-04 23:07:48 +09:00
EVAST9919	57c4232416	Added testcase	2017-05-04 11:58:37 +03:00
Dean Herbert	efa60ee287	Merge branch 'master' into mania-stage	2017-05-04 16:58:16 +09:00
WebFreak001	063b606a12	Fix readonly warning	2017-05-03 18:48:17 +02:00
WebFreak001	008ff9d2f9	InputResample CursorTrail	2017-05-03 18:33:42 +02:00
EVAST9919	6063231e40	float value fix	2017-05-03 16:58:10 +03:00
EVAST9919	26985dbc62	Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor	2017-05-03 16:22:40 +03:00
Dean Herbert	19f6d58723	Merge remote-tracking branch 'upstream/master' into options-implementation	2017-05-03 21:54:27 +09:00
Dean Herbert	330dd458bd	Trim whitespace.	2017-05-03 20:49:52 +09:00
Dean Herbert	489f586887	Add FPS display toggling. ... Kinda temporary but better than nothing.	2017-05-03 20:34:53 +09:00
smoogipooo	956a7288fb	Add basic DrawableNote.	2017-05-03 20:12:27 +09:00
EVAST9919	5f2f1d2763	CI fixes	2017-05-03 14:01:43 +03:00
EVAST9919	9e35eb8d97	Fixes	2017-05-03 13:53:45 +03:00
smoogipooo	06e014708a	Defer virtual method to load().	2017-05-03 15:57:15 +09:00
EVAST9919	e7a8619f01	ModIcon refactor	2017-05-03 09:48:10 +03:00
EVAST9919	898d9495ff	line fix	2017-05-03 08:27:47 +03:00
EVAST9919	f49cc124ed	Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor	2017-05-03 08:26:54 +03:00
EVAST9919	a897dcbfbe	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-03 08:26:01 +03:00
EVAST9919	6ea3629c9a	Adjust the size	2017-05-03 08:23:52 +03:00
smoogipooo	1fa42b26e8	Make base DrawableHitObject<TJudgement> uninheritable.	2017-05-03 14:02:23 +09:00
Dean Herbert	8825277656	Merge branch 'master' into custom-drawings-flags	2017-05-03 09:36:51 +09:00
EVAST9919	2e30a69b67	removed using	2017-05-02 23:04:36 +03:00
EVAST9919	a955f9cbfd	Simplify hiding logic	2017-05-02 22:59:36 +03:00
EVAST9919	37c3133981	Fixes	2017-05-02 22:46:18 +03:00
EVAST9919	7e1efcc20b	Added ModsContainer	2017-05-02 22:34:07 +03:00
EVAST9919	00a8dbbacf	Added ModType for each mode	2017-05-02 21:36:55 +03:00
EVAST9919	6f44869875	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-02 17:20:10 +03:00
Dean Herbert	a036b059e8	Use provided parameters to avoid a second lookup.	2017-05-02 21:40:06 +09:00
Dean Herbert	691742b828	Remove most options which have not yet been implemented.	2017-05-02 19:40:30 +09:00
Dean Herbert	f9de733128	Formatting.	2017-05-02 18:53:33 +09:00
Dean Herbert	d4045ee2c0	We only have one release stream, so let's unlock it.	2017-05-02 18:40:30 +09:00
Dean Herbert	57c2dd1f49	Fix options dropdown labels never being displayed.	2017-05-02 18:35:23 +09:00
Dean Herbert	5a8a8acbc8	Merge branch 'master' into roompanel	2017-05-02 18:04:48 +09:00
smoogipooo	8e88d86639	Fix naming confusion.	2017-05-02 18:00:37 +09:00
smoogipooo	f1f7a26dbd	Fix incorrect inheritance.	2017-05-02 17:58:59 +09:00
Dean Herbert	a993790a66	Ensure all searchable terms are non-null non-empty.	2017-05-02 17:54:07 +09:00
Dean Herbert	1b0f353af3	Add support for framework-level mouse confining.	2017-05-02 17:45:42 +09:00
Dean Herbert	bef15fe637	Improve organisation of some options and config code.	2017-05-02 17:45:22 +09:00
smoogipooo	9ca8295149	Oops.	2017-05-02 17:09:16 +09:00
Dean Herbert	116e92a542	Remove silly platform specific logic.	2017-05-02 17:00:30 +09:00
smoogipooo	40d2fee1dc	Split up adding of local store from the ctor.	2017-05-02 16:55:04 +09:00
smoogipooo	e2620e2840	Make Team not inherit Country.	2017-05-02 16:54:43 +09:00
Dean Herbert	46ae8bc86b	Use value because we need to.	2017-05-02 16:49:27 +09:00
Dean Herbert	f1d0b77d10	Base the music controller transform direction on relative indices in playlist.	2017-05-02 16:40:29 +09:00
smoogipooo	ee0a5409bb	CI fixes.	2017-05-02 16:33:48 +09:00
Dean Herbert	beb98c14b6	Fix layout not being invalidated when re-filtering playlist display.	2017-05-02 16:26:11 +09:00
EVAST9919	108cd28e96	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-02 10:15:56 +03:00
smoogipooo	91e000fd44	Back to sanity.	2017-05-02 14:21:22 +09:00
smoogipooo	f17046abaf	Add ability to load Drawings flags from osu/Drawings/Flags.	2017-05-02 13:28:35 +09:00
smoogipooo	e856abe59a	Let's not use Country for drawings-specific stuff...	2017-05-02 13:02:14 +09:00
Dean Herbert	6074cb5979	Make playlist filtering work. ... Also standardises searchable terms in beatmap metadata.	2017-05-02 10:45:55 +09:00
Dan Balasescu	8caba36230	Merge branch 'master' into general-fixes	2017-05-02 09:50:35 +09:00
ColdVolcano	6ce0245c2b	Typo	2017-05-01 19:34:08 -05:00
ColdVolcano	1b52445f86	Fix crash when selecting non-existent IDs from database	2017-05-01 19:31:46 -05:00
Dean Herbert	737ad78056	Set a sane default transform direction.	2017-05-01 20:10:19 +09:00
Dean Herbert	2437c416b1	Use less usings.	2017-05-01 19:56:01 +09:00
Dean Herbert	2e0eda6b15	Merge branch 'master' into playlist	2017-05-01 19:44:57 +09:00
Dean Herbert	3943e4ae95	Fix comma.	2017-05-01 19:32:31 +09:00
Dean Herbert	c59589eba7	Only retrieve colour once.	2017-05-01 19:32:00 +09:00
Dean Herbert	0f4ef16910	Remove custom word splitting logic, add localisation support.	2017-05-01 17:14:59 +09:00
Dean Herbert	d00d4cce35	Merge branch 'master' into autoreplay-refactor-squashed	2017-05-01 16:53:46 +09:00
Dean Herbert	2cfb83436d	Add placeholder logic for filtering.	2017-05-01 15:27:41 +09:00
Dean Herbert	a1f341a64f	Fix textbox focus issues (and inability to use escape).	2017-05-01 15:23:01 +09:00
Dean Herbert	c1d0aea217	Refactoring part 5.	2017-05-01 15:09:14 +09:00
Dean Herbert	580cf93147	Refactoring part 4.	2017-05-01 15:03:11 +09:00