1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 03:57:25 +08:00
Commit Graph

3104 Commits

Author SHA1 Message Date
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
Huo Yaoyuan
e217c67bcf Merge branch 'master' into controls 2017-03-22 08:54:03 +08: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
de5779ae8e Merge branch 'master' into taiko_drumroll_base 2017-03-22 09:38:14 +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
Huo Yaoyuan
b06eb0122c Fix for colours and members rename. 2017-03-22 08:15:31 +08: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
Huo Yaoyuan
b46ded7794 Use Bindable for DropDown. 2017-03-22 07:49:21 +08: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
Huo Yaoyuan
f0edf5d3d3 Update to DropDown and Menu. 2017-03-22 07:18:53 +08: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
a72ae319a1 Override UpdateScrollPosition instead of Update. 2017-03-22 01:55:41 +09:00
smoogipooo
1532ae78a4 Fix post-merge errors. 2017-03-22 01:55:31 +09:00
smoogipooo
7cf935cef2 Merge branch 'taiko_hitobject_drawable' into taiko_bash_drawable
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-22 01:53:44 +09:00
smoogipooo
a75a2e1794 Fix more post-merge errors. 2017-03-22 01:52:55 +09:00
smoogipooo
90c441f614 Override UpdateScrollPosition instead of Update. 2017-03-22 01:51:53 +09:00
smoogipooo
b3e8a2257c Fix post-merge errors. 2017-03-22 01:51:44 +09:00
smoogipooo
b9f1b44ca4 Merge branch 'taiko_hitobject_drawable' into taiko_drumroll_drawable
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-22 01:49:45 +09:00
smoogipooo
e4926d54ab Fix post-merge errors. 2017-03-22 01:48:51 +09:00
smoogipooo
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
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
smoogipooo
8f6cee2544 Override is unnecessary. 2017-03-22 01:43:20 +09:00
smoogipooo
e7a93073a4 Fix post-merge errors. 2017-03-22 01:42:40 +09:00
smoogipooo
b769c43660 Update framework. 2017-03-22 01:39:39 +09:00
smoogipooo
afcd42b06d Merge remote-tracking branch 'origin/master' into taiko_playfield_2 2017-03-22 01:38:53 +09:00
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