e4926d54ab
Fix post-merge errors.
2017-03-22 01:48:51 +09:00
1bfc4d484d
Merge branch 'taiko_hitobject_drawable' into taiko_hit_drawables
...
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-22 01:47:25 +09:00
24e78d015e
Make UpdateScrollPosition virtual.
2017-03-22 01:46:06 +09:00
62dcd4fa59
Merge remote-tracking branch 'origin/master' into taiko_hitobject_drawable
...
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-22 01:45:02 +09:00
7d8c2c9a15
Merge pull request #521 from EVAST9919/fixes
...
Fixes
2017-03-22 00:30:57 +09:00
943bd737c4
Hide letterbox position sliders
2017-03-21 18:24:19 +03:00
4fa6db6cfa
Hide options when entering the game
2017-03-21 18:20:15 +03:00
0b2bb2ea0e
Fix typo in font name declaration.
2017-03-21 22:51:49 +09:00
993f68bc61
Merge pull request #514 from smoogipooo/taiko_judgement_scoring
...
Add TaikoJudgementInfo.
2017-03-21 22:39:34 +09:00
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
863f49c2bd
Rename MAX_SCORE -> MAX_HIT_RESULT.
2017-03-21 21:38:39 +09:00
d9524f692d
Renamings.
2017-03-21 21:36:05 +09:00
ad74797cd4
End letter oppression.
2017-03-21 21:31:31 +09:00
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
a272675705
Parse time signature from legacy beatmap control points.
2017-03-21 21:18:08 +09:00
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
7bda1866fd
Merge branch 'master' into taiko_judgement_scoring
2017-03-21 16:44:31 +09:00
7cbc5b24c8
Merge pull request #506 from smoogipooo/textawesome_shadow
...
Make TextAwesome have a shadow.
2017-03-21 13:29:25 +09:00
ed9c7c8008
Add license headers.
2017-03-20 18:25:12 +09:00
75d09e7038
Fix unused usings.
2017-03-20 18:18:25 +09:00
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
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
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
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
090e8bbb79
Remove hit object types solution-wide.
2017-03-20 13:10:24 +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
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
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
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
6f07930110
Move cursor hiding to OsuGameDesktop (fixes headless).
2017-03-18 21:46:58 +09:00
f636f59289
Nicer cursor orientation when dragging
2017-03-18 12:47:49 +01:00
9af0104e3e
Fix NaN when dragging music controller
...
When dragging music controller we divide by the dragged distance.
When dragging to the origin of the drag this resulted in NaN.
Now, we check for this and use 0 in this case.
2017-03-18 12:46:12 +01:00
3649b432a1
Update framework
2017-03-18 12:04:42 +01:00
