1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 01:47:25 +08:00
Commit Graph

12338 Commits

Author SHA1 Message Date
smoogipoo
fb94cd43a4 Remove unnecessary local item storage in SettingsDropdown 2019-06-25 12:00:05 +09:00
Dean Herbert
cc1e67dc6c
Merge branch 'master' into fix-avatar-display-update-2 2019-06-25 10:18:46 +09:00
HoLLy
236d5a9abc Remove leftover TransformDuration overrides 2019-06-24 18:26:25 +02:00
HoLLy
739077ef4f Only hide UpdateableAvatar/Flag immediately 2019-06-24 18:24:31 +02:00
HoLLy
7734c4b41a Fix code style 2019-06-24 18:09:42 +02:00
Dean Herbert
c0b5153094
Merge branch 'master' into music-effect-arrow-keys-hover 2019-06-24 21:49:45 +09:00
Dean Herbert
f91467eddc Fix licence header 2019-06-24 18:34:23 +09:00
Dean Herbert
bd2f34a102
Merge branch 'master' into quickEscape 2019-06-24 18:21:39 +09:00
Dean Herbert
2ea5165803 Change case to match; change hotkey to be more globally usable (previous has conflict on macOS) 2019-06-24 18:19:17 +09:00
Dean Herbert
fad1ced1b5 Add correct conditionals to allow exit 2019-06-24 18:15:27 +09:00
Dean Herbert
d70248338d Merge remote-tracking branch 'upstream/master' into quickEscape 2019-06-24 18:14:48 +09:00
HoLLy
aed83471f4 Replace Reset with overridden TransformImmediately/TransformDuration 2019-06-24 10:51:45 +02:00
Dean Herbert
2473a9487a Add missing using 2019-06-24 17:38:11 +09:00
Dean Herbert
6e2138491b
Merge branch 'master' into useroverlay-tabs 2019-06-24 17:27:47 +09:00
Dean Herbert
36d54fdbfc
Merge branch 'master' into skinnable-sprite 2019-06-24 16:33:17 +09:00
Dean Herbert
06eaba766b Move method below ctor 2019-06-24 15:27:46 +09:00
Dean Herbert
9593e66a96 Add some more xmldoc 2019-06-24 15:25:01 +09:00
Dan Balasescu
18d64df0c4
Merge branch 'master' into add-numberbox 2019-06-24 15:22:30 +09:00
Dean Herbert
3f22c0a311 Add SkinnableSprite implementation 2019-06-24 15:17:35 +09:00
Joehu
7ac6558f59 Allow controlling music and effect volume by arrow keys when hovering 2019-06-23 22:53:02 -07:00
Dan Balasescu
00a2aa7881
Merge branch 'master' into useroverlay-overall-improvements 2019-06-24 13:28:17 +09:00
smoogipoo
5272b3a929 Use .Darken() instead of hex-based colour 2019-06-24 13:27:58 +09:00
Dean Herbert
1057301322
Fix multiplayer create button appearing in match song selection (#5132)
Fix multiplayer create button appearing in match song selection
2019-06-24 12:31:39 +09:00
smoogipoo
8d6fc3edf0 Fix multiplayer create button appearing in match song selection 2019-06-24 11:54:41 +09:00
Dean Herbert
c988dfbdaa Make things a bit more sensible 2019-06-24 11:43:34 +09:00
mulraf
dfb791ed3e Update PopupDialog.cs
Changed Spacings
2019-06-23 22:59:14 +02:00
mulraf
7bbd6b810f Update PopupDialog.cs
New here, i never really programmed on a big project like this. It looks kinda makeshift and i hope it doesn't cause any other issues but i've seen nothing and it fixed the issue for me. It was all dialog boxes that got cut off at the top (so also deleting all beatmaps etc.)
2019-06-23 20:33:43 +02:00
Andrei Zavatski
8430ac6d1c remove unused using 2019-06-23 19:19:36 +03:00
Andrei Zavatski
1c20df780a Adjust triangles colour 2019-06-23 17:08:18 +03:00
Andrei Zavatski
4963d4e8df CI fixes 2019-06-22 03:08:18 +03:00
Andrei Zavatski
3723ea05de Adjust Title style 2019-06-22 02:52:07 +03:00
Andrei Zavatski
4cd3b15f6e Add triangles 2019-06-22 02:40:33 +03:00
Andrei Zavatski
dbf53e9bda Use correct background colour for sections 2019-06-22 02:06:30 +03:00
Andrei Zavatski
132cb8f473 Add spacing between sections 2019-06-22 01:11:04 +03:00
Joehu
36f59ec86d Remove unused using 2019-06-21 08:29:45 -07:00
Joehu
74e99b2915 Remove unused parameter 2019-06-21 08:11:10 -07:00
Joehu
1d6b6a7828 Fix audio being dimmed on preview tracks 2019-06-21 08:06:57 -07:00
HoLLy
fafec00667 Reset top score avatar before updating it 2019-06-21 16:47:19 +02:00
Dean Herbert
3ad74e2ff3
Merge branch 'master' into update-framework 2019-06-21 22:24:57 +09:00
Dean Herbert
ca2a3937ea
Fix audio not dimming after race condition (#5049)
Fix audio not dimming after race condition
2019-06-21 22:24:36 +09:00
Dean Herbert
859afefb79
Prevent non-combo affecting judgements from triggering sudden death (#5095)
Prevent non-combo affecting judgements from triggering sudden death
2019-06-21 22:24:00 +09:00
Unknown
1bc1e2459e add SettingsNumberBox and use it in tournament tools 2019-06-21 15:04:52 +02:00
Unknown
16a4805f1f add OsuNumberBox with basic tests 2019-06-21 15:04:52 +02:00
KingLuigi4932
13f6c6a87e Update framework 2019-06-21 15:23:35 +03:00
Dean Herbert
cff5ddb137
Merge branch 'master' into fix-inactive-audio-race 2019-06-21 21:09:12 +09:00
Dean Herbert
f766068e17
Remove local implementation of bindable in OsuCheckbox (#5046)
Remove local implementation of bindable in OsuCheckbox
2019-06-21 21:08:09 +09:00
Dean Herbert
abd0c2bb1a
Move NotificationSection strings to constructor (#5078)
Move NotificationSection strings to constructor
2019-06-21 20:47:31 +09:00
Andrei Zavatski
29305ca0eb fix broken layout 2019-06-21 13:24:12 +03:00
Andrei Zavatski
7680f6cbf4 Merge remote-tracking branch 'refs/remotes/ppy/master' into useroverlay-tabs 2019-06-21 13:06:44 +03:00
Dan Balasescu
67246eddd4
Merge branch 'master' into fix-chat-test-scene 2019-06-21 16:34:35 +09:00