1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 20:47:25 +08:00
Commit Graph

2757 Commits

Author SHA1 Message Date
DrabWeb
29c54d4d8b Merge https://github.com/ppy/osu into song-progress-graph 2017-03-22 08:50:17 -03: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
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
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
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
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
Dean Herbert
034d818427 Update framework. 2017-03-19 17:22:47 +09:00
Dean Herbert
8cb334a118 Adjust sizing a touch. 2017-03-19 16:34:29 +09:00
Dean Herbert
af85bcaf1d Merge pull request #500 from smoogipooo/explicit_expires
Make DrawableHitObject expires explicit.
2017-03-19 12:47:43 +09:00
Dean Herbert
6c12da54f1 Merge pull request #499 from smoogipooo/legacy_beatmap_flag
Add legacy beatmap flag.
2017-03-19 12:39:41 +09:00
DrabWeb
5c645350f9 Formatting 2017-03-19 00:14:23 -03:00
DrabWeb
4719817b45 Merge https://github.com/ppy/osu into leaderboards 2017-03-19 00:10:08 -03:00
DrabWeb
b0e7296e25 -IHasDrawableRepresentation, User.Region -> Country 2017-03-19 00:09:58 -03:00
Dean Herbert
f237b5f1b8 Merge pull request #498 from smoogipooo/taiko_hitobject_base
Taiko hitobject base
2017-03-19 12:03:29 +09:00
Dean Herbert
73ffbf8142 Remove unnecessary using. 2017-03-19 11:52:16 +09:00
Dean Herbert
7337cb5f62 Merge branch 'master' into taiko_hitobject_base 2017-03-19 11:37:39 +09:00