RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,288 Commits 3 Branches 651 Tags 357 MiB
Commit Graph

55 Commits

Author SHA1 Message Date
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
smoogipooo 3050039972 Implement partial judgements + make Result non-nullable. 2017-03-29 18:35:28 +09:00
smoogipooo 2074812f46 Move ScoreProcessor and Score to Scoring/. 2017-03-24 09:51:52 +09: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 54e1b24fe9
Enforce readonly private members where possible. 2017-03-23 13:50:08 +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 52c1cd407c Minor re-ordering to make Playfield OnJudgement be called before ScoreProcessor's. 2017-03-17 01:26:12 +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
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 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 bf66b84ff8 Move a few classes/enums into separate files. 2017-03-15 16:07:40 +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
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 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 db8cbba8d5 Okay resharper u da boss. 2017-03-14 12:52:12 +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
smoogipooo 7d129ebd6d Attempt to fix things. 2017-03-12 22:38:50 +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 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 02281d8a2a Make HitRenderer not have a publicly-settable Beatmap, replace AllObjectsJudged for performance. 2017-03-10 15:19:36 +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
Dean Herbert 5cbcf7a20a
Fix error-level inspections. 2017-03-07 14:31:54 +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 0cad5d7d41
Fix most warnings. 2017-03-07 13:05:57 +09:00
Dean Herbert 610de4a34c
Only show replay cursor when replay input is present. 2017-03-06 15:24:00 +09:00
Dean Herbert faf07ab51a
Use generics everywhere. 2017-03-06 13:59:11 +09:00
Dean Herbert 58ae9e888d
Basic partial replay support. 2017-03-01 22:04:20 +09:00
Damnae 77ee161be8 Add follow points. 2017-02-10 06:19:59 +01:00
Damnae 38b25a7df3 Add hit object stacking. 2017-02-09 07:28:40 +01:00
Dean Herbert 50bd80cb0c
Update and standardise license headers. 2017-02-07 14:27:41 +09:00
Dean Herbert 74e3a87f78 Add *very* basic ranking screen. 2016-11-29 23:59:56 +09:00