1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-25 21:42:54 +08:00
Commit Graph

21552 Commits

Author SHA1 Message Date
Dean Herbert
cc9a7839c9 Fix layout regression 2019-06-27 12:04:01 +09:00
Dean Herbert
d6da21b0f0 Tidy up fetch methods
Anonymise some test data further
2019-06-27 12:00:31 +09:00
Dean Herbert
375a6f406d Merge remote-tracking branch 'upstream/master' into not-available-to-download 2019-06-27 11:44:41 +09:00
Dean Herbert
322d92d3e0 Rename class to BeatmapAvailability 2019-06-27 11:40:22 +09:00
iiSaLMaN
9ada4d68b1 Make fields protected and expose them in tests 2019-06-26 22:42:34 +03:00
Dean Herbert
d5c8680d8f
Merge pull request from naoey/generic-download-tracking-composite
Make a generic model download tracking Drawable
2019-06-27 03:26:27 +09:00
Welsar55
826699a7e7 Remove unneeded bindable 2019-06-26 12:16:44 -05:00
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
1c9b6e7af3
Create a generic archive download manager ()
Create a generic archive download manager

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-26 21:24:36 +09:00
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
b00de0b3a8 Invert tests for now 2019-06-26 20:04:46 +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… ()
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
eb7757a25c
Merge pull request from EVAST9919/toolbar-rulesets-refactor
Refactor ToolbarRulesetSelector using TabControl
2019-06-26 19:21:45 +09:00
Dan Balasescu
f06aabad5f
Merge branch 'master' into toolbar-rulesets-refactor 2019-06-26 18:33:45 +09:00
David Zhao
024d3cc10a Fix test and add comment 2019-06-26 18:00:40 +09:00
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 ()
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 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 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