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

3490 Commits

Author SHA1 Message Date
Jorolf
bcef1ce2b6 replace space in text with Spacing in FillFlowContainer 2017-04-08 13:59:22 +02:00
Jorolf
f7a9a11ae5 Bar uses AccentColour aswell 2017-04-08 13:53:11 +02:00
Jorolf
5e56e84c4a change SRGBColour to Color4 and use IHasAccentColour in some places 2017-04-08 13:31:55 +02:00
Jorolf
841d101be7 renaming 2017-04-07 20:41:03 +02:00
Jorolf
c60a55285c updated TestCase and some null checks 2017-04-07 20:32:09 +02:00
Jorolf
6a87fd6112 retries and fails hide if they're not present 2017-04-07 20:19:03 +02:00
Jorolf
899e559b5c ratings hide now + remove unnessary stuff 2017-04-07 19:58:49 +02:00
Jorolf
65d9f4fc45 hide MetadataSegments without content and remove fail/retry initialisations 2017-04-07 19:27:14 +02:00
Jorolf
9881889f88 removed some unused stuff 2017-04-07 18:24:36 +02:00
Jorolf
187a0e3613 Merge branch 'details' of github.com:Jorolf/osu into details 2017-04-07 18:14:14 +02:00
Jorolf
eb4b3772e9 put Bar into its own file and let it only add a background if BackgroundColour is changed 2017-04-07 18:13:55 +02:00
Dan Balasescu
579c351cfd Merge branch 'master' into details 2017-04-07 12:54:01 +09:00
Dan Balasescu
a56643aa61 Merge pull request #602 from peppy/general-fixes
Don't recommend property code style changes for now.
2017-04-07 12:07:20 +09:00
Dan Balasescu
c67f23a81d Fix unneeded key. 2017-04-07 12:02:30 +09:00
Dean Herbert
6d001d8517
Don't recommend property code style changes for now. 2017-04-07 09:41:10 +09:00
Dan Balasescu
9c6d08405a Merge pull request #601 from peppy/general-fixes
General fixes
2017-04-07 09:38:55 +09:00
Dean Herbert
fba72b9a9e
Snaking out on by default. 2017-04-07 09:28:13 +09:00
Jorolf
e59c0a770f Merge branch 'master' into details 2017-04-06 15:42:00 +02:00
Jorolf
28193cbaaa hide BeatmapDetails on entering the Select screen 2017-04-06 15:39:23 +02:00
Dean Herbert
4a29263cd6 Merge pull request #599 from EVAST9919/testcase_fix
Fix Pause/Fail testcase
2017-04-06 18:43:21 +09:00
Andrey Zavadskiy
b380cbfd7a Merge remote-tracking branch 'refs/remotes/ppy/master' into testcase_fix 2017-04-06 12:28:44 +03:00
Andrey Zavadskiy
c6f4cff2e7 Fix Pause/Fail testcase 2017-04-06 12:27:45 +03:00
Dean Herbert
7b7c0733d1 Merge pull request #598 from huoyaoyuan/code-sanity-update
Update CodeFileSanity.
2017-04-06 18:22:47 +09:00
Huo Yaoyuan
ff469ee5f6 Update resources for CodeFileSanity. 2017-04-06 16:56:27 +08:00
Huo Yaoyuan
411988f038 Remove all trailing whitespaces in this repo. 2017-04-06 16:21:18 +08:00
Huo Yaoyuan
9b1e010dcc Fix filename mismatch. 2017-04-06 16:05:41 +08:00
Huo Yaoyuan
f8f75430e4 Merge branch 'master' into code-sanity-update 2017-04-06 15:55:14 +08:00
Dean Herbert
96f814db6c Merge pull request #595 from smoogipooo/taiko-fixes
Taiko fixes
2017-04-06 16:32:03 +09:00
smoogipooo
0107772737 Fix using. 2017-04-06 16:25:46 +09:00
Dan Balasescu
6fc1384927 Merge branch 'master' into taiko-fixes 2017-04-06 16:23:22 +09:00
smoogipooo
9260d1c24d Fix incorrect scroll time calculation. 2017-04-06 16:21:18 +09:00
smoogipooo
bc216f6470 Legacy multiplier only needs to be applied to SliderMultiplier. 2017-04-06 16:20:57 +09:00
Dean Herbert
85dfd8297b Merge pull request #594 from smoogipooo/better-hitsounds
Better hitsounds
2017-04-06 16:12:40 +09:00
Dean Herbert
1942ef9e8f
Fix merge fail. 2017-04-06 16:06:02 +09:00
Dean Herbert
4783d17d94 Merge branch 'master' into better-hitsounds 2017-04-06 16:00:56 +09:00
smoogipooo
cec8bca78a Implement IJsonSerializable, BeatmapInfo IJsonSerializable. 2017-04-06 15:54:50 +09:00
Dean Herbert
0a8d63ead8 Merge pull request #562 from EVAST9919/pause_buttons_refactor
PauseOverlay/FailOverlay refactor
2017-04-06 15:47:57 +09:00
Dean Herbert
942699218a Merge branch 'master' into details 2017-04-06 15:44:43 +09:00
Dean Herbert
7c63c8394b
Remove unnecessary depth setting. 2017-04-06 15:36:03 +09:00
Dean Herbert
a18367454d
InGameOverlay -> MenuOverlay. 2017-04-06 15:34:52 +09:00
Dean Herbert
856696b17e
Fix incorrect verbatim strings. 2017-04-06 15:31:21 +09:00
Dean Herbert
6285f3eea8 Merge branch 'master' into pause_buttons_refactor 2017-04-06 15:00:48 +09:00
smoogipooo
37129bf03d Make combo be changed by the base ScoreProcessor. 2017-04-06 14:37:21 +09:00
Dean Herbert
bb65d2e3d3 Merge pull request #580 from EVAST9919/hud_visibility
HudOverlay visibility
2017-04-06 14:27:50 +09:00
Dean Herbert
2bb99eac72 fix typo 2017-04-06 14:27:23 +09:00
Dean Herbert
5fa0d9f6f1
Update CodeFileSanity. 2017-04-06 13:58:32 +09:00
smoogipooo
98630dd06c Fix combo calculations. 2017-04-06 13:46:26 +09:00
smoogipooo
d87a65f19e Fix accuracy calculations. 2017-04-06 13:44:43 +09:00
Dean Herbert
efe82ef88c Merge branch 'master' into hud_visibility 2017-04-06 13:40:10 +09:00
Dan Balasescu
0acf5b45b1 Merge pull request #591 from peppy/taiko-wtf
taiko improvements
2017-04-06 13:23:25 +09:00