4360 Commits

Author	SHA1	Message	Date
smoogipooo	c3cfad4eb5	Add RemoveSpeedAdjustment	2017-08-22 16:06:14 +09:00
smoogipooo	4fc77be624	Fix incorrect sorting of hit objects into SpeedAdjustmentContainers	2017-08-22 16:06:09 +09:00
smoogipooo	6f662d721c	Fix possible CollectionModifiedException while adding new SpeedAdjustmentContainers	2017-08-22 16:06:04 +09:00
smoogipooo	b7b8d8b764	Let's not construct scrolling containers in load() for now ... This isn't utilized at the moment, and we should be avoiding this here in the first place.	2017-08-22 16:05:59 +09:00
smoogipooo	5fcd94880d	Fix incorrect inequality with multiple speed adjustments at the same start time.	2017-08-22 16:05:53 +09:00
Dean Herbert	31bb1ebe0e	Add comment and index on column	2017-08-22 12:42:35 +09:00
Dean Herbert	881eecb528	Merge branch 'master' into master	2017-08-22 12:35:36 +09:00
Dean Herbert	7693fc1382	Merge branch 'master' into mask-settings-overlay	2017-08-22 00:22:39 +09:00
Dean Herbert	a9fe1d94f7	Remove unnecessary using	2017-08-21 23:41:51 +09:00
Dean Herbert	7d1c270126	Review fixes	2017-08-21 23:34:08 +09:00
Dean Herbert	1d0b89d592	Restore usage of AddRange	2017-08-21 18:51:14 +09:00
Dean Herbert	102caf4b91	Merge branch 'master' into chat-local-echo-v2	2017-08-21 18:27:32 +09:00
Dean Herbert	7903f49d27	Merge branch 'master' into action-key-counter	2017-08-21 17:47:19 +09:00
Dean Herbert	9ba2258f80	Add spaces for smoogipoo	2017-08-21 17:44:39 +09:00
Dean Herbert	877c69d5fe	Add local chat echo support	2017-08-21 17:43:26 +09:00
Dean Herbert	52dadad1e1	Merge branch 'master' into fix-taiko-barlines	2017-08-21 16:46:25 +09:00
Dean Herbert	ea450fecf5	Merge branch 'master' into action-key-counter	2017-08-21 16:25:44 +09:00
smoogipooo	6e0d2182cb	CI.	2017-08-21 16:24:16 +09:00
smoogipooo	5d13efa76d	Remove the concept of "queued hit objects", add a default speed adjustment.	2017-08-21 16:17:00 +09:00
Dean Herbert	ced919edd3	Merge branch 'master' into fix-speed-multipliers	2017-08-21 15:55:52 +09:00
Dean Herbert	be8bc5bdc8	Merge branch 'master' into action-key-counter	2017-08-21 15:54:54 +09:00
smoogipooo	7a5708ce92	Further support for null judgements.	2017-08-21 15:35:16 +09:00
Dean Herbert	e7c9aec1b1	Ensure the sqlite connection is correctly closed before the game ends ... Hopefully fixes CI race conditions between consecutive tests.	2017-08-21 13:05:47 +09:00
Dean Herbert	a63923a497	Remove type check for now	2017-08-21 12:50:48 +09:00
Dean Herbert	16e96888ab	Update KeyCounterCollection to support action-based buttons	2017-08-21 12:39:22 +09:00
smoogipooo	6a7b410bc3	Make DifficultyControlPoint.SpeedMultiplier actually increase with an increasing speed. Fixes #1147	2017-08-21 11:58:54 +09:00
Jorolf	9b20da94e7	change Query to AllRulesets	2017-08-19 22:07:03 +02:00
Jorolf	bae1340b50	mask the settings overlay	2017-08-19 17:00:01 +02:00
smoogipooo	3ea7be1ccf	Fix selecting unranked beatmaps in song select crashing the game. Fixes #1134.	2017-08-19 12:28:54 +09:00
Dean Herbert	86d97aa16b	Merge branch 'master' into taiko-timingchanges-2	2017-08-18 22:44:36 +09:00
Dean Herbert	c34033c94a	Merge branch 'master' into fix-track-not-resetting	2017-08-18 22:31:59 +09:00
Dean Herbert	bc7621607a	Merge upstream/master in.	2017-08-18 22:20:45 +09:00
Dean Herbert	d6249e7a63	Add support for binding mouse buttons to actions	2017-08-18 20:01:41 +09:00
Shane Woolcock	4901ac9e35	Add some comments explaining why the Track is being forcefully added to the TrackManager	2017-08-18 18:01:18 +09:30
Dean Herbert	ffc8f763e5	Merge branch 'master' into fix-track-not-resetting	2017-08-18 17:24:22 +09:00
smoogipooo	90885a31ae	Round 2 of CI fixes.	2017-08-18 15:09:54 +09:00
smoogipooo	a47b6526a2	Fix CI issues.	2017-08-18 14:40:36 +09:00
Dan Balasescu	68303accef	Merge branch 'master' into make-rulesetinfo-iequatable	2017-08-18 14:28:42 +09:00
Dan Balasescu	0f635c77b3	Merge branch 'master' into fix-ruleset-changing	2017-08-18 13:42:29 +09:00
Dan Balasescu	cc6a5824f0	Merge branch 'master' into fix-ruleset-changing	2017-08-18 13:40:52 +09:00
Dan Balasescu	243a6ca774	Update OsuLegacyDecoder.cs	2017-08-18 13:27:16 +09:00
Dan Balasescu	5a9375f336	Merge branch 'master' into fix-duplicate-difficulty-control-points	2017-08-18 13:12:00 +09:00
Dan Balasescu	f5c3af2f20	Merge branch 'master' into fix-nullref	2017-08-18 12:38:20 +09:00
Dean Herbert	02aa38d1c2	Merge branch 'master' into toolbar-button-swap	2017-08-18 11:18:19 +09:00
Dean Herbert	d919d8b0a3	Merge branch 'master' into onscreendisplay-fix	2017-08-18 11:06:12 +09:00
Dean Herbert	e4b832e8a6	Fix a possible nullref when login fails	2017-08-18 10:49:41 +09:00
PoULkY	cc39aad7f8	Fix OsuButton doesn't implement IFilterable	2017-08-18 01:23:44 +07:00
MrTheMake	6118209200	Fix unlit initial state of the OnScreenDisplay	2017-08-17 18:46:16 +02:00
Shane Woolcock	df683d9114	Fix multiple difficulty control points sharing the same time and thus confusing slider velocity calculations	2017-08-17 23:28:26 +09:30
tgi74000	dc31a0f0ac	Merged ppy/master	2017-08-17 13:01:42 +02:00