1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 18:47:25 +08:00
Commit Graph

2859 Commits

Author SHA1 Message Date
Dean Herbert
554b36c6eb Merge branch 'master' into taiko_conversion 2017-03-23 16:57:23 +09:00
Dean Herbert
43032ef694
Fix missing class renames. 2017-03-23 16:56:42 +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
Dan Balasescu
cb51256bd4 Merge pull request #517 from smoogipooo/taiko_playfield_2
Taiko Playfield Implementation
2017-03-23 15:43:59 +09:00
Dean Herbert
0863efb2c8
Remove unused variable. 2017-03-23 15:35:42 +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
b83db18551
HitExplosion -> DrawableOsuJudgementInfo. 2017-03-23 15:11:22 +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
Dean Herbert
9a3fd8bcf1
Add readonly attributes. 2017-03-23 14:37:00 +09:00
Dean Herbert
d441114011 Merge branch 'master' into taiko_playfield_2 2017-03-23 14:28:42 +09:00
Dean Herbert
acfa0c4762 Merge branch 'master' into taiko_base_hit 2017-03-23 14:26:35 +09:00
Dean Herbert
63948564c6 Merge branch 'master' into taiko_conversion 2017-03-23 14:26:24 +09:00
Dean Herbert
afb4019921 Merge pull request #540 from peppy/enforce_private_readonly
Enforce readonly private members where possible.
2017-03-23 14:17:52 +09:00
Dean Herbert
41dddcfc2f
Update framework. 2017-03-23 14:08:35 +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
8e1eef25b4 Fix some lone newlines. 2017-03-23 13:20:17 +09:00
smoogipooo
aa2b22ff12 Fix usings. 2017-03-23 13:02:34 +09:00
smoogipooo
cedcab1e26 s/Ring/Hit + privatize Judgement inside RingExplosion. 2017-03-23 13:02:01 +09:00
smoogipooo
00054f1573 Comment out unused container for now. 2017-03-23 12:56:32 +09:00
smoogipooo
7f33e10db0 Renaming + don't use List. 2017-03-23 12:53:38 +09:00
smoogipooo
39ff026b27 Reimplement JudgementText with the new DrawableJudgementInfo. 2017-03-23 12:49:58 +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
smoogipooo
b77b039d73 Don't instantiate TaikoHitObject. 2017-03-23 11:25:38 +09:00
smoogipooo
f3907ba831 Merge branch 'taiko_base_hit' into taiko_conversion 2017-03-23 11:24:59 +09:00
Dan Balasescu
9a7504a622 Merge branch 'master' into taiko_conversion 2017-03-23 11:24:30 +09:00
smoogipooo
db8bf8a78f Add Hit class, make TaikoHitObject abstract. 2017-03-23 11:21:45 +09:00
Dan Balasescu
2c580f43e9 Merge branch 'master' into taiko_playfield_2 2017-03-23 11:10:23 +09:00
Dean Herbert
5138890530 Merge pull request #502 from smoogipooo/taiko_bash_base
Taiko bash base
2017-03-23 11:06:16 +09:00
Dean Herbert
53c6665e07 Merge branch 'master' into taiko_bash_base 2017-03-23 10:57:15 +09:00
Dean Herbert
ae207253e6 Merge pull request #501 from smoogipooo/taiko_drumroll_base
Taiko drumroll base
2017-03-23 10:56:40 +09:00
Dean Herbert
bf94587ca7 Add TODO. 2017-03-23 10:56:30 +09:00
Dean Herbert
1d9da8facd Merge pull request #520 from smoogipooo/use_equilateral_triangles
Update framework + use EquilateralTriangle in Triangles.
2017-03-23 10:27:21 +09:00
Dean Herbert
7357a7b7cd Merge branch 'master' into taiko_bash_base 2017-03-23 10:26:57 +09:00
Dean Herbert
877ae52cff Merge branch 'master' into taiko_drumroll_base 2017-03-23 10:26:55 +09:00
Dean Herbert
f103fa3352 Merge pull request #527 from SirCmpwn/working-beatmap
Refactor WorkingBeatmap
2017-03-23 10:13:13 +09:00
Dean Herbert
859ee5d316
Tidy up DatabaseWorkingBeatmap. 2017-03-23 10:07:26 +09:00
Dean Herbert
9601e143d4
Merge branch 'master' into working-beatmap 2017-03-23 09:37:21 +09:00
Dean Herbert
e7f32fcbce Merge pull request #525 from huoyaoyuan/controls
DropDown update
2017-03-23 09:26:26 +09:00
smoogipooo
9c325ddd33 Cleanups + fix CircularContainer usages. 2017-03-23 09:12:51 +09:00
Dean Herbert
b0340f77d8
Remove nested types completely. 2017-03-23 08:57:14 +09:00
Dean Herbert
ff57d3800f Merge branch 'master' into use_equilateral_triangles 2017-03-23 08:51:43 +09:00
Dean Herbert
3dee39346f
U -> T1. 2017-03-23 08:49:29 +09:00
smoogipooo
790997db90 Merge remote-tracking branch 'origin/master' into taiko_playfield_2 2017-03-23 08:49:20 +09:00
Dan Balasescu
972c56c73b Merge pull request #532 from peppy/general-fixes
Fix menu cursor size not sticking on startup.
2017-03-23 08:48:22 +09:00