290 Commits

Author	SHA1	Message	Date
DrabWeb	befbc63c35	Merge https://github.com/ppy/osu into song-progress-graph	2017-03-23 23:42:06 -03:00
DrabWeb	ca2816f9c8	Formatting	2017-03-23 07:24:43 -03:00
DrabWeb	546a3d0914	Merge branch 'song-progress-graph' of https://github.com/DrabWeb/osu into song-progress-graph	2017-03-23 07:15:53 -03:00
Dean Herbert	2cb801317d	JudgementInfo -> Judgement. ... There is no case where we use the term "Judgement" without the suffix, so deemed it unnecessary.	2017-03-23 19:00:18 +09:00
Dean Herbert	93915ba527	Fix regression of osu! judgement animation.	2017-03-23 18:56:27 +09:00
DrabWeb	0337f18fb9	Cleaning	2017-03-23 06:37:12 -03:00
Dean Herbert	4d61424abd	Merge branch 'master' into song-progress-graph	2017-03-23 17:44:22 +09:00
Dean Herbert	96fc8eef30	Merge branch 'master' into taiko_hitobject_drawable	2017-03-23 17:23:22 +09:00
Dean Herbert	0863efb2c8	Remove unused variable.	2017-03-23 15:35:42 +09:00
Dean Herbert	02fba000bc	Tidy up and tweak transitions of DrawableJudgementInfo.	2017-03-23 15:07:45 +09:00
smoogipooo	3d1dad8185	Merge remote-tracking branch 'origin/master' into taiko_hitobject_drawable ... Conflicts: osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj	2017-03-23 14:40:06 +09:00
Dean Herbert	d441114011	Merge branch 'master' into taiko_playfield_2	2017-03-23 14:28:42 +09:00
Dean Herbert	54e1b24fe9	Enforce readonly private members where possible.	2017-03-23 13:50:08 +09:00
smoogipooo	aa2b22ff12	Fix usings.	2017-03-23 13:02:34 +09:00
smoogipooo	c9fe9e681d	Make judgement text generic to be used between game modes.	2017-03-23 12:49:28 +09:00
smoogipooo	8b71d70633	Add a way to get the score string from JugementInfo.	2017-03-23 12:21:09 +09:00
Dan Balasescu	02dc6fb213	Merge branch 'master' into taiko_hitobject_drawable	2017-03-23 08:50:57 +09:00
DrabWeb	e4af30bd15	Line endings	2017-03-22 09:38:40 -03:00
DrabWeb	8703e5a962	More formatting	2017-03-22 09:35:08 -03:00
DrabWeb	818bdd8e88	SongProgress in HudOverlay	2017-03-22 09:27:04 -03:00
smoogipooo	aa8780797e	Abstract class + move AccentColour to base.	2017-03-22 15:22:02 +09:00
Dean Herbert	4f3ab879de	Make DrawableHitObject's UpdateState safer by blocking calls at a higher level with not yet loaded. ... UpdateState is called in LoadComplete for cases where the state may have changed before a load operation.	2017-03-22 09:43:44 +09:00
Dean Herbert	8983bbcaad	Merge branch 'master' into leaderboards	2017-03-22 08:24:49 +09:00
smoogipooo	66752af81f	Late-add the HitObjects container in the Playfield. ... Allows derivers to define the Content container in the constructor, to redirect the positioning of the HitObjects container.	2017-03-21 16:46:43 +09:00
smoogipooo	d27f37beb5	Hard-code text size in cases it wasn't set.	2017-03-20 13:48:06 +09:00
Dean Herbert	5d0adc6454	Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards	2017-03-19 18:51:53 +09:00
Seth	4aea06be22	Merge branch 'master' into leaderboards	2017-03-17 18:23:01 -03:00
smoogipooo	cce1ae055f	Make DrawableHitObject expires explicit.	2017-03-17 15:30:19 +09:00
Dean Herbert	5474710c13	Merge branch 'master' into better_hitobject_defaults	2017-03-17 02:51:15 +09:00
smoogipooo	88dfdf3f85	Add xmldoc.	2017-03-17 02:22:52 +09:00
smoogipooo	9a4af8f194	GetScore -> CreateScore.	2017-03-17 02:03:12 +09:00
smoogipooo	d5ec7f15d4	score -> ScoreProcessor.	2017-03-17 02:00:58 +09:00
smoogipooo	fe11f328e6	Cleanups.	2017-03-17 02:00:06 +09:00
smoogipooo	2394e7ff78	Make CheckFailed not actually trigger internal things, and make private.	2017-03-17 01:36:30 +09:00
smoogipooo	52c1cd407c	Minor re-ordering to make Playfield OnJudgement be called before ScoreProcessor's.	2017-03-17 01:26:12 +09:00
smoogipooo	33124d2849	Stale -> default.	2017-03-17 01:21:59 +09:00
Dean Herbert	61e7d427f7	Merge branch 'master' into scoreprocessor_computation	2017-03-17 01:04:07 +09:00
Dean Herbert	ea642e5ef4	Merge branch 'master' into scoreprocessor_failing_improvements	2017-03-17 00:52:30 +09:00
smoogipooo	faacac331d	Fix post-rebase issues.	2017-03-17 00:38:40 +09:00
smoogipooo	9f6f581b64	Pass through method instead of instantiating object.	2017-03-17 00:36:10 +09:00
smoogipooo	0c47638820	Better hit object defaults setting.	2017-03-17 00:36:09 +09:00
Dean Herbert	271dddc9a7	Merge branch 'master' into generic_scoreprocessor	2017-03-16 23:04:19 +09:00
Dean Herbert	ab8a5afdb9	AlwaysReceiveInput and InternalContains.	2017-03-16 17:38:36 +09:00
smoogipooo	d63b1a5cc5	Add target score computation functionality to ScoreProcessor.	2017-03-16 14:54:57 +09:00
smoogipooo	7764474cfe	Fix possible nullref.	2017-03-16 13:49:16 +09:00
smoogipooo	2a2caeba32	Add better failing support to ScoreProcessor.	2017-03-16 13:39:57 +09:00
smoogipooo	5cafec3b6a	Add back CreateScoreProcessor to Ruleset to instantiate a non-generic ScoreProcessor for ScoreDatabase.	2017-03-16 13:13:45 +09:00
smoogipooo	7b66faab9e	Fix filename.	2017-03-16 12:59:09 +09:00
smoogipooo	82033faaab	Warning/error fixing.	2017-03-16 12:57:50 +09:00
smoogipooo	c82ae011fb	Make ScoreProcessors take generic judgements.	2017-03-16 12:45:23 +09:00