13538 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
smoogipoo	c78bfbfa55	Fix failing json conversion testcases	2018-07-02 13:34:19 +09:00
smoogipoo	aea50e770b	Use .Equals everywhere	2018-07-02 13:34:14 +09:00
Dean Herbert	6fe768366f	Merge pull request #2916 from smoogipoo/beatmap-preprocess ... Extend BeatmapProcessor to allow processing hitobjects prior to ApplyDefaults	2018-07-02 13:20:54 +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
Dean Herbert	4b89ae2390	Merge pull request #2925 from smoogipoo/bindable-maniaaction ... Dependency inject the mania column keybind	2018-07-02 12:57:50 +09:00
smoogipoo	9f85c55915	Merge remote-tracking branch 'origin/master' into legacy-custom-banks	2018-07-02 12:34:51 +09:00
smoogipoo	f007e71c87	Retrieve the mania key action through DI	2018-07-02 12:31:41 +09:00
Dean Herbert	6a459efd8f	Don't allow Key.Escape	2018-07-02 11:04:40 +09:00
Dan Balasescu	6ff18bb142	Merge pull request #2923 from peppy/fix-ruleset-debug-load ... Fix rulesets not loading in debug builds after running a release build	2018-07-02 09:42:28 +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
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	109649aa52	Merge pull request #2884 from peppy/di-backed-ruleset ... Use dependency injection to access the current ruleset	2018-06-29 21:35:34 +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	9bf906df80	Merge pull request #2849 from peppy/fix-dialog-overlay-sounds ... Fix dialog overlay playing double samples on show/hide	2018-06-29 18:59:46 +09:00
Dan Balasescu	513129d4a8	Merge branch 'master' into fix-dialog-overlay-sounds	2018-06-29 18:45:37 +09:00
Dan Balasescu	bacf91938c	Merge pull request #2899 from peppy/fix-negative-online-set-id ... Fix beatmaps importing with -1 as online set ID	2018-06-29 18:45:29 +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	34ddb79a96	Merge pull request #2915 from peppy/fix-delta-patching ... Revert SharpCompress library to fix delta patching regression	2018-06-29 18:19:02 +09:00
Dan Balasescu	f149289c83	Merge branch 'master' into fix-delta-patching	2018-06-29 18:01:56 +09:00
Dean Herbert	d6fae1e4b9	Merge pull request #2778 from cl8n/catch-scoring ... Add judgements to osu!catch	2018-06-29 17:50:39 +09:00
Dean Herbert	23aa2a2361	Merge branch 'master' into catch-scoring	2018-06-29 17:29:15 +09:00
Dan Balasescu	558969b2c5	Merge pull request #2914 from tgi74/beatmap-defaults ... Add BeatmapInfo's stable defaults to fix compatibility with old beatmaps	2018-06-29 17:23:47 +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
Dan Balasescu	b6caccbe44	Merge pull request #2913 from peppy/fix-combo-index ... Fix combo index being wrong	2018-06-29 17:12:44 +09:00
Dean Herbert	c0b65a6a73	Change default IsBonus definition and remove unnecessary overrides	2018-06-29 17:07:08 +09:00
Dean Herbert	cacabeb67e	Remove unused field	2018-06-29 17:00:41 +09:00