8589 Commits

Author	SHA1	Message	Date
Dean Herbert	627a5deff9	Merge branch 'master' into fix-menu-cursor-crash	2018-07-02 18:09:11 +09:00
Dean Herbert	6c848f135c	Add comment about last button invocation	2018-07-02 17:48:16 +09:00
Dan Balasescu	e99c05c85e	Merge branch 'master' into fix-dialog-popups	2018-07-02 17:41:16 +09:00
Dan Balasescu	6abb3fa62c	Merge branch 'master' into add-scroll-speed-keybinds	2018-07-02 17:26:05 +09:00
smoogipoo	f0ec117bcb	Merge remote-tracking branch 'origin/master' into add-scroll-speed-keybinds ... # Conflicts: # osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs	2018-07-02 17:21:18 +09:00
Dan Balasescu	118366303c	Merge branch 'master' into fix-leaderboard-placeholder	2018-07-02 17:17:40 +09:00
smoogipoo	9f405b0894	Don't hard-bail if config skin doesn't exist anymore	2018-07-02 16:49:07 +09:00
ekrctb	ae6fdd8e29	whitespace	2018-07-02 16:20:44 +09:00
smoogipoo	45a4187923	Tidy up lookups to NestedHitObjects	2018-07-02 16:10:56 +09:00
ekrctb	63746876c2	typo	2018-07-02 16:09:33 +09:00
ekrctb	341ffa4667	Fix MenuCursor crash	2018-07-02 16:07:52 +09:00
Dan Balasescu	e5947cc969	Merge branch 'master' into non-null-ruleset	2018-07-02 15:32:55 +09:00
smoogipoo	b61fe10f62	Adapt to IBindables	2018-07-02 15:07:18 +09:00
smoogipoo	4070c1a888	Merge remote-tracking branch 'origin/master' into non-null-ruleset ... # Conflicts: # osu.Game/Screens/Select/FilterControl.cs	2018-07-02 15:05:34 +09:00
Dan Balasescu	2c19790a97	Merge branch 'master' into fix-background-screen-crash	2018-07-02 15:01:59 +09:00
Dan Balasescu	50f561fbc2	Merge branch 'master' into allow-back-in-player	2018-07-02 14:44:58 +09:00
smoogipoo	189194ee8d	Don't include empty namespace in sample lookup	2018-07-02 14:35:03 +09:00
smoogipoo	7f832e34c0	Reorder sample bank property setters	2018-07-02 14:29:18 +09:00
Dean Herbert	596787c941	Standardise input handling of popup dialogs	2018-07-02 14:25:12 +09:00
smoogipoo	73fac2115a	Implement hitobject sample files	2018-07-02 14:20:35 +09:00
smoogipoo	310c4a7d6c	Make SampleInfo choose its own lookup name	2018-07-02 14:18:41 +09:00
smoogipoo	8b0c6a4c85	Make SampleControlPoint clone the existing SampleInfo	2018-07-02 14:17:19 +09:00
Dan Balasescu	37495c34fa	Fix possible nullreference	2018-07-02 13:51:47 +09:00
miterosan	34f33a08cb	Merge branch 'master' into Private_Messages	2018-07-02 06:47:33 +02:00
smoogipoo	b664d3ef81	Fix time being a part of controlpoint change comparisons	2018-07-02 13:34:25 +09:00
smoogipoo	aea50e770b	Use .Equals everywhere	2018-07-02 13:34:14 +09:00
Dean Herbert	812929fa05	Merge remote-tracking branch 'upstream/master' into smoogipoo-beatmap-preprocess	2018-07-02 13:10:42 +09:00
Dean Herbert	b7893bc994	Remove unnecessary comments	2018-07-02 13:07:44 +09:00
smoogipoo	9f85c55915	Merge remote-tracking branch 'origin/master' into legacy-custom-banks	2018-07-02 12:34:51 +09:00
Dean Herbert	6a459efd8f	Don't allow Key.Escape	2018-07-02 11:04:40 +09:00
Dean Herbert	2c597874bf	Fix leaderboard showing placeholder briefly when entering song select	2018-07-01 18:17:02 +09:00
Dean Herbert	98fb2e03c0	Fix rulesets not loading in debug builds after running a release build	2018-07-01 18:03:15 +09:00
Dean Herbert	b1403d837e	Add back support for closing focused overlays using back key	2018-07-01 15:52:47 +09:00
Dean Herbert	7028767e50	Fix regression in HoldFocus behaviour	2018-07-01 14:08:34 +09:00
Dean Herbert	00fd5c8dbc	Fix regression causing binding settings to fail	2018-06-30 23:51:27 +09:00
miterosan	621f4218a3	Merge branch 'master' into Private_Messages	2018-06-30 16:17:56 +02:00
Dean Herbert	754e072e01	Don't handle all actions	2018-06-29 23:35:14 +09:00
Dean Herbert	fb90a4924b	Only clear text in FocusedTextBox	2018-06-29 23:28:15 +09:00
Dean Herbert	7c0547b4ee	Replace todo	2018-06-29 23:16:05 +09:00
Dean Herbert	b9b1e77172	Merge branch 'master' into allow-back-in-player	2018-06-29 21:54:18 +09:00
Dean Herbert	ad28f88498	Fix protection change	2018-06-29 21:25:51 +09:00
Dean Herbert	cd47bd2cf8	Update framework	2018-06-29 21:06:43 +09:00
Dean Herbert	6a80a21078	Tidy up escape handling	2018-06-29 21:06:38 +09:00
smoogipoo	6d6436c8d3	Fix ruleset not getting updated if changed	2018-06-29 20:50:39 +09:00
smoogipoo	9187eb8626	SongSelect needs to recache as IBindable	2018-06-29 20:50:30 +09:00
Dean Herbert	8cf1553fd5	Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player	2018-06-29 20:30:42 +09:00
Dean Herbert	06bd3d4815	Use IBindable where possible	2018-06-29 20:28:28 +09:00
Dean Herbert	0e649b8866	Change logic	2018-06-29 20:16:24 +09:00
Dean Herbert	34fef3caba	Update exception type	2018-06-29 20:13:29 +09:00
Dean Herbert	9fce4eaccf	Merge branch 'master' into di-backed-ruleset	2018-06-29 19:33:12 +09:00
Dean Herbert	1c32951d4b	Ensure toolbar triggers updates to SongSelect's ruleset	2018-06-29 19:32:42 +09:00
Dean Herbert	182ac80881	Cache also as IBindable	2018-06-29 19:25:28 +09:00
Dean Herbert	6d6fcc953b	Trim lines	2018-06-29 19:25:20 +09:00
Dan Balasescu	513129d4a8	Merge branch 'master' into fix-dialog-overlay-sounds	2018-06-29 18:45:37 +09:00
smoogipoo	1e696d247e	Re-privatise	2018-06-29 18:33:28 +09:00
Dan Balasescu	8abcf68188	Merge branch 'master' into fix-negative-online-set-id	2018-06-29 18:29:36 +09:00
Dean Herbert	4212a9d0d7	Fix incorrect migration conditional	2018-06-29 18:23:53 +09:00
Dan Balasescu	f149289c83	Merge branch 'master' into fix-delta-patching	2018-06-29 18:01:56 +09:00
Dean Herbert	23aa2a2361	Merge branch 'master' into catch-scoring	2018-06-29 17:29:15 +09:00
Dean Herbert	e12ce3c2a8	Adjust xmldoc	2018-06-29 17:21:55 +09:00
Dean Herbert	098aeabc9e	Merge branch 'master' into catch-scoring	2018-06-29 17:16:14 +09:00
Dan Balasescu	845d1400dc	Merge branch 'master' into beatmap-defaults	2018-06-29 17:14:40 +09:00
Dean Herbert	c0b65a6a73	Change default IsBonus definition and remove unnecessary overrides	2018-06-29 17:07:08 +09:00
Dean Herbert	750f5a86c3	Fix catch test failing due to disabled bindable	2018-06-29 16:49:11 +09:00
Dean Herbert	0940715631	Merge branch 'master' into catch-scoring	2018-06-29 14:59:15 +09:00
smoogipoo	99068debc4	Split out into separate interface + add xmldocs	2018-06-29 13:24:33 +09:00
smoogipoo	756cabd5d0	Add a preprocess method to BeatmapProcessor	2018-06-29 12:45:48 +09:00
Dean Herbert	70a119dde7	Remove unused/duplicate interface	2018-06-29 12:20:53 +09:00
Dean Herbert	8742f41b7d	Revert SharpCompress library to fix delta patching regression	2018-06-29 11:34:52 +09:00
miterosan	884ac71874	Merge branch 'master' into Private_Messages	2018-06-28 21:04:02 +02:00
tgi74000	b0739023ce	Add BeatmapInfo's stable defaults to fix compatibility with old maps	2018-06-28 19:02:38 +02:00
Dean Herbert	8ba2ac922f	Move to local components namespace	2018-06-28 19:23:56 +09:00
Dean Herbert	0ef5b8f464	Tidy up code, remove unnecessary string.Formats	2018-06-28 19:19:00 +09:00
Dean Herbert	98fec94693	Merge remote-tracking branch 'upstream/master' into HoutarouOreki-unifyDates	2018-06-28 19:14:47 +09:00
smoogipoo	94f1b2eeb8	Only custom sample banks > 1 modify the filename	2018-06-28 18:29:17 +09:00
smoogipoo	3a9a82c80c	Add back legacy custom sample banks	2018-06-28 18:29:12 +09:00
smoogipoo	781095b96b	Encapsulate the method to apply SampleControlPoints to SampleInfos	2018-06-28 18:29:07 +09:00
smoogipoo	2882981f9c	Implement and use equality comparers for ControlPoint	2018-06-28 18:28:59 +09:00
Dean Herbert	be2d3d6ad4	Merge branch 'master' into fix-supporter-naming	2018-06-28 17:34:21 +09:00
Dean Herbert	a377e87bf6	Add missing licence headers	2018-06-28 17:34:04 +09:00
Dean Herbert	b1a3f01212	Fix mania maps not being treated as mania maps in release builds	2018-06-28 17:10:30 +09:00
Dean Herbert	3b0c4ff16b	Tidy code	2018-06-28 14:08:15 +09:00
Dean Herbert	c44a81bdf5	Add word wrap support	2018-06-28 13:04:39 +09:00
smoogipoo	01b90aaffe	Fix CI not passing	2018-06-28 11:58:06 +09:00
smoogipoo	2f2bd59844	Remove editor functionality from VirtualBeatmapTrack ... /shrug	2018-06-28 11:47:41 +09:00
smoogipoo	87e8074cd2	Use a const for excess length	2018-06-28 11:46:56 +09:00
smoogipoo	c0c94e24b9	Use VirtualBeatmapTrack in testcases	2018-06-28 11:45:48 +09:00
Dean Herbert	ac7ee59d50	Add migration for previous incorrectly imported beatmaps	2018-06-28 10:48:01 +09:00
Dean Herbert	5ad122bfec	Fix beatmaps importing with -1 as online set ID	2018-06-28 10:28:35 +09:00
Joehu	8518fce4a9	Fix osu!supporter naming	2018-06-27 17:57:55 -07:00
ekrctb	1ed6a672f2	Update volme control ... Use IMouseWheelBindingHandler for volume VolumeControlReceptor. VolumeMeter is no longer an IKeyBindingHandler because it is unused.	2018-06-27 18:43:29 +09:00
smoogipoo	5640385f48	Update the length once during construction	2018-06-27 16:12:49 +09:00
smoogipoo	b4b28f8ae8	Make GetWaveform() not hard bail if errors occur	2018-06-27 16:07:18 +09:00
smoogipoo	b88c4464cb	Make virtual beatmap tracks approximate beatmap length	2018-06-27 16:02:49 +09:00
Dean Herbert	527d7c29f2	Merge branch 'master' into fix-background-screen-crash	2018-06-27 16:00:59 +09:00
smoogipoo	f8acd9e451	Cleanup	2018-06-27 12:59:19 +09:00
Dean Herbert	0866dd11bd	DefaultBackAction -> BackAction, defaults to last button ... The last button is more commonly the escape condition.	2018-06-27 12:57:26 +09:00
smoogipoo	ede59f63f6	Merge remote-tracking branch 'origin/master' into make-loading-more-visible	2018-06-27 12:52:06 +09:00
Dean Herbert	d7ce4ab6fd	Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player	2018-06-27 12:36:10 +09:00
Dean Herbert	bebf47d0d5	Merge branch 'master' into fix-dialog-overlay-sounds	2018-06-27 12:21:29 +09:00