Commit Graph

51894 Commits

Author SHA1 Message Date
75fb7a3eb3 Suppress Resharper. 2017-03-20 18:10:09 +09:00
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
409160859d Remove explicit namespacing. 2017-03-20 18:07:44 +09:00
70be33bde0 Merge branch 'taiko_drumroll_base' into taiko_drumroll_drawable 2017-03-20 18:06:00 +09:00
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
edd9a22177 License headers. 2017-03-20 17:02:06 +09:00
f87f334dcd Merge branch 'master' into taiko_note_circle 2017-03-20 16:55:08 +09:00
be1f28ad40 Move drum rolls to a new column in TestCaseTaikoHitObjects. 2017-03-20 16:53:31 +09:00
730824fa58 Move pieces out of the visual test, fix up comments, rewrite FinisherPiece. 2017-03-20 16:50:22 +09:00
051ef61d48 Make bashes not use textawesome. 2017-03-20 16:41:09 +09:00
29f303b4d0 Add finisher notes. 2017-03-20 15:09:27 +09:00
caf3ec1400 Fix colours. 2017-03-20 14:39:29 +09:00
d27f37beb5 Hard-code text size in cases it wasn't set. 2017-03-20 13:48:06 +09:00
417045c37c Merge branch 'master' into textawesome_shadow 2017-03-20 13:17:35 +09:00
df17f2c996 Merge pull request #510 from smoogipooo/remove_type_enums
Remove hit object types solution-wide.
2017-03-20 13:16:36 +09:00
61172958bb Merge branch 'taiko_bash_base' into taiko_conversion 2017-03-20 13:12:40 +09:00
962acca096 Merge branch 'taiko_drumroll_base' into taiko_conversion 2017-03-20 13:12:32 +09:00
8435840fc7 Merge remote-tracking branch 'origin/master' into taiko_conversion 2017-03-20 13:12:09 +09:00
090e8bbb79 Remove hit object types solution-wide. 2017-03-20 13:10:24 +09:00
b9006e4026 Remove Type. 2017-03-20 13:04:09 +09:00
c3d10f8abf Merge remote-tracking branch 'origin/master' into taiko_bash_base 2017-03-20 13:03:25 +09:00
b3b8fadf03 Remove Type. 2017-03-20 13:02:52 +09:00
7b7255863c Merge remote-tracking branch 'origin/master' into taiko_drumroll_base 2017-03-20 13:01:43 +09:00
09bf014ded Simplify fade out gradient code. 2017-03-19 21:49:29 +09:00
f785af1222 Update framework. 2017-03-19 20:12:37 +09:00
5d0adc6454 Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards 2017-03-19 18:51:53 +09:00
256a3268ac Inline single usage of EdgeEffect. 2017-03-19 18:51:40 +09:00
139dd456fb Merge pull request #509 from peppy/fix-beatmap-options
Fix beatmap options overlay inconsistencies
2017-03-19 09:37:59 +01:00
44f71b3975 Merge branch 'master' into fix-beatmap-options 2017-03-19 09:34:53 +01:00
36414e964a Merge pull request #508 from Tom94/hide-cursor
Hide cursor
2017-03-19 09:28:55 +01:00
66cdc76621 Merge branch 'master' into hide-cursor 2017-03-19 09:23:30 +01:00
034d818427 Update framework. 2017-03-19 17:22:47 +09:00
8cb334a118 Adjust sizing a touch. 2017-03-19 16:34:29 +09:00
af85bcaf1d Merge pull request #500 from smoogipooo/explicit_expires
Make DrawableHitObject expires explicit.
2017-03-19 12:47:43 +09:00
6c12da54f1 Merge pull request #499 from smoogipooo/legacy_beatmap_flag
Add legacy beatmap flag.
2017-03-19 12:39:41 +09:00
5c645350f9 Formatting 2017-03-19 00:14:23 -03:00
4719817b45 Merge https://github.com/ppy/osu into leaderboards 2017-03-19 00:10:08 -03:00
b0e7296e25 -IHasDrawableRepresentation, User.Region -> Country 2017-03-19 00:09:58 -03:00
f237b5f1b8 Merge pull request #498 from smoogipooo/taiko_hitobject_base
Taiko hitobject base
2017-03-19 12:03:29 +09:00
73ffbf8142 Remove unnecessary using. 2017-03-19 11:52:16 +09:00
7337cb5f62 Merge branch 'master' into taiko_hitobject_base 2017-03-19 11:37:39 +09:00
af82a49127 Fix test case not containing any buttons. 2017-03-19 02:33:28 +09:00
3d8ec4fa05 FIx transition not always being correct. 2017-03-19 02:33:25 +09:00
f56b84a1ca Fix mouse cursor in VisualTestGame. 2017-03-19 02:32:21 +09:00
3c7b4a8ffa Fix cursor being displayed during disclaimer. 2017-03-19 01:59:13 +09:00
80de15d935 fixed typo 2017-03-18 15:22:03 +01:00
8f75032b64 Fix incorrect abs. 2017-03-18 22:37:50 +09:00
125936bad0 Fix double-assignment. 2017-03-18 22:23:53 +09:00
87622f9349 Update framework. 2017-03-18 22:21:51 +09:00
919ec2d3a5 Spend more when wound up. 2017-03-18 22:17:23 +09:00