1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-24 06:07:25 +08:00
Commit Graph

3141 Commits

Author SHA1 Message Date
Jorolf
15326204d5 Merge branch 'master' of git://github.com/ppy/osu into details 2017-03-30 16:38:25 +02:00
Dean Herbert
d3f285e455 Merge pull request #575 from smoogipooo/better-transformation-helpers
Fix custom transform.
2017-03-30 22:47:03 +09:00
smoogipooo
76d0beb64f
Fix custom transform. 2017-03-30 22:28:51 +09:00
Dean Herbert
ddc6d45985 Merge pull request #572 from smoogipooo/general-fixes
Fix missing base call that may result in invalid ScoreProcessor state.
2017-03-30 14:07:50 +09:00
Dan Balasescu
1004546327 Merge pull request #573 from peppy/song-select-fixes
Song select filter fixes
2017-03-30 09:43:49 +09:00
Jorolf
a3430dd072 add culture info 2017-03-29 16:10:07 +02:00
Jorolf
cdb3150c56 add readonlies and remove unused using directives 2017-03-29 16:00:29 +02:00
Jorolf
866f72e653 fix something the merge broke 2017-03-29 15:51:54 +02:00
Jorolf
6982529481 Merge branch 'master' of git://github.com/ppy/osu into details 2017-03-29 15:47:00 +02:00
Jorolf
2f15653d46 removed duplicate code 2017-03-29 15:37:51 +02:00
Jorolf
ab4d1c7725 better maxValue calculation for the retry and fail graph 2017-03-29 15:33:36 +02:00
Jorolf
7bd13d76a8 fixes + updates to DetailsBar and a button for the TestCaseDetails 2017-03-29 14:48:43 +02:00
Dean Herbert
6afa6f30cc
Keep selected beatmap in centre of screen post-filter. 2017-03-29 20:01:46 +09:00
Dean Herbert
a6c8be3637
Increase load delay on panel backgrounds; add back missing fade. 2017-03-29 19:52:16 +09:00
Dean Herbert
fa7fd6efe3
Fix mode selector not invoking a re-filter. 2017-03-29 19:48:13 +09:00
smoogipooo
bae0ac4901 Fix missing base call that may result in invalid ScoreProcessor state. 2017-03-29 18:21:45 +09:00
Dean Herbert
e8efdcfe0f Merge pull request #561 from smoogipooo/taiko_hit_drawing
Taiko hit drawing
2017-03-29 16:08:23 +09:00
smoogipooo
7ba7bc18f8 Don't use a List for HitKeys. 2017-03-29 15:35:22 +09:00
Dan Balasescu
7ee7954f62 Merge branch 'master' into taiko_hit_drawing 2017-03-29 15:22:32 +09:00
smoogipooo
74e12bd95e Rewrite how drawable-specific circle pieces are instantiated. 2017-03-29 14:01:01 +09:00
Dean Herbert
d64f00cae2 Merge pull request #563 from smoogipooo/general_taiko_fixes
General taiko fixes
2017-03-29 13:33:40 +09:00
smoogipooo
1c503edad1 Add explicit delay + expire (this will be moved into the base DrawableHitObject later). 2017-03-29 13:19:48 +09:00
smoogipooo
1a56c48ddb Don't need CentreLeft anchors. 2017-03-29 13:07:43 +09:00
Dan Balasescu
cd799823f0 Merge pull request #569 from peppy/general-fixes
General fixes
2017-03-29 12:44:49 +09:00
Dean Herbert
9877a57ba1
Update framework. 2017-03-29 12:38:29 +09:00
Dean Herbert
b96a153e0e
Resize ranks better. 2017-03-29 12:24:04 +09:00
Dean Herbert
d9a4a8d0d4
VisualTests should run at full speed. 2017-03-29 12:23:53 +09:00
Dean Herbert
42f4d67de2
Update framework. 2017-03-29 10:43:29 +09:00
Dan Balasescu
604d487366 Merge pull request #565 from peppy/dynamic-recompile
Dynamically recompile VisualTests
2017-03-29 10:20:33 +09:00
smoogipooo
8f01bd75a1 Update framework. 2017-03-29 10:16:35 +09:00
Dan Balasescu
d7674e2367 Merge branch 'master' into dynamic-recompile 2017-03-29 10:12:48 +09:00
Dean Herbert
ab97967237
Update references and framework. 2017-03-29 09:54:00 +09:00
smoogipooo
e518508f2d Better life time ends. 2017-03-29 09:11:07 +09:00
smoogipooo
bbc6a4234a Fix post-merge errors. 2017-03-29 09:08:26 +09:00
smoogipooo
c478c74227 Merge remote-tracking branch 'origin/master' into taiko_hit_drawing 2017-03-29 09:03:19 +09:00
Dan Balasescu
5e734a9271 Merge pull request #566 from peppy/move-easingtypes
Move EasingTypes up one namespace level.
2017-03-29 08:24:38 +09:00
smoogipooo
6856e17364 Update framework. 2017-03-29 08:17:54 +09:00
Dan Balasescu
bca18ce209 Merge branch 'master' into move-easingtypes 2017-03-29 08:14:13 +09:00
Dan Balasescu
2bb8e3bae8 Merge pull request #558 from peppy/avatars-and-login
Avatar refactoring & better focus handling in login form.
2017-03-29 08:12:05 +09:00
Dan Balasescu
e53a5a3521 Merge branch 'master' into avatars-and-login 2017-03-29 07:52:43 +09:00
Jorolf
199c70ff95 Added fails and retries 2017-03-28 20:18:56 +02:00
Jorolf
305bc9cff6 Merge branch 'master' of git://github.com/ppy/osu into details 2017-03-28 17:14:35 +02:00
Jorolf
909fdb647c Added ratings and different bar rotations 2017-03-28 17:12:54 +02:00
Dean Herbert
f7dc7e9bb9
Update references. 2017-03-28 21:26:20 +09:00
Dean Herbert
24a105704a
Update framework. 2017-03-28 20:39:08 +09:00
Dan Balasescu
0a1b9fe398 Merge branch 'master' into taiko_hit_drawing 2017-03-28 17:25:07 +09:00
Dan Balasescu
0d0096aced Merge branch 'master' into general_taiko_fixes 2017-03-28 17:21:50 +09:00
smoogipooo
efa7e5cb7d Adjust radius. 2017-03-28 17:14:06 +09:00
smoogipooo
adf2550811 Base playfield height + hit target offset on hit object height. 2017-03-28 17:13:05 +09:00
Dean Herbert
4bdf9e09ca Merge pull request #560 from smoogipooo/general_taiko_fixes
General taiko fixes
2017-03-28 16:12:19 +09:00