David Zhao
263ccfcbcb
Merge remote-tracking branch 'upstream/master' into back-button-priority
2019-07-24 12:50:16 +09:00
David Zhao
38559685a9
proxy backbutton instead
2019-07-24 12:47:41 +09:00
Dean Herbert
ae66a7e9e4
Update framework ( #5441 )
...
Update framework
2019-07-23 21:54:41 +09:00
Dean Herbert
2610ee2abb
Update framework
2019-07-23 21:39:10 +09:00
Dean Herbert
63336707fe
Move DrawableHitObject automatic state logic to base class ( #5424 )
...
Move DrawableHitObject automatic state logic to base class
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-07-23 21:33:21 +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
Dean Herbert
233ba71d2d
Allow multiple instances of osu! when running under debug ( #5436 )
...
Allow multiple instances of osu! when running under debug
Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-07-23 20:34:45 +09:00
Dan Balasescu
0ffac22376
Merge branch 'master' into allow-multiple-debug-instances
2019-07-23 20:30:56 +09:00
Dan Balasescu
1db514665d
Merge pull request #5439 from peppy/remove-text-shadow
...
Remove text shadow in chat
2019-07-23 20:30:52 +09:00
smoogipoo
b1a9ce85e7
Fix ticks being given an extra colour
2019-07-23 20:30:47 +09:00
Dan Balasescu
bc64c56a26
Merge branch 'master' into remove-text-shadow
2019-07-23 20:16:33 +09:00
David Zhao
8220a51310
Make backbutton handle global input last
2019-07-23 17:59:50 +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
0cff93bf20
Fix flashlight potentially not correctly blocking vision ( #5437 )
...
Fix flashlight potentially not correctly blocking vision
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-23 16:58:45 +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
867acc296a
Fix toolbar ruleset selector potentially null-refing ( #5438 )
...
Fix toolbar ruleset selector potentially null-refing
2019-07-23 16:10:06 +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
Dan Balasescu
849629708b
Merge pull request #5435 from peppy/system-mode-type
...
Move TouchDevice mod to "system" type
2019-07-23 13:25:55 +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
f8feac792c
Return TouchDevice in GetAllMods response
2019-07-23 13:14:28 +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
cf1ec5692a
Simplify line move logic in ToolbarRulesetSelector ( #5433 )
...
Simplify line move logic in ToolbarRulesetSelector
2019-07-23 11:41:20 +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
Dean Herbert
3fde4efaee
Update MostPlayedBeatmaps section in line with the web version ( #4879 )
...
Update MostPlayedBeatmaps section in line with the web version
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-23 01:16:14 +09: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
ade661236a
Merge branch 'master' into intro-testing-improvements
2019-07-22 23:44:14 +09:00
Dean Herbert
0330c3e14e
Retrieve the actual favourite value for beatmaps ( #5426 )
...
Retrieve the actual favourite value for beatmaps
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-22 22:32:49 +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
Dan Balasescu
7083a1d01c
Merge pull request #5412 from peppy/fix-triangles-crash
...
Fix TriangleDrawNode crash when required triangles is zero
2019-07-22 20:03:56 +09: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
