1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-29 05:42:55 +08:00
Commit Graph

3474 Commits

Author SHA1 Message Date
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
fcf9a599dd Implement taiko auto replays. 2017-03-24 14:24:10 +09:00
smoogipooo
730051520e Add a way to determine the type of a Hit. 2017-03-24 14:23:32 +09:00
smoogipooo
99b9623671 Implement taiko replays + key conversion. 2017-03-24 14:09:58 +09:00
smoogipooo
dcb9d2903b Add virtual method to instantiate legacy replays. 2017-03-24 14:03:46 +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
Dan Balasescu
8901d6137e Merge branch 'master' into song-select-improvements 2017-03-23 20:25:38 +09:00
smoogipooo
60dcf2d14d Make readonly. 2017-03-23 19:43:49 +09:00
smoogipooo
315deb6f12 Fix post-merge errors. 2017-03-23 19:43:00 +09:00
smoogipooo
217fd14595 Merge branch 'taiko_drumroll_tick_judgements' into taiko_drumroll_drawable 2017-03-23 19:40:14 +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
Dean Herbert
63d7c5a5a3
Pressing back while mod select is visible should close mod select before exiting. 2017-03-23 19:35:46 +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
Dan Balasescu
672fda79bd Merge pull request #543 from peppy/rename-judgement-info
JudgementInfo -> Judgement.
2017-03-23 19:34:43 +09:00
Dean Herbert
8c4fd44a85
Tidy up song select footer and fix depth of mod select vs osu! cookie. 2017-03-23 19:32:58 +09:00
smoogipooo
322a78830e Implement Taiko score processing. 2017-03-23 19:24:23 +09:00