1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 04:17:24 +08:00
Commit Graph

3076 Commits

Author SHA1 Message Date
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
79fa9daec8 Fix post-merge errors. 2017-03-24 15:05:54 +09:00
smoogipooo
ce1257ba56 Merge branch 'master' into taiko_bash_drawable
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-24 15:03:55 +09:00
smoogipooo
75dba19e7b Merge branch 'master' into taiko_drumroll_drawable 2017-03-24 15:00:35 +09:00
smoogipooo
45b013c85f Fix post-merge errors. 2017-03-24 14:59:59 +09:00
Dan Balasescu
bf3846eedb Merge branch 'master' into taiko_hit_drawables 2017-03-24 14:55:07 +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
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
Dean Herbert
6c3061e2bf Merge pull request #545 from smoogipooo/taiko_scoreprocessing
Taiko scoreprocessing
2017-03-24 13:35:47 +09:00
Dean Herbert
cb0c7dca71 Merge branch 'master' into taiko_scoreprocessing 2017-03-24 12:25:19 +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
Dean Herbert
f23372599d Merge pull request #542 from smoogipooo/taiko_drumroll_tick_judgements
Add DrumRoll tick judgement info.
2017-03-24 09:29:45 +09:00
Dan Balasescu
dace1e15c9 Merge pull request #546 from peppy/song-select-improvements
Song select improvements
2017-03-24 09:26:51 +09:00
Dean Herbert
e3071894f4 Merge branch 'master' into song-select-improvements 2017-03-24 09:21:26 +09:00
Dan Balasescu
b77448ae4e Merge pull request #544 from peppy/parallax-requires-position
ParallaxContainer should always know the mouse position.
2017-03-24 09:20:47 +09:00
Dean Herbert
d7426bdc32 Merge branch 'master' into taiko_drumroll_tick_judgements 2017-03-24 09:09:16 +09:00
Dean Herbert
f218066f83 Merge branch 'master' into parallax-requires-position 2017-03-23 22:52:06 +09:00
Dean Herbert
1c404cba5c Update framework. 2017-03-23 22:42:50 +09:00
Dean Herbert
0bcb463acf ParallaxContainer should always know the mouse position. 2017-03-23 22:42:40 +09:00
Dan Balasescu
c533650c26 Merge branch 'master' into song-select-improvements 2017-03-23 20:36:18 +09:00
Dean Herbert
c52ad6c6ee
Attempt to speed up CI by excluding some file types from analysis. 2017-03-23 20:34:24 +09:00
smoogipooo
c3adbb9b41 Fix nullref. 2017-03-23 20:34:11 +09:00