8675 Commits

Author	SHA1	Message	Date
Dan Balasescu	53e55c2f14	Merge branch 'master' into fix-always-skipping	2018-07-25 15:30:24 +09:00
Dan Balasescu	affecccabc	Merge branch 'master' into fix-invalid-operation	2018-07-25 14:35:36 +09:00
Dean Herbert	1d86083981	Hide unnecessary log output	2018-07-24 12:13:48 +02:00
Dean Herbert	b38da34da9	Fix resetting database failing due to incorrect disposal logic	2018-07-24 12:13:48 +02:00
Dean Herbert	1b456fd716	Fix a potential InvalidOperationException when entering song select ... Closes #3052.	2018-07-23 13:11:06 +02:00
Dean Herbert	2169a47325	Prevent fatal failures on delete failures	2018-07-23 10:39:43 +02:00
Dean Herbert	44a2ae5f9a	Fix incorrect variable usage	2018-07-23 08:33:47 +02:00
Dean Herbert	6fa70ed696	Merge branch 'master' into centralise-judgement-display	2018-07-23 05:23:52 +09:00
Dean Herbert	3c59ccadd0	Fix gameplay always skipping to first hitobject time ... Regresssed with previous build	2018-07-22 22:19:58 +02:00
Dean Herbert	d561f54282	Merge branch 'master' into per-object-css	2018-07-23 03:01:17 +09:00
Dean Herbert	d868d81b59	Merge branch 'master' into centralise-judgement-display	2018-07-23 02:58:49 +09:00
Dean Herbert	0f37758314	Update framework	2018-07-21 16:21:53 +09:00
Dean Herbert	77da100c0f	Merge branch 'master' into fix-model-import	2018-07-20 23:30:41 +09:00
Dean Herbert	3fc7f33e90	Merge branch 'master' into centralise-judgement-display	2018-07-20 17:29:15 +09:00
Dean Herbert	7cc999027d	Merge branch 'master' into pause-input-fixes	2018-07-20 17:20:19 +09:00
Dean Herbert	241437c819	Remove unnecessary counting change logic	2018-07-20 17:08:25 +09:00
smoogipoo	1139f0dbf2	Centralise method of disabling playfield judgements	2018-07-20 17:04:33 +09:00
Dean Herbert	fc6deb6ab5	Merge remote-tracking branch 'upstream/master' into peppy-fix-model-import	2018-07-20 16:42:46 +09:00
Dean Herbert	7fea2b3a8b	Add ToList	2018-07-20 16:38:02 +09:00
Dean Herbert	92fe996a8b	Merge branch 'master' into fix-model-import	2018-07-20 16:17:39 +09:00
Dean Herbert	0e7bb3b548	Merge branch 'master' into no-more-memory-sqlite	2018-07-20 16:17:36 +09:00
smoogipoo	c087a73f40	Implement per-hitobject custom sample banks	2018-07-20 15:12:44 +09:00
smoogipoo	de8d05bb0c	Remove unnecessary setting of sample name to same value	2018-07-20 15:12:21 +09:00
David V	9eb69a1e76	Restructure + corrects converting to support all systems	2018-07-19 17:47:55 +02:00
David V	4e72794101	Converts float to int.	2018-07-19 15:55:38 +02:00
Dean Herbert	7be3a5d466	Centralise test storage logic	2018-07-19 14:07:55 +09:00
Dean Herbert	68614f1512	Ensure online IDs are validated for imports that don't have an associated archive too	2018-07-19 13:41:34 +09:00
Dean Herbert	82ddbb3f5d	Delay key count stop	2018-07-19 01:18:07 +09:00
Dean Herbert	41441771ae	Remove unnecessary cast	2018-07-18 22:22:28 +09:00
Dean Herbert	8414fe9d05	Add key counter exceptions for paused state	2018-07-18 22:19:32 +09:00
Dean Herbert	a01361f833	Set restart count	2018-07-18 22:05:24 +09:00
Dean Herbert	c2cdf12986	Better pause logic	2018-07-18 19:59:04 +09:00
Dean Herbert	0c24244340	Remove SingletonContextFactory ... It is dangerous to use this as it doesn't correctly handle contexts and can cause issues that will never actually arise in normal execution. # Conflicts: # osu.Game/Database/SingletonContextFactory.cs	2018-07-18 16:50:56 +09:00
Dean Herbert	e3fb781a5a	Fix ArchiveModelManager's model import method not running import logic	2018-07-18 12:59:22 +09:00
Dean Herbert	aa2f2f3e94	Merge pull request #3034 from peppy/reduce-panel-width ... Reduce osu!direct panel width to allow three panels displayed at 16:9 resolutions	2018-07-17 19:14:48 +09:00
Dan Balasescu	64cde1ebad	Merge branch 'master' into use-switch-over-if	2018-07-17 16:44:57 +09:00
Dean Herbert	97e71245e9	Merge branch 'master' into reduce-panel-width	2018-07-17 16:36:05 +09:00
Dean Herbert	9f933187e9	Apply review feedback	2018-07-17 16:33:08 +09:00
Dean Herbert	569d0f7993	Merge branch 'master' into scrolldirection-cleanup	2018-07-17 15:39:13 +09:00
Dean Herbert	e681bd3244	Merge branch 'master' into fix-incorrect-mods	2018-07-17 15:23:21 +09:00
smoogipoo	827c5c4939	Remove scroll direction from ScrolingPlayfield constructor	2018-07-17 15:14:03 +09:00
Dean Herbert	825941aff1	Use switch with type matching in place of if-else where possible	2018-07-17 14:35:09 +09:00
Dean Herbert	b967fe714b	Fix lead-in time now being long enough in many cases	2018-07-17 14:29:22 +09:00
Dan Balasescu	745d596343	Merge branch 'master' into fix-incorrect-mods	2018-07-17 13:41:02 +09:00
Dan Balasescu	7a2dc3c674	Merge branch 'master' into clickable-download-notifications	2018-07-17 13:29:16 +09:00
Dan Balasescu	61f58ed08a	Merge branch 'master' into reduce-panel-width	2018-07-17 12:51:16 +09:00
Dan Balasescu	e4fc3a1c65	Merge branch 'master' into fix-drawable-load-regression	2018-07-17 12:22:12 +09:00
Dean Herbert	4f1b7c8065	Merge branch 'master' into reduce-panel-width	2018-07-17 04:20:40 +09:00
Dean Herbert	84c13174d9	Merge branch 'master' into use-has-flags	2018-07-17 03:50:40 +09:00
Dean Herbert	40a1f8313e	Merge branch 'master' into make-notifications-quieter	2018-07-17 03:24:47 +09:00