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

12975 Commits

Author SHA1 Message Date
Dean Herbert
73d79c2469 Merge branch 'skin-metric-parity' into slider-ball-scaling 2019-07-25 16:30:43 +09:00
Dean Herbert
078c67aeaf Merge branch 'cache-drawable-hitobject' into slider-ball-scaling 2019-07-25 16:30:28 +09:00
Dean Herbert
b903d08a50 Merge branch 'fix-skin-changed-disposal' into slider-ball-scaling 2019-07-25 16:30:20 +09:00
Dean Herbert
eb6bda3f08 Cache DrawableHitObject for skinnables to access 2019-07-25 16:03:07 +09:00
Dean Herbert
58feba72a3 Fix scheduled events not running on previous drawables 2019-07-25 15:59:44 +09:00
Dean Herbert
46e17646ac Align slider path size with legacy skins 2019-07-25 14:22:26 +09:00
Dean Herbert
9473f6d3e3 Fix incorrect ratios being applied to playfield / skin elements
This now matches osu-stable 1:1.
2019-07-25 14:22:22 +09:00
Dean Herbert
a290437286 Fix skin changed events triggering after disposal 2019-07-25 13:55:01 +09:00
Dean Herbert
efad9b3150
Merge branch 'master' into skin-scaling-modes 2019-07-24 18:37:31 +09:00
Dean Herbert
2610ee2abb Update framework 2019-07-23 21:39:10 +09:00
smoogipoo
4e7e2d1d52 Adjust comments 2019-07-23 21:16:09 +09:00
smoogipoo
74b09c72fa Refactor state updates to convert State into an IBindable 2019-07-23 21:16:09 +09:00
Dan Balasescu
9b526ef61e
Merge branch 'master' into move-state-logic 2019-07-23 20:37:57 +09:00
Dean Herbert
91e21688d8
Make AccentColour a bindable (#5420)
Make AccentColour a bindable

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-07-23 20:37:47 +09:00
Dan Balasescu
0ffac22376
Merge branch 'master' into allow-multiple-debug-instances 2019-07-23 20:30:56 +09:00
Dan Balasescu
bc64c56a26
Merge branch 'master' into remove-text-shadow 2019-07-23 20:16:33 +09:00
Dean Herbert
9665a94f4a
Ignore shift-delete PlatformAction in SearchTextBox (#5372)
Ignore shift-delete PlatformAction in SearchTextBox

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-23 17:11:09 +09:00
Dean Herbert
e81ef4bf33 Rewrite comment 2019-07-23 16:44:19 +09:00
Dean Herbert
340f9a8f8d
Merge branch 'master' into fix-flashlight-depth 2019-07-23 16:37:04 +09:00
Dean Herbert
704fe2d655 Remove text shadow in chat 2019-07-23 16:04:50 +09:00
smoogipoo
5e72ed0d12 Fix potential nullref 2019-07-23 15:35:12 +09:00
David Zhao
4d8e2a78d1 update with new framework changes and update comment 2019-07-23 15:31:09 +09:00
smoogipoo
776757545d Fix FTB causing flashlight to block vision correctly 2019-07-23 15:17:02 +09:00
Dean Herbert
292bd22f92 Allow multiple instances of osu! when running under debug 2019-07-23 13:38:05 +09:00
David Zhao
3e4ebd3c7a
Merge branch 'master' into shift-delete 2019-07-23 13:25:12 +09:00
David Zhao
e628e44d8e
update comment 2019-07-23 13:25:03 +09:00
Dean Herbert
d5ee4cbc9c Move TouchDevice mod to new "system" category 2019-07-23 13:14:28 +09:00
Dean Herbert
452b2c8027
Separate GlowingSpriteText from LeaderboardScore into it's own… (#5418)
Separate GlowingSpriteText from LeaderboardScore into it's own class

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-23 12:08:30 +09:00
Dean Herbert
9e34582c17
Merge branch 'master' into separate-glowing-text-from-leaderboardscore 2019-07-23 11:31:47 +09:00
Andrei Zavatski
ffcc1c62af simplify moving condition 2019-07-22 23:22:39 +03:00
iiSaLMaN
32e9547ce9 Trim whitespace 2019-07-22 23:16:54 +03:00
iiSaLMaN
081355e3d1 Use IHasText and simplify properties 2019-07-22 23:12:09 +03:00
Andrei Zavatski
ee6fed5b33 Use fixed height 2019-07-22 18:17:49 +03:00
Dean Herbert
2f111e6cf4 Fix incorrect corner radius 2019-07-22 23:57:26 +09:00
Dean Herbert
4dc9309a7e
Merge branch 'master' into underscored_link 2019-07-22 23:46:57 +09:00
Dean Herbert
cdf75b4098 Public before private 2019-07-22 22:14:09 +09:00
Andrei Zavatski
075ca3d8ea CI fix 2019-07-22 14:47:35 +03:00
Andrei Zavatski
3e95cb9145 Use bindable and disable button 2019-07-22 14:35:18 +03:00
Andrei Zavatski
2a17ed5e18 Merge remote-tracking branch 'refs/remotes/ppy/master' into favourite-beatmap 2019-07-22 14:32:37 +03:00
Dean Herbert
7d3939a838
Merge branch 'master' into fix-triangles-crash 2019-07-22 19:17:51 +09:00
Dean Herbert
07a0df7c4f Fix bracket precedence 2019-07-22 18:29:04 +09:00
Dean Herbert
a05a6bbb77
Set "Title" as the default grouping/sorting modes in song select (#5396)
Set "Title" as the default grouping/sorting modes in song select
2019-07-22 18:06:23 +09:00
Dean Herbert
d4d286c988 Add full documentation 2019-07-22 16:08:38 +09:00
Dean Herbert
c3b81bef4a Flip default to the preferred method going forward 2019-07-22 15:55:38 +09:00
Dean Herbert
be170b4124 Naming and documentation improvements 2019-07-22 15:50:02 +09:00
Dean Herbert
91f86adb66 Move DrawableHitObject state management to base class 2019-07-22 15:07:12 +09:00
smoogipoo
a631aac664 Fix workingbeatmap's disposal potentially null-refing 2019-07-22 15:01:01 +09:00
Dean Herbert
8327452fe1 Make AccentColour a bindable 2019-07-22 14:48:59 +09:00
Dean Herbert
36c557c752 Add null check and simplify scaling conditional logic via switch 2019-07-22 14:43:25 +09:00
Dean Herbert
9d091c96b8 Use cache to ensure correct DrawSize when deciding scaling 2019-07-22 14:43:04 +09:00