Andrei Zavatski
2e49b4ffcd
Update the component with an abstract RulesetSelector class
2019-06-26 18:56:40 +03:00
Andrei Zavatski
e9f3a1ba63
Merge remote-tracking branch 'refs/remotes/ppy/master' into user_profile_modes
2019-06-26 18:31:36 +03:00
Dean Herbert
9edd98efdc
Move disposal to end of class
2019-06-27 00:29:38 +09:00
Dean Herbert
768d6c2fb3
ModelInfo -> Model
2019-06-27 00:29:09 +09:00
naoey
8efc504817
Post merge fixes
2019-06-26 18:22:37 +05:30
naoey
f3a84de7b5
Merge remote-tracking branch 'upstream/master' into generic-download-tracking-composite
2019-06-26 18:17:53 +05:30
Dean Herbert
c34f6180e6
Merge branch 'master' into generic-download-model-manager
2019-06-26 20:37:56 +09:00
Dean Herbert
da65658bc3
Fix comments
2019-06-26 20:07:01 +09:00
David Zhao
4510c868f4
Remove selector toggling logic for now
2019-06-26 19:39:47 +09:00
Dean Herbert
6812eccdd1
Fix MusicController holding references to beatmaps while inacti… ( #5158 )
...
Fix MusicController holding references to beatmaps while inactive
2019-06-26 19:30:16 +09:00
David Zhao
e92c1ca009
Fix styling, private tabClosed, remove type check
2019-06-26 19:25:54 +09:00
Dan Balasescu
f06aabad5f
Merge branch 'master' into toolbar-rulesets-refactor
2019-06-26 18:33:45 +09:00
smoogipoo
6ce86e6083
General refactoring
2019-06-26 17:52:25 +09:00
David Zhao
a1a0a9ee6b
Merge branch 'master' into selector-hiding
2019-06-26 17:45:05 +09:00
smoogipoo
cb65fc6317
Don't throw exception for non-existent files
2019-06-26 17:23:12 +09:00
smoogipoo
15b140b2ee
Shortcut checking for whether directories are files
2019-06-26 17:10:22 +09:00
Welsar55
7dd1479050
Add combobreak sound
2019-06-26 00:20:33 -05:00
Dean Herbert
2707a7179e
Fix MusiController holding references to beatmaps while inactive
2019-06-26 13:18:03 +09:00
Dean Herbert
1eda4e0dd4
Merge remote-tracking branch 'upstream/master' into generic-download-model-manager
2019-06-26 12:21:04 +09:00
David Zhao
6c8cc9728f
fix channel selector not being closed
2019-06-26 12:00:58 +09:00
Dean Herbert
9e1cb90dd8
Remove existing argument for ItemAdded event
...
For all usages, it looks like this was unnecessary.
2019-06-26 11:40:41 +09:00
Dan Balasescu
6063e7a69f
Merge branch 'master' into one-hit-screen
2019-06-26 11:34:54 +09:00
Salman Ahmed
eaf6f6891d
Rename to DownloadButtonsContainer
2019-06-26 05:22:08 +03:00
Salman Ahmed
f4e765cf99
Merge branch 'master' into not-available-to-download
2019-06-26 05:13:58 +03:00
Dean Herbert
446fbce81c
Add base class for startup screens
...
Avoids missing adding changes to screens like Disclaimer, which may not be shown in debug builds.
2019-06-26 01:36:17 +09:00
naoey
c476e46a8e
Remove unnecessary private methods and inline used-once code
2019-06-25 21:16:30 +05:30
Dean Herbert
40cf573368
Fix pause not correctly showing pause screen
2019-06-25 23:15:58 +09:00
Dean Herbert
983cabdb98
Disallow back button on disclaimer screen
2019-06-25 22:27:50 +09:00
naoey
6f5fbd7ea1
Remove unnecessary try-catch block
2019-06-25 18:28:59 +05:30
naoey
9d88295ece
Merge remote-tracking branch 'upstream/master' into generic-download-model-manager
2019-06-25 18:27:16 +05:30
Dean Herbert
7d5554c2ac
Re-use the back button game-wide ( #5149 )
...
Re-use the back button game-wide
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-25 20:50:28 +09:00
Dean Herbert
f9dad0f640
Merge remote-tracking branch 'upstream/master' into gamewide-backbutton
2019-06-25 20:23:49 +09:00
Dean Herbert
f51be4c4fe
Adjust transitions a tad
2019-06-25 20:23:34 +09:00
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
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
47974ca854
Merge branch 'master' into beatmap-overlay-load
2019-06-25 19:05:17 +09:00
Dan Balasescu
ffcd3529a6
Merge branch 'master' into cancel-api-callback
2019-06-25 18:43:33 +09:00
smoogipoo
aa81c95f30
Remove unnecessary extra property
2019-06-25 18:38:14 +09:00
Dean Herbert
fe290ead63
Update framework
2019-06-25 18:38:11 +09:00
smoogipoo
5b294ba419
Adjust backbutton animation
2019-06-25 18:33:35 +09:00
smoogipoo
531b107a98
Exit match before exiting multiplayer
2019-06-25 18:33:26 +09:00
smoogipoo
1a26608ba9
Close mod select before exiting song selection
2019-06-25 18:33:21 +09:00
smoogipoo
d9927204f8
Relieve OsuScreen of back button input duties
2019-06-25 18:33:18 +09:00
smoogipoo
f53d2fbe76
Scale backbutton along with screens
2019-06-25 18:33:13 +09:00
smoogipoo
8c96e4c1fa
Move back button to OsuGame
2019-06-25 18:33:08 +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
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
cc1e67dc6c
Merge branch 'master' into fix-avatar-display-update-2
2019-06-25 10:18:46 +09:00
jorolf
4d8f49b9bc
update code to work with https://github.com/ppy/osu-framework/pull/2568
2019-06-24 23:17:07 +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
6a541d9a10
Merge branch 'master' into user_profile_modes
2019-06-25 00:59:51 +09:00
Dean Herbert
c0b5153094
Merge branch 'master' into music-effect-arrow-keys-hover
2019-06-24 21:49:45 +09:00
Dean Herbert
88b182ab3f
Merge branch 'master' into generic-download-model-manager
2019-06-24 18:35:58 +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
Andrei Zavatski
bbdb114f04
Add missing blank line
2019-06-24 02:09:00 +03:00
Andrei Zavatski
35db20a337
Remove useless bindable check
2019-06-24 02:01:00 +03:00
Andrei Zavatski
94e819578e
Finally fix the problem when we can't apply a ruleset in the multi screen
...
because it's disabled
2019-06-24 01:55:35 +03:00
Andrei Zavatski
60ff497add
Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor
2019-06-24 01:06:54 +03: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
