David Zhao
|
fe53df90af
|
Merge branch 'selector-hiding' of https://github.com/nyquillerium/osu into selector-hiding
|
2019-06-26 17:54:02 +09:00 |
|
David Zhao
|
1e8026c3ae
|
remove unused using
|
2019-06-26 17:53:57 +09:00 |
|
David Zhao
|
d1230b4a52
|
Use tabmap instead of available tabs
|
2019-06-26 17:53:35 +09:00 |
|
smoogipoo
|
6ce86e6083
|
General refactoring
|
2019-06-26 17:52:25 +09:00 |
|
Dean Herbert
|
5a791dcd86
|
Shortcut checking for whether directories are files (#5160)
Shortcut checking for whether directories are files
|
2019-06-26 17:47:21 +09:00 |
|
David Zhao
|
a1a0a9ee6b
|
Merge branch 'master' into selector-hiding
|
2019-06-26 17:45:05 +09:00 |
|
David Zhao
|
2394b11f11
|
fix test
|
2019-06-26 17:44:24 +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
|
1ca9717e13
|
Split out tests
|
2019-06-26 12:05:11 +09:00 |
|
David Zhao
|
6c8cc9728f
|
fix channel selector not being closed
|
2019-06-26 12:00:58 +09:00 |
|
Dan Balasescu
|
681759582b
|
Merge pull request #5155 from peppy/one-hit-screen
Add base class for startup screens
|
2019-06-26 11:49:15 +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 |
|
Dan Balasescu
|
d68e2892dd
|
Merge pull request #5154 from peppy/fix-pause-behaviour
Fix pause not correctly showing pause screen
|
2019-06-26 11:34:42 +09:00 |
|
Salman Ahmed
|
eaf6f6891d
|
Rename to DownloadButtonsContainer
|
2019-06-26 05:22:08 +03:00 |
|
Salman Ahmed
|
2e383a1f83
|
Trim whitespaces
|
2019-06-26 05:17:28 +03:00 |
|
Salman Ahmed
|
f4e765cf99
|
Merge branch 'master' into not-available-to-download
|
2019-06-26 05:13:58 +03:00 |
|
Salman Ahmed
|
33fbf56b4c
|
Remove test beatmapsets and use existing set info
|
2019-06-26 05:01:29 +03:00 |
|
Albert Tang
|
3cf2ffc1a7
|
Merge branch 'master' into android
|
2019-06-25 17:54:23 -05:00 |
|
Albert Tang
|
4cb2c4b494
|
Support both landscape and portrait mode
Co-Authored-By: miterosan <33435289+miterosan@users.noreply.github.com>
|
2019-06-25 17:54:14 -05: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
|
c04f14a1e3
|
Remove unused using statement
|
2019-06-26 00:23:39 +09:00 |
|
Dean Herbert
|
a4214db39e
|
Add test for pause via hold
|
2019-06-26 00:00:53 +09:00 |
|
Dean Herbert
|
40cf573368
|
Fix pause not correctly showing pause screen
|
2019-06-25 23:15:58 +09:00 |
|
Dean Herbert
|
bb3dde53d1
|
Disallow back button on disclaimer screen (#5153)
Disallow back button on disclaimer screen
|
2019-06-25 22:35:00 +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 |
|
Andrei Zavatski
|
08e31159fc
|
Make testcase even more useful
|
2019-06-25 14:27:29 +03:00 |
|
Dean Herbert
|
f9dad0f640
|
Merge remote-tracking branch 'upstream/master' into gamewide-backbutton
|
2019-06-25 20:23:49 +09:00 |
|
Dean Herbert
|
e87e4077e8
|
Add testability of dismissal
|
2019-06-25 20:23:43 +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
|
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 |
|