Andrei Zavatski
|
bae0258d8d
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor
|
2019-06-25 14:16:05 +03:00 |
|
Dean Herbert
|
75b78d5e27
|
Reduce size of dropdown chevron (#5150)
Reduce size of dropdown chevron
Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
|
2019-06-25 20:05:52 +09:00 |
|
Dean Herbert
|
28cfccbd64
|
Use OsuScrollContainer for osu menus (#5094)
Use OsuScrollContainer for osu menus
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-06-25 20:05:09 +09:00 |
|
Dan Balasescu
|
7794fab7c9
|
Merge branch 'master' into reduce-dropdown-chevron-size
|
2019-06-25 19:58:37 +09:00 |
|
Dan Balasescu
|
89777c1743
|
Merge pull request #5147 from peppy/reduce-background-brightness
Reduce background brightness at PlayerLoader
|
2019-06-25 19:58:25 +09:00 |
|
Dan Balasescu
|
0f31d17129
|
Merge branch 'master' into reduce-background-brightness
|
2019-06-25 19:45:15 +09:00 |
|
Dean Herbert
|
a3de369c20
|
Reduce size of dropdown chevron
|
2019-06-25 19:32:00 +09:00 |
|
Dean Herbert
|
8c02709d74
|
Merge branch 'master' into fix-dropdown-styling
|
2019-06-25 19:28:37 +09:00 |
|
Dean Herbert
|
445660d066
|
Merge pull request #5148 from peppy/update-framework
Update framework
|
2019-06-25 19:28:17 +09:00 |
|
Dan Balasescu
|
c6965a40dc
|
Merge branch 'master' into reduce-background-brightness
|
2019-06-25 19:18:28 +09:00 |
|
Dan Balasescu
|
055b302da1
|
Merge pull request #5144 from peppy/beatmap-overlay-load
Improve loading state of BeatmapSet header
|
2019-06-25 19:18:23 +09:00 |
|
Dan Balasescu
|
47974ca854
|
Merge branch 'master' into beatmap-overlay-load
|
2019-06-25 19:05:17 +09:00 |
|
Dan Balasescu
|
2d07514a56
|
Merge pull request #5143 from peppy/cancel-api-callback
Avoid calling api request callback after user cancel
|
2019-06-25 19:04:57 +09:00 |
|
Dan Balasescu
|
ffcd3529a6
|
Merge branch 'master' into cancel-api-callback
|
2019-06-25 18:43:33 +09:00 |
|
Dean Herbert
|
fe290ead63
|
Update framework
|
2019-06-25 18:38:11 +09:00 |
|
Dean Herbert
|
1ea24756bd
|
Fix keybindings being offset incorrectly (#5146)
Fix keybindings being offset incorrectly
|
2019-06-25 17:27:31 +09:00 |
|
Dean Herbert
|
7bc7df2249
|
Reduce background brightness at PlayerLoader
|
2019-06-25 17:22:10 +09:00 |
|
Dean Herbert
|
93b6d5b7e3
|
Fix keybindings being offset
|
2019-06-25 17:16:19 +09:00 |
|
Dean Herbert
|
7281b64eb6
|
Fix cursor expansion state potentially being incorrect (#5145)
Fix cursor expansion state potentially being incorrect
|
2019-06-25 16:16:27 +09:00 |
|
smoogipoo
|
0d98d637b6
|
Fix cursor expansion state potentially being incorrect
|
2019-06-25 15:47:54 +09:00 |
|
Dean Herbert
|
f2207aae4e
|
Remove unnecessary local item storage in SettingsDropdown (#5142)
Remove unnecessary local item storage in SettingsDropdown
|
2019-06-25 15:22:20 +09:00 |
|
Dean Herbert
|
ba2f22be47
|
Improve loading state of BeatmapSet header
|
2019-06-25 14:47:29 +09:00 |
|
Dean Herbert
|
90acc9b6ca
|
Avoid calling api request callback after user cancel
|
2019-06-25 13:52:43 +09:00 |
|
smoogipoo
|
fb94cd43a4
|
Remove unnecessary local item storage in SettingsDropdown
|
2019-06-25 12:00:05 +09:00 |
|
Dean Herbert
|
109ca1fd6f
|
Avoid displaying previous user avatar when showing new beatmap… (#5112)
Avoid displaying previous user avatar when showing new beatmap overlay
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-06-25 10:31:36 +09:00 |
|
Dean Herbert
|
cc1e67dc6c
|
Merge branch 'master' into fix-avatar-display-update-2
|
2019-06-25 10:18:46 +09:00 |
|
Dean Herbert
|
c4791f19b5
|
Merge pull request #5141 from Morilli/fix-readme
Fix bad wording in the readme
|
2019-06-25 06:49:29 +09:00 |
|
Morilli
|
7fa94e6e35
|
fix bad wording
|
2019-06-24 23:25:33 +02:00 |
|
Andrei Zavatski
|
b7d15982d7
|
Remove useless parentheses
|
2019-06-24 23:30:35 +03:00 |
|
Andrei Zavatski
|
4a05c560cf
|
Remove unwanted class and move the bind logic outside the RulesetSelector
|
2019-06-24 23:13:28 +03:00 |
|
Andrei Zavatski
|
9dedd62d9a
|
Revert a hotfix in multi screen
since it's been fixed in a framework
|
2019-06-24 22:57:18 +03:00 |
|
Andrei Zavatski
|
35516e7304
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor
|
2019-06-24 22:52:24 +03: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
|
12faffc7b8
|
Allow controlling music and effect volume via arrow keys when h… (#5135)
Allow controlling music and effect volume via arrow keys when hovering
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-06-24 22:21:08 +09:00 |
|
Dean Herbert
|
c0b5153094
|
Merge branch 'master' into music-effect-arrow-keys-hover
|
2019-06-24 21:49:45 +09:00 |
|
Dean Herbert
|
afaea9a5fa
|
Merge pull request #2996 from HoutarouOreki/quickEscape
Add quick exit hotkey
|
2019-06-24 19:02:42 +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 |
|
Dean Herbert
|
b40eefcf7c
|
Add basic skinning capabilities to osu!catch catcher (#5128)
Add basic skinning capabilities to osu!catch catcher
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-06-24 18:03:48 +09:00 |
|
Dean Herbert
|
5aa98a4da3
|
Update TabControl in User Overlay in line with the web version (#5057)
Update TabControl in User Overlay in line with the web version
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-06-24 18:03:32 +09:00 |
|
HoLLy
|
aed83471f4
|
Replace Reset with overridden TransformImmediately/TransformDuration
|
2019-06-24 10:51:45 +02:00 |
|
Dean Herbert
|
cc9e46f8ee
|
Merge remote-tracking branch 'upstream/master' into catch-catcher-skinning
|
2019-06-24 17:45:33 +09: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
|
303fb508af
|
Add SkinnableSprite class (#5137)
Add SkinnableSprite class
|
2019-06-24 17:11:21 +09:00 |
|