5096 Commits

Author	SHA1	Message	Date
Dean Herbert	d8d12cbbdd	wip: Move more functionality into ComposeBlueprintContainer	2020-01-02 19:09:37 +09:00
Dean Herbert	ee332e0d42	Split out BlueprintContainer functionality further	2020-01-02 18:21:16 +09:00
Dean Herbert	f09f9eb07d	Merge branch 'master' into general-editor-beatmap	2020-01-01 23:27:08 +09:00
Dean Herbert	4f2fa2626a	Centralise calls to mutable hitobjects list	2020-01-01 21:24:00 +09:00
Dean Herbert	ca90f708f1	Merge remote-tracking branch 'upstream/master' into remove-editor-beatmap-generics	2020-01-01 21:03:31 +09:00
smoogipoo	8c378dc625	Move EditorBeatmap construction/conversion to Editor	2019-12-30 14:51:14 +09:00
smoogipoo	6069d98ced	Remove generic editor beatmap	2019-12-27 19:39:30 +09:00
Dean Herbert	ca862124a5	Fix replay import from main menu causing a hard crash	2019-12-27 19:36:48 +09:00
Dean Herbert	b330aec03e	Drain starting at the first hitobject, not gameplay start	2019-12-27 16:16:30 +09:00
Dean Herbert	cac011edc1	Merge branch 'master' into hp-drain	2019-12-26 23:51:12 +09:00
Dean Herbert	033bb15500	Fix early-escape not continuing to results screen (#7362) ... Fix early-escape not continuing to results screen	2019-12-26 23:50:21 +09:00
Dean Herbert	a041f32072	Use cleaner solution via cancellation of older schedule	2019-12-26 19:05:32 +09:00
smoogipoo	8903f286ef	Fix escape not continuing to results screen	2019-12-26 18:27:48 +09:00
smoogipoo	522847987b	Implement break/gameplay start times	2019-12-26 15:00:58 +09:00
smoogipoo	b348abcd07	Only drain health in non-break times	2019-12-26 14:59:49 +09:00
smoogipoo	977fb3d1bf	Make processors and break overlay frame-stable	2019-12-26 14:59:49 +09:00
smoogipoo	a4b1c79e18	Initial implementation of HP drain	2019-12-26 14:59:49 +09:00
smoogipoo	90cb9d9162	Simplify scoreprocesor/healthprocessor implementations	2019-12-26 14:59:49 +09:00
smoogipoo	7414a6aadd	Merge remote-tracking branch 'huoyaoyuan/master' into health-processor ... # Conflicts: # osu.Game.Rulesets.Catch/CatchRuleset.cs # osu.Game.Rulesets.Mania/ManiaRuleset.cs # osu.Game.Rulesets.Taiko/TaikoRuleset.cs	2019-12-26 14:56:54 +09:00
Dean Herbert	41d99df73c	Merge branch 'master' into allow-ctrl-tabbing-on-more-tab-controls	2019-12-25 20:49:45 +09:00
Dan Balasescu	a265a0c7c5	Merge branch 'master' into settings-source-value-changed	2019-12-25 17:23:08 +09:00
Dean Herbert	89886ceb79	Fix incorrect dialog button animating on requesting quit twice (#7325) ... Fix incorrect dialog button animating on requesting quit twice	2019-12-25 13:15:30 +09:00
Joseph Madamba	2a5f661408	Merge branch 'master' into allow-ctrl-tabbing-on-more-tab-controls	2019-12-24 08:29:56 -08:00
smoogipoo	c7936e40d5	Protect against potential nullref	2019-12-23 19:13:36 +09:00
Joehu	b038c192d1	Rename property to IsSwitchable	2019-12-22 19:47:47 -08:00
mcendu	796223d3e0	Invert if	2019-12-22 21:39:25 +08:00
mcendu	1f41acc5b9	Integrate auto click into exit confirmed check	2019-12-22 21:20:55 +08:00
mcendu	5d29ff29cb	Animate "Good bye" instead on exit	2019-12-22 20:52:00 +08:00
Joehu	1342556894	Allow ctrl tabbing navigation to chat and song select leaderboards	2019-12-21 10:48:11 -08:00
Dean Herbert	a6bdf04f6b	Remove unused using	2019-12-20 18:36:39 +09:00
Dean Herbert	822903d5db	Update song select statistics when mod changes settings	2019-12-20 18:01:35 +09:00
Salman Ahmed	7d090d6cd9	Fix key overlay appearing regardless of the setting	2019-12-19 17:52:58 +03:00
smoogipoo	76f2fb378f	Separate score and health parts of ScoreProcessor	2019-12-19 20:03:14 +09:00
smoogipoo	2905a4418d	Fix potential nullref	2019-12-18 21:30:57 +09:00
smoogipoo	cb5a35f8f9	Fix incorrect bindable valuechanged usage	2019-12-18 21:08:49 +09:00
smoogipoo	4e11fb0fd7	Merge remote-tracking branch 'refs/remotes/origin/master' into multiplier-text	2019-12-18 19:36:16 +09:00
Dean Herbert	36172cf2bd	Merge pull request #7175 from LeNitrous/update-beatmap-settings ... Display current difficulty statistics with mods applied	2019-12-18 18:43:49 +09:00
Dan Balasescu	6683460240	Merge branch 'master' into update-beatmap-settings	2019-12-18 17:59:27 +09:00
Dean Herbert	bf85f4affb	Fix editor crashing when loading a beatmap for an unsupported ruleset	2019-12-18 17:53:26 +09:00
smoogipoo	8e651962c7	Fix incorrectly binding inside BDL load()	2019-12-18 17:41:30 +09:00
Dean Herbert	ada2ae2b2c	Use tuple to avoid potential for incorrect display	2019-12-18 17:12:41 +09:00
Dean Herbert	e87aa281bf	Don't clone beatmap unnecessarily	2019-12-18 17:00:35 +09:00
Dean Herbert	e0ce87adca	Move CreateScoreProcessor() to Ruleset (#7244) ... Move CreateScoreProcessor() to Ruleset	2019-12-17 22:15:42 +09:00
Dan Balasescu	fd2785bab3	Merge branch 'master' into fxcop	2019-12-17 20:14:45 +09:00
smoogipoo	49bf8d27d1	Move CreateScoreProcessor() to Ruleset	2019-12-17 20:08:13 +09:00
Huo Yaoyuan	caf3f774ba	CA1309: compare strings correctly.	2019-12-17 13:00:15 +08:00
Huo Yaoyuan	d5994ed484	CA2208: create exceptions correctly.	2019-12-17 13:00:10 +08:00
Huo Yaoyuan	ecfc6dfa3d	CA1825: use Array.Empty.	2019-12-17 12:59:48 +08:00
Dean Herbert	b5db927d93	Merge branch 'master' into cinema-mod	2019-12-17 12:56:06 +09:00
Dean Herbert	eed2984bef	Update sdk and InspectCode version (#7208) ... Update sdk and InspectCode version	2019-12-16 19:46:12 +09:00