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
Seth
21a9996225
Merge branch 'master' into leaderboards
2017-03-14 10:07:33 -03: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
smoogipooo
7141bc86d3
Rework beatmap post-processing into HitRenderer.
2017-03-14 17:01:21 +09:00
Dean Herbert
14b22445fa
Merge remote-tracking branch 'upstream/master' into general-fixes
...
# Conflicts:
# osu.Game/Modes/UI/HitRenderer.cs
2017-03-14 16:15:26 +09:00
Dean Herbert
1f68731a09
Split PlayerInputManager into two classes, allowing more precise handling of input (for KeyCounter).
2017-03-14 16:00:35 +09:00
smoogipooo
90ad2e9731
Remove unused interface.
2017-03-14 15:50:36 +09:00
smoogipooo
e42c790df2
Refactorings.
2017-03-14 15:45:27 +09:00
smoogipooo
e8d5cff790
Fix license headers.
2017-03-14 14:53:17 +09:00
smoogipooo
072eea82ea
Fix up combo colours + a few nullrefs.
2017-03-14 14:50:12 +09:00
smoogipooo
854212a7aa
Merge branch 'master' into beatmap_parsing
...
Conflicts:
osu.Desktop.VisualTests/app.config
osu.Game.Modes.Catch/CatchRuleset.cs
osu.Game.Modes.Mania/ManiaRuleset.cs
osu.Game.Modes.Mania/app.config
osu.Game.Modes.Osu/OsuRuleset.cs
osu.Game.Modes.Osu/app.config
osu.Game.Modes.Taiko/TaikoRuleset.cs
osu.Game/Modes/Ruleset.cs
osu.Game/app.config
osu.Game/osu.Game.csproj
2017-03-14 13:39:19 +09:00
smoogipooo
bbd81dbc47
Add license headers.
2017-03-14 13:02:42 +09:00
smoogipooo
99c23d8715
I don't like this renaming.
2017-03-14 12:54:09 +09:00
smoogipooo
db8cbba8d5
Okay resharper u da boss.
2017-03-14 12:52:12 +09:00
Dan Balasescu
879a78156d
Merge branch 'master' into mod_application
2017-03-14 12:38:55 +09:00
smoogipooo
6ebd88060a
Simplify foreach.
2017-03-14 12:38:30 +09:00
smoogipooo
bc5912eab5
Applyable -> Applicable.
2017-03-14 12:32:31 +09:00
Dean Herbert
1eacafc7b4
Merge branch 'master' into general-fixes
2017-03-14 12:02:24 +09:00
Dean Herbert
4fa037c0b2
Update framework.
2017-03-14 12:01:58 +09:00
DrabWeb
6bd9e3cac1
+Score ranks
2017-03-13 18:34:43 -03:00
Dean Herbert
2756d5f09f
Merge branch 'master' into mod_application
2017-03-13 23:00:11 +09:00
DrabWeb
dbc8d513f9
Merge https://github.com/ppy/osu into leaderboards
2017-03-13 09:36:16 -03:00
smoogipooo
842f938439
General fixes.
2017-03-13 21:05:34 +09:00
smoogipooo
f50e0bbf3c
Rework/rewrite beatmap parsing to parse to base hit objects, which mode-specific beatmap converters can then use.
2017-03-13 19:15:25 +09:00
smoogipooo
35ddca78f5
Remove old, unused hit object converters (will be re-implemented through IBeatmapConverter).
2017-03-13 14:50:55 +09:00
smoogipooo
7d129ebd6d
Attempt to fix things.
2017-03-12 22:38:50 +09:00
smoogipooo
447cc17de8
Merge branch 'beatmap_conversion' into mod_application
...
Conflicts:
osu.Game.Modes.Catch/CatchRuleset.cs
osu.Game.Modes.Mania/ManiaRuleset.cs
osu.Game.Modes.Osu/OsuRuleset.cs
osu.Game.Modes.Taiko/TaikoRuleset.cs
2017-03-12 22:20:52 +09:00
smoogipooo
5be1839710
Remove unused method.
2017-03-12 22:19:35 +09:00
smoogipooo
c0e29652a6
Initial attempt at making mods apply better.
2017-03-12 22:13:43 +09:00
smoogipooo
64aab090d5
Instantiate HitRenderer with WorkingBeatmap.
2017-03-12 18:03:13 +09:00
smoogipooo
3480dca0ad
Remove PlayMode enum requirement. Clean things up a lot.
2017-03-12 14:32:50 +09:00
smoogipooo
b0ea282a06
Fix map would always be converted to itself when actually converting to a different game mode.
2017-03-12 02:26:10 +09:00
smoogipooo
f484792546
Merge branch 'refactor_hitrenderer' into beatmap_conversion
...
Conflicts:
osu.Game/Modes/UI/HitRenderer.cs
2017-03-12 01:27:28 +09:00
smoogipooo
59b62b8fd4
Merge remote-tracking branch 'origin/master' into refactor_hitrenderer
2017-03-12 01:20:11 +09:00
smoogipooo
74db255c78
Move back to using an abstract method to determine if all objects have been judged.
...
Because sliderticks provide judgements even though they are added as nested hitobjects, the count method would not work to determine if all hitobjects have been judged. This needs a little bit more thought put in...
2017-03-12 01:19:51 +09:00
smoogipooo
592e05a2c8
Better beatmap conversion model.
2017-03-12 00:34:21 +09:00
smoogipooo
e126a5600a
Fix using.
2017-03-11 14:28:06 +09:00
smoogipooo
42b19cd3b3
Re-add files.
2017-03-11 14:27:18 +09:00
smoogipooo
b63a1c549e
Remove files temporarily.
2017-03-11 14:26:58 +09:00
smoogipooo
75ed7406e4
Merge remote-tracking branch 'origin/master' into refactor_hitrenderer
...
Conflicts:
osu.Game.Modes.Catch/CatchRuleset.cs
osu.Game.Modes.Mania/ManiaRuleset.cs
osu.Game.Modes.Osu/OsuRuleset.cs
osu.Game.Modes.Taiko/TaikoRuleset.cs
2017-03-11 14:22:59 +09:00
smoogipooo
3276316ac8
Merge remote-tracking branch 'origin/master' into counter_bindables
...
Conflicts:
osu.Game/Modes/UI/HudOverlay.cs
2017-03-11 14:19:25 +09:00
smoogipooo
eef18eea42
General fixes.
2017-03-11 14:17:07 +09:00
smoogipooo
529cabb001
Make HudOverlay not dependent on Ruleset.
2017-03-10 16:16:07 +09:00
smoogipooo
75a5da62d0
Fix filenames.
2017-03-10 16:11:38 +09:00
smoogipooo
2bc36fecc6
Combo should not be longs.
2017-03-10 16:05:05 +09:00
smoogipooo
eca980bb95
Remove .orig files (not sure how they got here).
2017-03-10 15:57:14 +09:00
smoogipooo
02281d8a2a
Make HitRenderer not have a publicly-settable Beatmap, replace AllObjectsJudged for performance.
2017-03-10 15:19:36 +09:00
smoogipooo
aed89b7c0f
Merge branch 'general_hud' into counter_bindables
...
Conflicts:
osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs
osu.Game/Modes/UI/HUDOverlay.cs
2017-03-10 14:44:29 +09:00
smoogipooo
58a88cc715
More general refactorings.
2017-03-10 14:42:14 +09:00
smoogipooo
5f440d0b53
Merge branch 'combocounter_bindable' into general_hud
...
Conflicts:
osu.Game.Modes.Osu/OsuRuleset.cs
osu.Game/Modes/Ruleset.cs
2017-03-10 14:35:31 +09:00
smoogipooo
605326e8f6
More ComboCounter fixups + refactorings.
2017-03-10 14:34:08 +09:00
smoogipooo
7a68e46366
Merge remote-tracking branch 'origin/master' into combocounter_bindable
...
Conflicts:
osu.Game.Modes.Osu/OsuRuleset.cs
osu.Game/Modes/Ruleset.cs
2017-03-10 14:15:06 +09:00
smoogipooo
ff3faeaf40
Fix silly spelling mistake.
2017-03-10 14:01:54 +09:00
smoogipooo
712739d779
s/SetHP/SetHealth.
2017-03-10 13:58:17 +09:00
smoogipooo
122792eb93
Remove unused methods.
2017-03-10 13:49:56 +09:00
smoogipooo
cd1717c42f
More bindables!
2017-03-10 13:49:51 +09:00
smoogipooo
f44fa56646
Merge branch 'general_hud' of https://github.com/smoogipooo/osu into general_hud
...
Conflicts:
osu.Game.Modes.Osu/OsuRuleset.cs
2017-03-10 13:42:50 +09:00
smoogipooo
2d6e667c7c
Renaming + use IEnumerable.
2017-03-10 13:40:44 +09:00
Dean Herbert
2813484f2e
Merge branch 'master' into general_hud
2017-03-10 13:25:26 +09:00
smoogipooo
4015b87965
General fixes.
2017-03-10 13:09:50 +09:00
smoogipooo
444c645da0
General fixes.
2017-03-10 13:02:50 +09:00
smoogipooo
4cc032e1d7
Make ComboCounter count a bindable, and properly bind it to the processor.
2017-03-10 12:55:10 +09:00
smoogipooo
617ceb8001
Rename to StandardComboCounter, add HealthDisplay abstraction.
2017-03-10 12:47:00 +09:00
smoogipooo
31f6cbd8cf
Rename ScoreOverlay -> HUDOverlay, move to osu.Game, make it not overridable by rulesets.
2017-03-10 12:14:13 +09:00
Jorolf
d9a4a677fd
Added Descriptions to Rulesets + PlayModes list
2017-03-09 21:37:03 +01:00
Dean Herbert
115ebd4773
Merge branch 'master' into modselect
2017-03-09 17:31:25 +09:00
Dean Herbert
1b532b0741
Fix second mono regression.
2017-03-09 15:53:16 +09:00
Dean Herbert
d7497330b2
Reduce warning/suggestion count to zero.
2017-03-09 15:52:40 +09:00
Dean Herbert
da751804b6
Reduce error count.
2017-03-09 14:24:16 +09:00
Dean Herbert
3eece390cb
Abstract constructors -> protected.
2017-03-09 14:01:08 +09:00
Dean Herbert
dc5ac6e88f
Add missing access modifiers.
2017-03-09 13:55:29 +09:00
Dean Herbert
0c4c1689b6
Merge branch 'master' into modselect
2017-03-09 12:51:40 +09:00
Dean Herbert
5a42035f88
Update license headers.
2017-03-08 15:50:52 +09:00
Dean Herbert
123c8f3489
Add comment.
2017-03-08 11:54:52 +09:00
Dean Herbert
02cab41d34
Move InputManager to a higher and more implicit level.
...
Also makes KeyCounterCollection work with replays.
2017-03-07 19:30:48 +09:00
Huo Yaoyuan
ffd79bee06
Remove inherited mods in incompatible list and add between Auto and NoFail.
2017-03-07 16:27:55 +08:00
Huo Yaoyuan
b56d6c767b
Merge branch 'master' into modselect
2017-03-07 16:10:53 +08:00
Dean Herbert
1fb846e61d
Make playfield scaling optional.
2017-03-07 15:49:04 +09:00
Dean Herbert
bff1179624
Merge branch 'master' into replay
...
# Conflicts:
# osu.Game/Modes/Mod.cs
2017-03-07 14:32:14 +09:00
Dean Herbert
5cbcf7a20a
Fix error-level inspections.
2017-03-07 14:31:54 +09:00
Dean Herbert
ecdbcb20cf
Fix error-level inspections.
2017-03-07 13:52:47 +09:00
Dean Herbert
4430255ec4
Merge remote-tracking branch 'upstream/master' into replay
...
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
# osu.Desktop/OsuGameDesktop.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
# osu.Game/Database/BeatmapDatabase.cs
# osu.Game/Graphics/Cursor/OsuCursorContainer.cs
# osu.Game/IPC/BeatmapImporter.cs
# osu.Game/Modes/Mod.cs
# osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
# osu.Game/Modes/UI/Playfield.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/Screens/Play/PlayerInputManager.cs
2017-03-07 13:50:08 +09:00
Dean Herbert
3e4cd0dc7c
Merge remote-tracking branch 'upstream/master' into less-mods-enum
...
# Conflicts:
# osu.Game.Modes.Mania/ManiaMod.cs
# osu.Game.Modes.Osu/OsuMod.cs
# osu.Game/Modes/Mod.cs
2017-03-07 13:42:50 +09:00
Dean Herbert
0cad5d7d41
Fix most warnings.
2017-03-07 13:05:57 +09:00
Dean Herbert
12c316aba4
Fix int truncation.
2017-03-07 11:29:55 +09:00
Dean Herbert
39ff68a812
Add missing IncompatibleMods.
2017-03-07 09:16:47 +09:00
Huo Yaoyuan
f6f20cafd3
Merge remote-tracking branch 'peppy/less-mods-enum' into modselect
2017-03-06 17:35:15 +08:00
Dean Herbert
12a3b1414f
Add sane defaults for abstract Mod class and remove remaining use of enum.
2017-03-06 18:29:19 +09:00
Dean Herbert
45f500920c
Don't use Mods enum for handling incompatible mods.
2017-03-06 18:29:17 +09:00
Huo Yaoyuan
c2cf5242e1
Remove one-entry backing fields.
2017-03-06 17:14:41 +08:00
Dean Herbert
610de4a34c
Only show replay cursor when replay input is present.
2017-03-06 15:24:00 +09:00
Dean Herbert
76ef8c1a6c
Add bindable mods and autoplay support.
2017-03-06 14:52:37 +09:00
Dean Herbert
652d18aada
Update second usage of comment.
2017-03-06 14:20:44 +09:00
Dean Herbert
4118be6388
Remove unnecessary bounds check.
2017-03-06 14:19:22 +09:00
Dean Herbert
809828f0ba
Improve NextFrame.
2017-03-06 14:18:44 +09:00
Dean Herbert
faf07ab51a
Use generics everywhere.
2017-03-06 13:59:11 +09:00
Dean Herbert
5b4424d4fa
CreateAutoplayReplay -> CreateAutoplayScore.
2017-03-06 10:06:14 +09:00
