1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 01:32:53 +08:00
Commit Graph

3205 Commits

Author SHA1 Message Date
smoogipooo
a272675705 Parse time signature from legacy beatmap control points. 2017-03-21 21:18:08 +09:00
smoogipooo
259ed03610 Reduce some container nesting. 2017-03-21 18:28:04 +09:00
smoogipooo
e2b510f3f0 Add comments. 2017-03-21 18:26:19 +09:00
smoogipooo
7cb237798a Add a 1px offset for the playfield border. 2017-03-21 18:13:10 +09:00
smoogipooo
aac4f24a2e 10% chance to get finisher hits in testcase. 2017-03-21 17:55:18 +09:00
smoogipooo
2cfab75bc7 Remove now unnecessary field. 2017-03-21 17:50:05 +09:00
smoogipooo
60e866aebd Increase RingExplosion base size for finishers.
Subtle but looks good imo (checked with flyte).
2017-03-21 17:49:22 +09:00
smoogipooo
eec4a1b5d3 Redesign HitTarget. 2017-03-21 17:48:19 +09:00
smoogipooo
66752af81f Late-add the HitObjects container in the Playfield.
Allows derivers to define the Content container in the constructor, to redirect the positioning of the HitObjects container.
2017-03-21 16:46:43 +09:00
Dan Balasescu
7bda1866fd Merge branch 'master' into taiko_judgement_scoring 2017-03-21 16:44:31 +09:00
smoogipooo
4e7a44cd44 Add license + general fixes. 2017-03-21 16:41:58 +09:00
smoogipooo
1ac9898a36 Add judgement texts. 2017-03-21 16:33:25 +09:00
smoogipooo
4c398b106d Add explosion rings. 2017-03-21 15:54:57 +09:00
smoogipooo
9b5cb7ec23 Merge branch 'taiko_judgement_scoring' into taiko_playfield_2 2017-03-21 15:33:59 +09:00
smoogipooo
10ed6ef10d Move TaikoPlayfield to separate file. 2017-03-21 15:09:54 +09:00
smoogipooo
27a21cd23d Add taiko playfield. 2017-03-21 14:58:34 +09:00
smoogipooo
58be4548ef Late-add the HitObjects container in the Playfield.
Allows derivers to define the Content container in the constructor, to redirect the positioning of the HitObjects container.
2017-03-21 14:53:55 +09:00
Dean Herbert
7cbc5b24c8 Merge pull request #506 from smoogipooo/textawesome_shadow
Make TextAwesome have a shadow.
2017-03-21 13:29:25 +09:00
Huo Yaoyuan
1d13924e0a Remove redundant type parameter.
Nested type has implicit type parameter from base type.
2017-03-21 01:05:48 +08:00
smoogipooo
a7eb219d39 Add basic support for drawing circles.
Conflicts:
	osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs
2017-03-20 19:30:54 +09:00
smoogipooo
8f90bcf7fd Merge branch 'taiko_note_circle' into taiko_drawable_drawing 2017-03-20 19:30:20 +09:00
smoogipooo
ed9c7c8008 Add license headers. 2017-03-20 18:25:12 +09:00
smoogipooo
34b734275b Add license headers. 2017-03-20 18:24:28 +09:00
smoogipooo
57c708619d Merge branch 'taiko_hitobject_drawable' into taiko_bash_drawable
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-20 18:21:05 +09:00
smoogipooo
b751cd4f29 Merge branch 'taiko_bash_base' into taiko_bash_drawable 2017-03-20 18:20:44 +09:00
smoogipooo
3f7cd41490 Merge branch 'master' into taiko_bash_drawable
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-20 18:20:32 +09:00
smoogipooo
75d09e7038 Fix unused usings. 2017-03-20 18:18:25 +09:00
smoogipooo
da1b911da9 Merge branch 'taiko_hitobject_drawable' into taiko_hit_drawables
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-20 18:18:17 +09:00
smoogipooo
5a28833c32 Merge branch 'master' into taiko_hit_drawables
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-20 18:17:18 +09:00
smoogipooo
aaa368e014 Merge branch 'taiko_hitobject_drawable' into taiko_drumroll_drawable
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-20 18:12:16 +09:00
smoogipooo
75fb7a3eb3 Suppress Resharper. 2017-03-20 18:10:09 +09:00
smoogipooo
a27dae0beb Merge branch 'master' into taiko_hitobject_drawable
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-20 18:09:05 +09:00
smoogipooo
409160859d Remove explicit namespacing. 2017-03-20 18:07:44 +09:00
smoogipooo
70be33bde0 Merge branch 'taiko_drumroll_base' into taiko_drumroll_drawable 2017-03-20 18:06:00 +09:00
smoogipooo
a3e406af6a Merge branch 'master' into taiko_drumroll_drawable
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-20 18:05:54 +09:00
smoogipooo
edd9a22177 License headers. 2017-03-20 17:02:06 +09:00
smoogipooo
f87f334dcd Merge branch 'master' into taiko_note_circle 2017-03-20 16:55:08 +09:00
smoogipooo
be1f28ad40 Move drum rolls to a new column in TestCaseTaikoHitObjects. 2017-03-20 16:53:31 +09:00
smoogipooo
730824fa58 Move pieces out of the visual test, fix up comments, rewrite FinisherPiece. 2017-03-20 16:50:22 +09:00
smoogipooo
051ef61d48 Make bashes not use textawesome. 2017-03-20 16:41:09 +09:00
smoogipooo
29f303b4d0 Add finisher notes. 2017-03-20 15:09:27 +09:00
smoogipooo
caf3ec1400 Fix colours. 2017-03-20 14:39:29 +09:00
smoogipooo
d27f37beb5 Hard-code text size in cases it wasn't set. 2017-03-20 13:48:06 +09:00
Dan Balasescu
417045c37c Merge branch 'master' into textawesome_shadow 2017-03-20 13:17:35 +09:00
Dean Herbert
df17f2c996 Merge pull request #510 from smoogipooo/remove_type_enums
Remove hit object types solution-wide.
2017-03-20 13:16:36 +09:00
smoogipooo
61172958bb Merge branch 'taiko_bash_base' into taiko_conversion 2017-03-20 13:12:40 +09:00
smoogipooo
962acca096 Merge branch 'taiko_drumroll_base' into taiko_conversion 2017-03-20 13:12:32 +09:00
smoogipooo
8435840fc7 Merge remote-tracking branch 'origin/master' into taiko_conversion 2017-03-20 13:12:09 +09:00
smoogipooo
090e8bbb79 Remove hit object types solution-wide. 2017-03-20 13:10:24 +09:00
smoogipooo
b9006e4026 Remove Type. 2017-03-20 13:04:09 +09:00