1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-18 01:23:05 +08:00
Commit Graph

222 Commits

Author SHA1 Message Date
smoogipooo
2ee68ae75a Make CirclePiece use relative width (leaving length control to DrawableDrumRoll). 2017-03-24 20:10:17 +09:00
smoogipooo
fdd17c1575 Rewrite circle pieces to use custom graphics again.
Also using FontAwesome for now to enforce the same size, because otherwise you have to mess around with sprites + the custom graphics. This will all be changed when sprites are fixed to maintain aspect ratios and when glow/border use relative axes.
2017-03-24 20:08:40 +09:00
smoogipooo
405c6f9691 More explicative xmldoc. 2017-03-24 19:05:45 +09:00
smoogipooo
369e3903ac Don't use a magic number. 2017-03-24 19:04:46 +09:00
smoogipooo
feecf23d9f Don't force the size. 2017-03-24 19:04:32 +09:00
smoogipooo
df46d0f446 Cleanup. 2017-03-24 18:49:10 +09:00
smoogipooo
5281842965 Rewrite CirclePiece to be referenced to 128x128px and handle accented hits more sanely. 2017-03-24 18:37:56 +09:00
smoogipooo
47065d8031 Remove explicit alpha = 1. 2017-03-24 16:15:14 +09:00
smoogipooo
6753a22512 Fix post-merge issues. 2017-03-24 16:03:38 +09:00
smoogipooo
33c160efeb Merge branch 'taiko_note_circle' into taiko_drawable_drawing
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-24 16:02:49 +09:00
smoogipooo
d6d3eb99b7 Adjust comment. 2017-03-24 15:55:25 +09:00
smoogipooo
82752e0988 Moar cleanup. 2017-03-24 15:50:18 +09:00
smoogipooo
8f7ed813a3 Cleanup. 2017-03-24 15:45:21 +09:00
smoogipooo
95183279f3 Rename ScrollingCirclePiece -> ScrollingPiece. 2017-03-24 15:44:43 +09:00
smoogipooo
eea24b2d82 Make sure icon is only instantiated once. 2017-03-24 15:43:17 +09:00
smoogipooo
aa9a65d69c Move load below CreateIcon(). 2017-03-24 15:42:48 +09:00
smoogipooo
99f1e86a5e Fix something that was removed during merge conflicts. 2017-03-24 15:19:58 +09:00
smoogipooo
3cecffbc48 Merge branch 'taiko_note_circle' into taiko_drawable_drawing
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-24 15:17:17 +09:00
smoogipooo
bb4b6b783c Fix post-merge errors. 2017-03-24 15:14:49 +09:00
smoogipooo
20e80a758a Merge branch 'master' into taiko_drawable_drawing
Conflicts:
	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
	osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-24 15:11:56 +09:00
smoogipooo
cce5b4f80f Make readonly. 2017-03-24 14:42:42 +09:00
Dan Balasescu
ac2d36da3b Merge branch 'master' into taiko_note_circle 2017-03-24 14:33:08 +09:00
smoogipooo
2a6da0751d Rename UpdateJudgement -> OnNewJugement + rename judgement parameter. 2017-03-24 11:32:48 +09:00
smoogipooo
59ba497952 Remove linear interpolation of hp_hit_good.
I think this is an okay compromise because hp_hit_great doesn't use linear interpolation here. I am tentative on this change, but I need to code up the rest of taiko before I can test this further.
2017-03-24 11:28:52 +09:00
smoogipooo
5e34c2497a More accented renaming + improve comments. 2017-03-24 11:24:31 +09:00
smoogipooo
a1f5bc04aa Use isTick. 2017-03-24 11:24:07 +09:00
smoogipooo
4ae45ea866 Final -> cumulative, to represent a growing score. 2017-03-24 11:15:22 +09:00
smoogipooo
afdb719c60 Rename finisher -> accented. 2017-03-24 11:09:01 +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
c3adbb9b41 Fix nullref. 2017-03-23 20:34:11 +09:00
smoogipooo
a0c0a0fcfe Fix post-merge errors. 2017-03-23 19:39:30 +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
smoogipooo
35f1f06ee2 Rename drum roll tick judgement. 2017-03-23 19:36:58 +09:00
smoogipooo
11fb404574 Merge remote-tracking branch 'origin/master' into taiko_drumroll_tick_judgements
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-23 19:35:36 +09:00
smoogipooo
322a78830e Implement Taiko score processing. 2017-03-23 19:24:23 +09:00
smoogipooo
768bc2bb5f Make TaikoHitObject store whether the hit object is a finisher. 2017-03-23 19:14:21 +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
smoogipooo
7d3846692a Merge branch 'taiko_drumroll_tick_judgements' into taiko_scoreprocessing 2017-03-23 17:58:12 +09:00
smoogipooo
0ac33b59e3 Add DrumRoll tick judgement info. 2017-03-23 17:52:46 +09:00
Dean Herbert
96fc8eef30 Merge branch 'master' into taiko_hitobject_drawable 2017-03-23 17:23:22 +09:00
Dean Herbert
1e1c46765a Merge branch 'master' into taiko_conversion 2017-03-23 16:52:15 +09:00
Dean Herbert
315994f2b3 Merge pull request #538 from smoogipooo/taiko_base_hit
Add Hit class, make TaikoHitObject abstract.
2017-03-23 16:51:45 +09:00
Dean Herbert
ebb64e01d1
Add constant for HitTarget line thickness and make slightly thicker (displays better at lower resolutions). 2017-03-23 15:32:41 +09:00
Dean Herbert
ef8830aa7f
Adjust InputDrum's appearance a touch. 2017-03-23 15:28:17 +09:00
Dean Herbert
1af17fc108
Remove cross-reference to osu.Game.Modes.Osu from Taiko. 2017-03-23 15:12:08 +09:00
Dean Herbert
02fba000bc
Tidy up and tweak transitions of DrawableJudgementInfo. 2017-03-23 15:07:45 +09:00
Dean Herbert
acfa4a4aac
JudgementText -> DrawableTaikoJudgementInfo. 2017-03-23 14:52:18 +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
9a3fd8bcf1
Add readonly attributes. 2017-03-23 14:37:00 +09:00