1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 01:33:21 +08:00
Commit Graph

17916 Commits

Author SHA1 Message Date
David Zhao
2ed945605e Fix Axes.None requirement for FacadeContainer 2019-04-03 19:57:22 +09:00
Dean Herbert
84da708d44 Fix nullref 2019-04-03 18:46:08 +09:00
Dean Herbert
cb417ebd77 Player -> User 2019-04-03 18:44:19 +09:00
Dean Herbert
a15a9bd03a Rewrite updateDisplay logic to not fail on some cases 2019-04-03 18:29:46 +09:00
Dean Herbert
5c3c08566f DrawableTopScore can be composite 2019-04-03 18:20:03 +09:00
Dean Herbert
5d37851d34 Rename and move test to correct location 2019-04-03 18:14:59 +09:00
smoogipoo
3b7d26cca8 Remove custom styled text 2019-04-03 17:49:01 +09:00
Dean Herbert
e88da95379
Merge branch 'master' into update-beatmap-scores-design 2019-04-03 17:02:17 +09:00
Dean Herbert
efd7bea771 Add further xmldoc 2019-04-03 17:01:11 +09:00
Dean Herbert
50f8ab3dfb Fix gameplay offset handling on seeks 2019-04-03 16:58:20 +09:00
smoogipoo
3da008d293 Add a bit of padding between the sections 2019-04-03 16:43:56 +09:00
smoogipoo
f8596e055a Separate into multiple files 2019-04-03 16:38:54 +09:00
smoogipoo
42c915190a Reorder DrawableTopScore 2019-04-03 16:12:24 +09:00
smoogipoo
e246fad301 Clear table if no scores are provided 2019-04-03 16:09:34 +09:00
smoogipoo
2c18b6df1c Fix score table using 300/100/50 2019-04-03 16:09:19 +09:00
Dan Balasescu
b0d6456523
Merge pull request #4582 from peppy/dont-ignore-nvika-return-code
Correctly handle nvika/inspectcode return codes
2019-04-03 16:07:05 +09:00
smoogipoo
d6b15f040a Improve statistics display 2019-04-03 15:57:36 +09:00
smoogipoo
0cf27e244d Fix usages of SpriteText and obsolete members 2019-04-03 15:44:14 +09:00
Dean Herbert
542a46b0a7 Update r# version 2019-04-03 15:43:48 +09:00
Dean Herbert
f8d53a1e30 Fix variable mismatch 2019-04-03 15:43:36 +09:00
smoogipoo
dff58ab4ed Initial cleanup pass of DrawableTopScore 2019-04-03 15:41:33 +09:00
smoogipoo
7f425059ae Adjust transforms 2019-04-03 15:41:22 +09:00
Dean Herbert
1dad152363 Correctly handle nvika/inspectcode return codes 2019-04-03 15:37:22 +09:00
smoogipoo
ab4be3b75f General refactoring 2019-04-03 15:20:38 +09:00
smoogipoo
0d127c21f1 Merge remote-tracking branch 'Aergwyn/master' into update-beatmap-scores-design 2019-04-03 14:52:13 +09:00
Samuel Van Allen
e9269dc83b Prevent unnecessary query in OsuGame::PresentBeatmap
This resolves issue #4575
2019-04-02 23:57:31 +08:00
Dan Balasescu
caa2bdf012
Merge pull request #4578 from peppy/update-framework
Update framework
2019-04-02 21:37:29 +09:00
Dean Herbert
072954e4c0 Update framework 2019-04-02 21:00:05 +09:00
Dean Herbert
bcd51afea1 Fix osu! icon font name mismatch 2019-04-02 19:55:46 +09:00
Dean Herbert
bc1077ed73 Remove remaining FontAwesome reference 2019-04-02 19:55:34 +09:00
Dean Herbert
f1952c0816 Update font awesome usage 2019-04-02 19:55:24 +09:00
Dan Balasescu
b59e86f12e
Merge pull request #4529 from peppy/resume-cursor-2
Add osu! click-to-resume support
2019-04-02 13:07:12 +09:00
David Zhao
020be50f03 Merge remote-tracking branch 'upstream/master' into facade-container 2019-04-02 11:28:44 +09:00
Dean Herbert
184403c7e1
Merge branch 'master' into resume-cursor-2 2019-04-01 14:24:00 +09:00
Dean Herbert
14548e8a2d
Merge pull request #4566 from LeNitrous/colourable-menu-elements
Make main menu elements colorable by skin

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-04-01 14:23:23 +09:00
Dean Herbert
14b606f761
Merge branch 'master' into colourable-menu-elements 2019-04-01 14:16:36 +09:00
Dean Herbert
c4157504d5
Merge pull request #4571 from peppy/less-inspection-fixes
Try applying minimal inspection fixes for latest Rider EAP
2019-04-01 13:35:53 +09:00
Dean Herbert
b09973aaea
Merge branch 'master' into colourable-menu-elements 2019-04-01 13:30:20 +09:00
Dean Herbert
2060bad3bc Try applying minimal inspection fixes for latest Rider EAP 2019-04-01 13:28:14 +09:00
Dean Herbert
2b3c70b2d2 Refactor with constants and better method names 2019-04-01 13:13:56 +09:00
Dean Herbert
afd01b12f5
Merge pull request #4569 from smoogipoo/fix-replay-parse-culture
Fix replays being parsed with incorrect cultures
2019-04-01 11:40:53 +09:00
Dean Herbert
e33974a57b
Merge branch 'master' into fix-replay-parse-culture 2019-04-01 11:32:50 +09:00
smoogipoo
fb0bba9b37 Use Parsing helpers 2019-04-01 11:23:07 +09:00
Dean Herbert
79b5c2482b
Merge pull request #4562 from peppy/fix-editor-blueprints
Fix editor blueprints being misplaced
2019-04-01 11:17:17 +09:00
Dean Herbert
693ac140d4
Merge pull request #4563 from peppy/fix-frame-handler-nullrefs
Fix replay handler nullref crashes

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-04-01 11:17:07 +09:00
Dan Balasescu
6d1f24e5e6
Merge branch 'master' into fix-frame-handler-nullrefs 2019-04-01 10:59:10 +09:00
Dean Herbert
6896ec7731 Remove unnecessary method 2019-04-01 10:39:55 +09:00
Dean Herbert
d1a175675d Use variable 2019-04-01 10:37:02 +09:00
smoogipoo
f453675838 Fix replays being parsed with incorrect cultures 2019-04-01 10:31:20 +09:00
Dan Balasescu
e360a3362b
Merge pull request #4567 from LeNitrous/stable-gameplay-cursor-size
Mimic stable minimum cursor size
2019-04-01 09:58:01 +09:00