24294 Commits

Author	SHA1	Message	Date
Dean Herbert	1e88d3c17a	Merge conflict "resolution"	2020-03-31 23:36:06 +09:00
Dean Herbert	03689adda8	Update resources	2020-03-31 21:33:59 +09:00
Dean Herbert	fe35f696c3	Merge branch 'master' into mania-column-background-skinning	2020-03-31 21:29:37 +09:00
Dean Herbert	7a9d878a34	Merge branch 'master' into fix-follow-point-transforms	2020-03-31 20:03:42 +09:00
Andrei Zavatski	e26fbd5ed8	Remove overcomplicated stuff	2020-03-31 13:45:59 +03:00
Andrei Zavatski	fd8d4cf23b	Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-scroll-container	2020-03-31 13:33:27 +03:00
Dean Herbert	da129ddf6a	Merge pull request #8513 from smoogipoo/mania-skinning-testability ... Implement basis for mania skinning	2020-03-31 19:03:18 +09:00
mcendu	c0f8c1dc28	rename variable used for mania lookup key storage	2020-03-31 17:22:46 +08:00
Dean Herbert	f2416f15a3	Merge pull request #8509 from bdach/fix-widescreen-storyboards ... Support widescreen per-layer storyboard masking	2020-03-31 17:47:42 +09:00
Dean Herbert	9602ab17b0	Fix replay imports failing for certain mod combinations	2020-03-31 17:13:42 +09:00
smoogipoo	1952fcc0ce	Implement mania hold note skinning	2020-03-31 16:42:35 +09:00
smoogipoo	c4f76ffdaf	Implement mania note skinning	2020-03-31 15:29:25 +09:00
smoogipoo	b926d570ee	Allow skinnabledrawable to be auto-sized	2020-03-31 15:28:50 +09:00
Dean Herbert	2109c98481	Merge branch 'master' into fix-widescreen-storyboards	2020-03-31 15:28:22 +09:00
smoogipoo	211a8db4c5	Merge branch 'mania-key-area-skinning' into mania-note-skinning	2020-03-31 15:23:59 +09:00
smoogipoo	538dc0c558	Merge branch 'mania-hitobject-area-skinning' into mania-note-skinning	2020-03-31 15:20:56 +09:00
smoogipoo	1a858c602a	Merge branch 'mania-column-background-skinning' into mania-note-skinning	2020-03-31 15:20:14 +09:00
Dean Herbert	bf1fc9f7a0	Update framework	2020-03-31 15:18:50 +09:00
smoogipoo	4b05f7ff27	Merge branch 'mania-skinning-testability' into mania-key-area-skinning	2020-03-31 15:11:32 +09:00
Dean Herbert	877d5849bb	Merge branch 'master' into mania-skinning-testability	2020-03-31 15:09:11 +09:00
smoogipoo	71387016b2	Add missing judgement line	2020-03-31 12:26:31 +09:00
smoogipoo	02237133cb	Implement mania hit target skinning	2020-03-31 12:17:44 +09:00
Dean Herbert	6d4f9247ea	Revert "Remove osu!catch GotoFrame usage" ... This reverts commit 4406f441654726dd21c810349b0eeb6935ba7d65.	2020-03-31 11:49:18 +09:00
smoogipoo	cb1513b374	Add mania key area skinning	2020-03-31 11:23:33 +09:00
smoogipoo	44727eb2b8	Implement column background skinning	2020-03-31 10:57:56 +09:00
smoogipoo	2b5e9885f6	Implement mania skin reading functionality	2020-03-31 10:55:58 +09:00
Dan Balasescu	e0a876ceaf	Merge pull request #8494 from peppy/fix-invalid-set-ids-on-import ... Fix imports with no matching beatmap IDs still retaining a potentially invalid set ID	2020-03-31 10:42:58 +09:00
smoogipoo	f6f5de7ad1	Allow LineBufferedReader to keep underlying stream open	2020-03-31 10:13:50 +09:00
Bartłomiej Dach	522bbc1e9c	Support widescreen per-layer storyboard masking	2020-03-30 21:51:39 +02:00
Lucas A	ab01111c36	Fix merge conflicts.	2020-03-30 17:39:11 +02:00
smoogipoo	a8f7d7ea42	Add structure for mania configuration lookups	2020-03-30 23:21:40 +09:00
Dan Balasescu	250bdbef6b	Merge branch 'master' into dont-retry-on-replay-results	2020-03-30 22:30:15 +09:00
Dan Balasescu	8964001423	Merge branch 'master' into fix-invalid-set-ids-on-import	2020-03-30 22:24:12 +09:00
Lucas A	3cae0cedee	Add a game setting to disable the layer	2020-03-30 12:59:39 +02:00
Andrei Zavatski	179bd1ce7e	Fix failing test	2020-03-30 13:38:04 +03:00
Andrei Zavatski	2dc81bbcfa	Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-scroll-container	2020-03-30 13:37:25 +03:00
Dean Herbert	0d4830550e	Fix tooltips not showing inside ManualInputManagerTestScenes	2020-03-30 19:15:44 +09:00
Dean Herbert	113660b621	Merge if statements	2020-03-30 18:56:35 +09:00
Dean Herbert	ec18fe1f9f	Merge branch 'master' into dont-retry-on-replay-results	2020-03-30 18:56:00 +09:00
smoogipoo	881ec146af	Ignore duplicate configs	2020-03-30 17:36:57 +09:00
Dean Herbert	4406f44165	Remove osu!catch GotoFrame usage	2020-03-30 17:26:35 +09:00
smoogipoo	4719aac235	Add basic mania skin parsing	2020-03-30 17:18:09 +09:00
Dean Herbert	0044d00d07	Update framework	2020-03-30 16:53:23 +09:00
Dean Herbert	812583a4cd	Remove stray newline	2020-03-30 16:17:42 +09:00
Dean Herbert	f71c8cb30f	Only drop online set ID if beatmap IDs were stripped in online retrieval	2020-03-30 15:07:56 +09:00
Dean Herbert	7ecce713bb	Keep provided IDs where possible if not online	2020-03-30 15:07:39 +09:00
Dan Balasescu	03cd9aa060	Merge branch 'master' into spun-out	2020-03-30 12:31:53 +09:00
Dean Herbert	7db9bd798c	Remove handle overrides	2020-03-30 11:59:51 +09:00
Dean Herbert	09d860d5f5	Fix imports with no matching beatmap IDs still retaining a potentially invalid set ID	2020-03-30 11:52:25 +09:00
Dan Balasescu	ea1a2e1955	Merge branch 'master' into dont-retry-on-replay-results	2020-03-30 11:01:25 +09:00