Commit Graph

307 Commits

Author SHA1 Message Date
50c328f1b4 Merge remote-tracking branch 'upstream/master' into partial-judgements
# Conflicts:
#	osu.Game/osu.Game.csproj
2017-03-31 16:46:40 +09:00
3f080ab424 Add some commenting. 2017-03-31 16:01:48 +09:00
cf87330f80 Allow SetReplay to receive null. 2017-03-31 16:00:40 +09:00
fa7c72a099 Refactor ReplayInputHandler creation for more flexibility. 2017-03-31 15:59:53 +09:00
0f4b98ce73 Move FramedReplayInputHandler to own file and un-nest. 2017-03-31 15:32:34 +09:00
c531d774b7 Fix file naming. 2017-03-31 15:21:30 +09:00
09b98d71a7 Add back Capacity. 2017-03-31 13:33:19 +09:00
79031b9e74 Update framework. 2017-03-31 12:58:54 +09:00
e7ecc479c9 Add FramedReplay and use where legacy is not needed. 2017-03-31 12:43:42 +09:00
cd915a32be Let's use a List for now. 2017-03-31 11:58:24 +09:00
49575c3447 Special case not needed. 2017-03-31 11:54:12 +09:00
8e8d1bbd6d Merge branch 'master' into partial-judgements 2017-03-31 09:08:22 +09:00
6287ba321d Rewrite ScoreProcessor to have a new method for when existing judgements are changed.
- OnNewJudgement: Keeps its previous functionality. It is now only invoked when a _new_ judgement has been added to the Judgements hashset.
- OnJudgementChanged: Has a similar funcitonality to OnNewJudgement, but is only invoked whenever a judgement that was _previously_ in the Judgements hashset is changed.
2017-03-30 10:51:14 +09:00
c2d6faa7c2 Change Judgements into HashSet to prevent duplicates. 2017-03-30 10:39:38 +09:00
3050039972 Implement partial judgements + make Result non-nullable. 2017-03-29 18:35:28 +09:00
bae0ac4901 Fix missing base call that may result in invalid ScoreProcessor state. 2017-03-29 18:21:45 +09:00
f7dc7e9bb9 Update references. 2017-03-28 21:26:20 +09:00
136665e52e Add virtual method to instantiate legacy replays. 2017-03-24 14:28:17 +09:00
b225ae82be GetInputHandler -> CreateInputHandler. 2017-03-24 13:59:05 +09:00
93029aec3e Change accessibilities to make replays more extensible. 2017-03-24 13:58:45 +09:00
2a6da0751d Rename UpdateJudgement -> OnNewJugement + rename judgement parameter. 2017-03-24 11:32:48 +09:00
4e31e3b443 Rename things around to make a bit more sense. 2017-03-24 09:51:58 +09:00
2074812f46 Move ScoreProcessor and Score to Scoring/. 2017-03-24 09:51:52 +09:00
99cd215f56 Merge branch 'taiko_drumroll_tick_judgements' into taiko_scoreprocessing
Conflicts:
	osu.Game.Modes.Taiko/TaikoScoreProcessor.cs
2017-03-23 19:38:00 +09:00
322a78830e Implement Taiko score processing. 2017-03-23 19:24:23 +09:00
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
93915ba527 Fix regression of osu! judgement animation. 2017-03-23 18:56:27 +09:00
96fc8eef30 Merge branch 'master' into taiko_hitobject_drawable 2017-03-23 17:23:22 +09:00
0863efb2c8 Remove unused variable. 2017-03-23 15:35:42 +09:00
02fba000bc Tidy up and tweak transitions of DrawableJudgementInfo. 2017-03-23 15:07:45 +09:00
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
d441114011 Merge branch 'master' into taiko_playfield_2 2017-03-23 14:28:42 +09:00
54e1b24fe9 Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
aa2b22ff12 Fix usings. 2017-03-23 13:02:34 +09:00
c9fe9e681d Make judgement text generic to be used between game modes. 2017-03-23 12:49:28 +09:00
8b71d70633 Add a way to get the score string from JugementInfo. 2017-03-23 12:21:09 +09:00
02dc6fb213 Merge branch 'master' into taiko_hitobject_drawable 2017-03-23 08:50:57 +09:00
aa8780797e Abstract class + move AccentColour to base. 2017-03-22 15:22:02 +09:00
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
8983bbcaad Merge branch 'master' into leaderboards 2017-03-22 08:24:49 +09:00
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
d27f37beb5 Hard-code text size in cases it wasn't set. 2017-03-20 13:48:06 +09:00
5d0adc6454 Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards 2017-03-19 18:51:53 +09:00
4aea06be22 Merge branch 'master' into leaderboards 2017-03-17 18:23:01 -03:00
cce1ae055f Make DrawableHitObject expires explicit. 2017-03-17 15:30:19 +09:00
5474710c13 Merge branch 'master' into better_hitobject_defaults 2017-03-17 02:51:15 +09:00
88dfdf3f85 Add xmldoc. 2017-03-17 02:22:52 +09:00
9a4af8f194 GetScore -> CreateScore. 2017-03-17 02:03:12 +09:00
d5ec7f15d4 score -> ScoreProcessor. 2017-03-17 02:00:58 +09:00
fe11f328e6 Cleanups. 2017-03-17 02:00:06 +09:00