Andrey Zavadskiy
9d027a61cd
Move input to HudOverlay
2017-04-01 14:46:45 +03:00
Andrey Zavadskiy
d7c39a00b4
Hud Visibility
2017-03-31 16:43:31 +03:00
Dean Herbert
50c328f1b4
Merge remote-tracking branch 'upstream/master' into partial-judgements
...
# Conflicts:
# osu.Game/osu.Game.csproj
2017-03-31 16:46:40 +09:00
Dean Herbert
3f080ab424
Add some commenting.
2017-03-31 16:01:48 +09:00
Dean Herbert
cf87330f80
Allow SetReplay to receive null.
2017-03-31 16:00:40 +09:00
Dean Herbert
fa7c72a099
Refactor ReplayInputHandler creation for more flexibility.
2017-03-31 15:59:53 +09:00
Dean Herbert
0f4b98ce73
Move FramedReplayInputHandler to own file and un-nest.
2017-03-31 15:32:34 +09:00
Dean Herbert
c531d774b7
Fix file naming.
2017-03-31 15:21:30 +09:00
smoogipooo
09b98d71a7
Add back Capacity.
2017-03-31 13:33:19 +09:00
Dean Herbert
79031b9e74
Update framework.
2017-03-31 12:58:54 +09:00
Dean Herbert
e7ecc479c9
Add FramedReplay and use where legacy is not needed.
2017-03-31 12:43:42 +09:00
smoogipooo
cd915a32be
Let's use a List for now.
2017-03-31 11:58:24 +09:00
smoogipooo
49575c3447
Special case not needed.
2017-03-31 11:54:12 +09:00
Dean Herbert
8e8d1bbd6d
Merge branch 'master' into partial-judgements
2017-03-31 09:08:22 +09:00
smoogipooo
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
smoogipooo
c2d6faa7c2
Change Judgements into HashSet to prevent duplicates.
2017-03-30 10:39:38 +09:00
smoogipooo
3050039972
Implement partial judgements + make Result non-nullable.
2017-03-29 18:35:28 +09:00
smoogipooo
bae0ac4901
Fix missing base call that may result in invalid ScoreProcessor state.
2017-03-29 18:21:45 +09:00
Dean Herbert
f7dc7e9bb9
Update references.
2017-03-28 21:26:20 +09:00
smoogipooo
136665e52e
Add virtual method to instantiate legacy replays.
2017-03-24 14:28:17 +09:00
smoogipooo
b225ae82be
GetInputHandler -> CreateInputHandler.
2017-03-24 13:59:05 +09:00
smoogipooo
93029aec3e
Change accessibilities to make replays more extensible.
2017-03-24 13:58:45 +09:00
DrabWeb
befbc63c35
Merge https://github.com/ppy/osu into song-progress-graph
2017-03-23 23:42:06 -03:00
smoogipooo
2a6da0751d
Rename UpdateJudgement -> OnNewJugement + rename judgement parameter.
2017-03-24 11:32:48 +09:00
smoogipooo
4e31e3b443
Rename things around to make a bit more sense.
2017-03-24 09:51:58 +09:00
smoogipooo
2074812f46
Move ScoreProcessor and Score to Scoring/.
2017-03-24 09:51:52 +09:00
smoogipooo
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
DrabWeb
ca2816f9c8
Formatting
2017-03-23 07:24:43 -03:00
smoogipooo
322a78830e
Implement Taiko score processing.
2017-03-23 19:24:23 +09: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
Dean Herbert
a22b34817c
Merge branch 'master' into leaderboards
2017-03-16 11:12:53 +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
Dean Herbert
8f5d262f30
Add GetScoresRequest API methods.
2017-03-15 14:06:05 +09:00
Dean Herbert
d96a78459d
Rename ScoreRanks to be in line with current API.
2017-03-15 13:55:29 +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
DrabWeb
4c03b62a75
More usings
2017-03-14 11:23:48 -03:00
DrabWeb
ebe48b7c24
Removed D rank
2017-03-14 11:14:27 -03:00
DrabWeb
650fc7563d
ScoreRank, Avatar to own files, +DrawableRank
2017-03-14 10:58:28 -03:00
Dean Herbert
8176b4ef77
Fix merge errors.
2017-03-14 22:11:38 +09:00
