1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 00:45:43 +08:00
Commit Graph

2855 Commits

Author SHA1 Message Date
smoogipooo
b3dde2c399 A bit more protection. 2017-03-22 01:35:39 +09:00
smoogipooo
cf251618c7 Merge remote-tracking branch 'origin/master' into taiko_bash_base
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-22 01:34:47 +09:00
smoogipooo
712d2e194c A bit more protection. 2017-03-22 01:33:22 +09:00
smoogipooo
a346191ca7 Merge remote-tracking branch 'origin/master' into taiko_drumroll_base
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-22 01:27:07 +09:00
Jorolf
82d6129063 renamed CursorSize to MenuCursorSize 2017-03-21 17:16:23 +01:00
Dean Herbert
7d8c2c9a15 Merge pull request #521 from EVAST9919/fixes
Fixes
2017-03-22 00:30:57 +09:00
Andrey Zavadskiy
943bd737c4 Hide letterbox position sliders 2017-03-21 18:24:19 +03:00
Andrey Zavadskiy
4fa6db6cfa Hide options when entering the game 2017-03-21 18:20:15 +03:00
Dean Herbert
0b2bb2ea0e Fix typo in font name declaration. 2017-03-21 22:51:49 +09:00
Dean Herbert
993f68bc61 Merge pull request #514 from smoogipooo/taiko_judgement_scoring
Add TaikoJudgementInfo.
2017-03-21 22:39:34 +09:00
Dean Herbert
d5af15579c Merge pull request #519 from smoogipooo/parse_timesignature
Parse time signature from legacy beatmap control points.
2017-03-21 22:24:29 +09:00
smoogipooo
863f49c2bd Rename MAX_SCORE -> MAX_HIT_RESULT. 2017-03-21 21:38:39 +09:00
smoogipooo
d9524f692d Renamings. 2017-03-21 21:36:05 +09:00
smoogipooo
ad74797cd4 End letter oppression. 2017-03-21 21:31:31 +09:00
Dean Herbert
12fc8b8553 Merge pull request #518 from smoogipooo/late_add_hitobjects_container
Late-add the HitObjects container in the Playfield.
2017-03-21 21:19:47 +09:00
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
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
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
smoogipooo
c3d10f8abf Merge remote-tracking branch 'origin/master' into taiko_bash_base 2017-03-20 13:03:25 +09:00
smoogipooo
b3b8fadf03 Remove Type. 2017-03-20 13:02:52 +09:00
smoogipooo
7b7255863c Merge remote-tracking branch 'origin/master' into taiko_drumroll_base 2017-03-20 13:01:43 +09:00
Dean Herbert
09bf014ded Simplify fade out gradient code. 2017-03-19 21:49:29 +09:00
Dean Herbert
f785af1222 Update framework. 2017-03-19 20:12:37 +09:00
Dean Herbert
5d0adc6454 Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards 2017-03-19 18:51:53 +09:00
Dean Herbert
256a3268ac Inline single usage of EdgeEffect. 2017-03-19 18:51:40 +09:00
Thomas Müller
139dd456fb Merge pull request #509 from peppy/fix-beatmap-options
Fix beatmap options overlay inconsistencies
2017-03-19 09:37:59 +01:00
Thomas Müller
44f71b3975 Merge branch 'master' into fix-beatmap-options 2017-03-19 09:34:53 +01:00
Thomas Müller
36414e964a Merge pull request #508 from Tom94/hide-cursor
Hide cursor
2017-03-19 09:28:55 +01:00
Thomas Müller
66cdc76621 Merge branch 'master' into hide-cursor 2017-03-19 09:23:30 +01:00