Dan Balasescu
|
02dc6fb213
|
Merge branch 'master' into taiko_hitobject_drawable
|
2017-03-23 08:50:57 +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 |
|
Dean Herbert
|
537f0b9340
|
Fix menu cursor size not sticking on startup.
Also tidied up bindables.
|
2017-03-23 08:07:59 +09:00 |
|
Dean Herbert
|
7b06f31ddf
|
Merge pull request #530 from EVAST9919/checkboxes_fix
Fix checkbox dependency in LoginOptions
|
2017-03-22 23:54:37 +09:00 |
|
Andrey Zavadskiy
|
2d75c60463
|
Fix checkbox dependency in LoginOptions
|
2017-03-22 17:21:24 +03:00 |
|
Dean Herbert
|
09b59b5003
|
Merge pull request #529 from EVAST9919/spinner_fix
Spinner fix
|
2017-03-22 22:18:42 +09:00 |
|
Andrey Zavadskiy
|
086191a12a
|
Spinner fix
|
2017-03-22 16:13:39 +03:00 |
|
Dan Balasescu
|
e5602c0938
|
Merge pull request #526 from peppy/general-fixes
Fix usages of CircularContainer in line with framework changes.
|
2017-03-22 21:48:16 +09:00 |
|
Dean Herbert
|
1c83442b0b
|
Update framework.
|
2017-03-22 21:36:03 +09:00 |
|
Dean Herbert
|
fbe08436d2
|
Fix usages of CircularContainer in line with framework changes.
|
2017-03-22 19:35:03 +09:00 |
|
Dean Herbert
|
7fba0c4bce
|
Update framework.
|
2017-03-22 15:44:23 +09:00 |
|
Dan Balasescu
|
b349c7d7fd
|
Merge pull request #524 from peppy/update-state-safety
Make DrawableHitObject's UpdateState safer
|
2017-03-22 15:38:26 +09:00 |
|
smoogipooo
|
aa8780797e
|
Abstract class + move AccentColour to base.
|
2017-03-22 15:22:02 +09:00 |
|
Dean Herbert
|
4f3ab879de
|
Make DrawableHitObject's UpdateState safer by blocking calls at a higher level with not yet loaded.
UpdateState is called in LoadComplete for cases where the state may have changed before a load operation.
|
2017-03-22 09:43:44 +09:00 |
|
Dean Herbert
|
83d3e37fd4
|
Merge pull request #523 from adrian17/fix_slider_test
Fix auto-sliders in TestCaseHitObject
|
2017-03-22 09:37:47 +09:00 |
|
Dean Herbert
|
1f5c7d5be1
|
Merge pull request #483 from DrabWeb/leaderboards
Leaderboards
|
2017-03-22 09:28:03 +09:00 |
|
Dean Herbert
|
bee7b43a37
|
Make avatar fallback work on failed load.
|
2017-03-22 09:20:37 +09:00 |
|
Dean Herbert
|
f3486b7288
|
Add correct lifetime expiry for leaderboard content
|
2017-03-22 09:07:02 +09:00 |
|
Dean Herbert
|
7387dbd9fc
|
Tidy up LeaderboardScore
|
2017-03-22 09:04:33 +09:00 |
|
Dean Herbert
|
1699daaf7f
|
Make DrawableRank safer.
|
2017-03-22 08:32:28 +09:00 |
|
Dean Herbert
|
8983bbcaad
|
Merge branch 'master' into leaderboards
|
2017-03-22 08:24:49 +09:00 |
|
Dean Herbert
|
91f088e67e
|
Merge pull request #507 from Jorolf/seperateCursorSize
Separated menu and gameplay cursor size
|
2017-03-22 08:19:12 +09:00 |
|
Dean Herbert
|
b00f86d809
|
Merge branch 'master' into seperateCursorSize
|
2017-03-22 08:11:45 +09:00 |
|
Adrian Wielgosik
|
3270fdcfde
|
Fix auto-sliders in TestCaseHitObject
|
2017-03-21 22:48:33 +01:00 |
|
smoogipooo
|
24e78d015e
|
Make UpdateScrollPosition virtual.
|
2017-03-22 01:46:06 +09:00 |
|
smoogipooo
|
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 |
|
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
|
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 |
|
Dean Herbert
|
7cbc5b24c8
|
Merge pull request #506 from smoogipooo/textawesome_shadow
Make TextAwesome have a shadow.
|
2017-03-21 13:29:25 +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
|
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 |
|
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 |
|