1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 21:33:51 +08:00
Commit Graph

11232 Commits

Author SHA1 Message Date
RORIdev
e9f4cdd511 Removed code duplication. 2019-04-03 17:18:42 -03:00
RORIdev
5825890c31 Implemented the 3 lives system into the Easy Mod. 2019-04-03 16:58:44 -03: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
Dean Herbert
184403c7e1
Merge branch 'master' into resume-cursor-2 2019-04-01 14:24:00 +09:00
Dean Herbert
14b606f761
Merge branch 'master' into colourable-menu-elements 2019-04-01 14:16:36 +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
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
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
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
Joehu
92673c6d1e Add ability to sort by favourites on osu!direct 2019-03-30 19:24:16 -07: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
22519ddacc Update framework 2019-03-30 12:45:09 +09:00
Dean Herbert
81585a8283
Merge branch 'master' into resume-cursor-2 2019-03-29 15:56:46 +09:00
Dean Herbert
1217cfa334
Merge branch 'master' into fix-login-overlay-behavior 2019-03-29 15:03:07 +09:00
Dean Herbert
6c34842c4e
Merge branch 'master' into fix-loaderanimation-testcase 2019-03-29 15:02:45 +09:00
Dean Herbert
4225d41a84
Merge pull request #4443 from jorolf/screen-title-class
Add ScreenTitle class

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-03-29 15:02:38 +09:00
Dean Herbert
6949c233bf Merge remote-tracking branch 'upstream/master' into resume-cursor-2 2019-03-29 15:02:12 +09:00
Dean Herbert
c772a38c1b
Merge branch 'master' into fix-loaderanimation-testcase 2019-03-29 14:55:00 +09:00
Dean Herbert
ccc0853f75 Change login overlay's depth and load order 2019-03-29 14:53:40 +09:00
Dean Herbert
90a4cb8e04 Fix unnecessary positioning 2019-03-29 14:49:15 +09:00
Dean Herbert
5495a0a70f Add content to ScreenTestCase as protection against overwriting 2019-03-29 14:34:58 +09:00
Joseph Madamba
9a32e12435
Merge branch 'master' into fix-login-overlay-behavior 2019-03-28 22:28:56 -07:00
Dean Herbert
a1fa497ec0
Merge pull request #4546 from Joehuu/fix-music-controller-offset
Fix offset of music controller when toolbar is hidden

Co-authored-by: Dean Herbert <pe@ppy.sh>
Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-03-29 14:26:28 +09:00
Dean Herbert
bda8ce2dbb
Merge pull request #4537 from peppy/stable-storyboard-ordering
Add stable storyboard element ordering

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-03-29 14:15:26 +09:00
Dean Herbert
3e8952b087
Merge pull request #4521 from peppy/hitobject-drawable-representation
Fix DrawableRuleset drawable creation method's name
2019-03-29 14:08:23 +09:00
Dean Herbert
3e28c4ae0a Fix remaining IconUsage changes 2019-03-29 14:03:00 +09:00
Dan Balasescu
9c57b9eed2
Merge branch 'master' into fix-music-controller-offset 2019-03-29 14:02:49 +09:00
Dan Balasescu
e45c08ad23
Adjust comment 2019-03-29 14:02:19 +09:00
Dean Herbert
de47e0a8e8 Merge remote-tracking branch 'upstream/master' into screen-title-class 2019-03-29 14:01:08 +09:00
Dean Herbert
95bf0b9ed6 Merge remote-tracking branch 'upstream/master' into fix-music-controller-offset 2019-03-29 13:57:02 +09:00
Dean Herbert
c4096fb628 Remove unused using 2019-03-29 13:56:56 +09:00
Dean Herbert
202a0086cc
Merge branch 'master' into better-player-flags 2019-03-29 13:45:45 +09:00
Dean Herbert
c72705217a
Merge branch 'master' into framed-replay-handler-fixes 2019-03-29 12:59:51 +09:00
Dean Herbert
14cef94a53 Merge remote-tracking branch 'upstream/master' into hitobject-drawable-representation 2019-03-29 12:59:26 +09:00
Dean Herbert
0439216f7e
Merge branch 'master' into stable-storyboard-ordering 2019-03-29 12:44:09 +09:00
Dean Herbert
a71e9fdb0e
Merge branch 'master' into convert-ranking-statistics 2019-03-29 12:42:49 +09:00
Dean Herbert
e7b38cdc75 Remove unnecessary set 2019-03-29 12:38:47 +09:00
Dean Herbert
5b0aa7bf8d Split out current/next frame conditionals for readability 2019-03-29 12:38:40 +09:00