1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 01:45:35 +08:00
Commit Graph

235 Commits

Author SHA1 Message Date
Huo Yaoyuan
411988f038 Remove all trailing whitespaces in this repo. 2017-04-06 16:21:18 +08:00
Dean Herbert
4783d17d94 Merge branch 'master' into better-hitsounds 2017-04-06 16:00:56 +09:00
smoogipooo
eb82a4c090 Back to using SampleInfo + fix taiko beatmap conversion. 2017-04-06 11:41:16 +09:00
smoogipooo
d607207b69 Ability to contain multiple sample banks. Get default bank name from control point. 2017-04-05 21:59:07 +09:00
smoogipooo
8d720e39c6 Going forward, explicit ToLower should not be needed. 2017-04-05 21:39:09 +09:00
smoogipooo
2d8239a3f7 Re-implement the SampleBank/Sample structure. No parsing support yet. 2017-04-05 21:34:28 +09:00
Dean Herbert
4aafc172ca
Allow playfield to specify whether it has a cursor or not. 2017-04-05 17:38:57 +09:00
smoogipooo
74bd427997 Remove SliderVelocityAt, compute it manually inside hit objects. 2017-04-03 14:12:15 +09: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
fa7c72a099
Refactor ReplayInputHandler creation for more flexibility. 2017-03-31 15:59:53 +09:00
Dean Herbert
0bcec4e61a
Add null-checks to comparers. 2017-03-31 12:55:43 +09:00
Dean Herbert
e7ecc479c9
Add FramedReplay and use where legacy is not needed. 2017-03-31 12:43:42 +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
3050039972 Implement partial judgements + make Result non-nullable. 2017-03-29 18:35:28 +09:00
Dean Herbert
f7dc7e9bb9
Update references. 2017-03-28 21:26:20 +09:00
smoogipooo
93029aec3e Change accessibilities to make replays more extensible. 2017-03-24 13:58:45 +09: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
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
Dean Herbert
d52ac33e7c Merge branch 'master' into use_more_accentcolour 2017-03-23 17:36:19 +09:00
Dean Herbert
0785dd8528
Change default OsuHitObject combo colour to gray
This makes it easier to see additive elements in testcases.
2017-03-23 17:15:39 +09:00
Dean Herbert
4644f6afdb
Fix SliderBody's accent colour and thread-safety. 2017-03-23 17:11:51 +09:00
smoogipooo
2c76a2350c Use AccentColour everywhere in drawable osu! hit objects. 2017-03-23 16:19:12 +09:00
Dean Herbert
b83db18551
HitExplosion -> DrawableOsuJudgementInfo. 2017-03-23 15:11:22 +09:00
Dean Herbert
d441114011 Merge branch 'master' into taiko_playfield_2 2017-03-23 14:28:42 +09:00
Dean Herbert
681ed38941
Use const whenever possible. 2017-03-23 13:52:38 +09:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible. 2017-03-23 13:50:08 +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
Andrey Zavadskiy
086191a12a Spinner fix 2017-03-22 16:13:39 +03:00
Dean Herbert
fbe08436d2
Fix usages of CircularContainer in line with framework changes. 2017-03-22 19:35:03 +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
Adrian Wielgosik
3270fdcfde Fix auto-sliders in TestCaseHitObject 2017-03-21 22:48:33 +01:00
smoogipooo
090e8bbb79 Remove hit object types solution-wide. 2017-03-20 13:10:24 +09:00
Dean Herbert
af85bcaf1d Merge pull request #500 from smoogipooo/explicit_expires
Make DrawableHitObject expires explicit.
2017-03-19 12:47:43 +09:00
Dean Herbert
292de44a0b
WIP menu cursor. 2017-03-17 20:45:27 +09:00
smoogipooo
cce1ae055f Make DrawableHitObject expires explicit. 2017-03-17 15:30:19 +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
e0a8c3b1e5 Rename BaseDifficulty -> Difficulty / BeatmapDifficulty. 2017-03-16 23:18:02 +09:00
Dean Herbert
60fc782e93 Merge branch 'master' into beatmap_timinginfo 2017-03-16 23:08:24 +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
5137338c7c Replace List<ControlPoint> with TimingInfo in Beatmap. 2017-03-16 17:11:24 +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
c82ae011fb Make ScoreProcessors take generic judgements. 2017-03-16 12:45:23 +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