1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-28 13:32:56 +08:00
Commit Graph

17943 Commits

Author SHA1 Message Date
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
LeNitrous
8088e27fa8 Mimic stable minimum cursor size 2019-03-31 21:10:35 +08:00
LeNitrous
698e38c4e0 make menu flashes and visualisation colourable by skin 2019-03-31 20:10:44 +08:00
Nathan Alo
1d4c9436eb
Merge pull request #3 from ppy/master 2019-03-31 19:29:22 +08:00
Dean Herbert
7ae3b31b10
Merge pull request #4564 from Joehuu/direct-favourites-sort
Add ability to sort by favourites on osu!direct
2019-03-31 13:11:28 +09:00
Dean Herbert
7034f24c45
Merge branch 'master' into direct-favourites-sort 2019-03-31 12:54:54 +09:00
Dan Balasescu
ae7cc64571
Merge pull request #4561 from peppy/fix-stable-import
Fix stable import failing
2019-03-31 12:04:31 +09:00
Joehu
92673c6d1e Add ability to sort by favourites on osu!direct 2019-03-30 19:24:16 -07:00
Dean Herbert
73de146fb4 Update test null check to match 2019-03-31 01:42:38 +09:00
Dean Herbert
d53e6f7e0e Remove unused references 2019-03-31 01:34:50 +09:00
Dean Herbert
5d91c3bcfc Fix replay handler nullref crashes 2019-03-31 01:33:56 +09:00
Dean Herbert
42eaabe24c Fix editor blueprints being misplaced
Regressed with PlayfieldAdjustmentContainer changes.
2019-03-31 01:29:37 +09:00
Dean Herbert
41d776b090 Fix stable import failing
Regressed due to null GameHost. Fixes the new reports in #4043.
2019-03-30 23:56:38 +09:00
Dean Herbert
6738bd54c0
Merge pull request #4557 from Joehuu/remove-comments-issues
Remove unnecessary comments on issue templates
2019-03-30 13:01:43 +09:00
Dean Herbert
230a260212
Merge branch 'master' into remove-comments-issues 2019-03-30 12:54:48 +09:00
Dean Herbert
ff75a37acf
Merge pull request #4559 from peppy/update-framework
Update framework
2019-03-30 12:53:53 +09:00
Dean Herbert
22519ddacc Update framework 2019-03-30 12:45:09 +09:00
Aergwyn
47711eef42
Reword issue descriptions
Co-Authored-By: Joehuu <madamba.joehu@outlook.com>
2019-03-29 07:51:28 -07:00
smoogipoo
772545dd22 Merge remote-tracking branch 'origin/master' into update-beatmap-scores-design 2019-03-29 18:21:20 +09:00
Joehu
85abcb3de0 Remove regular issue template 2019-03-29 01:15:04 -07:00
Joehu
669397b14b Specify labels by the template's purpose 2019-03-29 01:12:42 -07:00
Joehu
e4ef542710 Remove unnecessary comments on issue templates 2019-03-29 01:03:42 -07:00
David Zhao
952a12bb19 Return logo relativepositionaxes on content out 2019-03-29 16:54:34 +09:00
David Zhao
352b4b20d9 Correct the sizes of TestCaseLogoFacadeContainer 2019-03-29 16:28:25 +09:00