Commit Graph

251 Commits

Author SHA1 Message Date
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
smoogipooo 418189effd Adjust/improve a few comments. 2017-03-15 21:58:00 +09:00
smoogipooo 4de3dde44d Fix post-merge error. 2017-03-15 21:40:19 +09:00
smoogipooo 42da0f1a72 Merge remote-tracking branch 'origin/master' into generic_judgements_2
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
	osu.Game.Modes.Catch/UI/CatchHitRenderer.cs
	osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs
	osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
	osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
	osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
	osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
	osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
	osu.Game/Modes/UI/HitRenderer.cs
	osu.Game/osu.Game.csproj
2017-03-15 21:36:43 +09:00
smoogipooo 3a8d1d3619 Add license headers. 2017-03-15 21:32:47 +09:00
smoogipooo 0f4df0566b HasSpecial -> HasHold. 2017-03-15 19:43:38 +09:00
smoogipooo 76c0a4d836 HitObjectType -> LegacyHitObjectType, move to Legacy namespace. 2017-03-15 19:39:40 +09:00
smoogipooo e0e0a2726d Move OsuJudgementInfo to its own class, remove PositionalJudgementInfo. 2017-03-15 19:23:42 +09:00
smoogipooo a9bc253b8c General refactoring (no more casts :D). 2017-03-15 19:18:23 +09:00
smoogipooo 36e8618370 Make DrawableHitObjects have generic JudgementInfos. 2017-03-15 18:55:38 +09:00
smoogipooo 1c87d998a6 Rename HitObjectType -> TObject. 2017-03-15 16:29:14 +09:00
smoogipooo bf66b84ff8 Move a few classes/enums into separate files. 2017-03-15 16:07:40 +09:00
smoogipooo ae7547bbda Fix up distance -> positional length comments. 2017-03-15 12:59:19 +09:00
smoogipooo 41f912836a Refactorings. 2017-03-15 12:57:17 +09:00
smoogipooo 6a31219781 Add further abstraction to Sliders/IHasCurve. 2017-03-15 12:52:25 +09:00
smoogipooo 9fdeff3f9e Make interfaces inherit other interfaces for now. 2017-03-15 12:30:31 +09:00
smoogipooo 808f9fccca Add comment to IHasSpecial. 2017-03-15 12:29:54 +09:00
smoogipooo 72e1612f32 Null-safety in the case where there are no HitObjects. 2017-03-14 19:44:14 +09:00
smoogipooo c2d80936cf More closely replicate osu!'s parsing code. 2017-03-14 19:25:04 +09:00
smoogipooo c315c8690b Fix incorrect hit object type. 2017-03-14 19:24:47 +09:00
smoogipooo 069a7a24ce Fix defaults not being set (keep in mind this will be changed in a later pullrequest). 2017-03-14 19:04:40 +09:00
smoogipooo 785b970125 Add special interface for LegacyHold. 2017-03-14 18:49:22 +09:00
smoogipooo a1833fd6b0 Whoops, naming. 2017-03-14 18:49:01 +09:00
smoogipooo 4c7f0fcb73 Fix unit tests. 2017-03-14 18:46:34 +09:00
smoogipooo ad9583a179 Merge branch 'beatmap_parsing' of https://github.com/smoogipooo/osu into beatmap_parsing 2017-03-14 18:06:50 +09:00
smoogipooo 1f43370886 Fix failing unit test, move legacy hitobjects to Objects/Legacy/. 2017-03-14 18:06:32 +09:00
Dean Herbert 5c2bf02c9d Merge branch 'master' into beatmap_parsing 2017-03-14 17:50:00 +09:00
smoogipooo d6ccc66b23 Attempt to fix nullref warning. 2017-03-14 17:46:35 +09:00
smoogipooo 2b3b3b7255 Fix license headers (sorry I have to do this as post-processing for now cos VS 2017...). 2017-03-14 17:07:38 +09:00