1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 10:21:59 +08:00
Commit Graph

6935 Commits

Author SHA1 Message Date
Dean Herbert
20052b060c Nest delays and implement IStateful, allowing for flushing on early dismiss
Note that this will break rotation loops until https://github.com/ppy/osu-framework/issues/900 is addressed.
2017-07-14 13:25:31 +09:00
Dean Herbert
ab5341eadc Merge remote-tracking branch 'upstream/master' into DrabWeb/medal-splash 2017-07-14 09:46:36 +09:00
Dean Herbert
e3ff79fdd1 Merge pull request #1018 from Nabile-Rahmani/skip-button-fix
Make the skip button clickable only once.
2017-07-14 09:45:16 +09:00
Dean Herbert
6c9219856d Add comment 2017-07-14 09:39:40 +09:00
Dean Herbert
b1d447bf71 Add missing access modifier 2017-07-14 07:05:39 +09:00
Dean Herbert
bfa6a9aa4e Add missing licence header 2017-07-14 06:43:33 +09:00
Nabile Rahmani
840cc918ea Use Enabled instead of a private field. 2017-07-13 23:35:19 +02:00
Dean Herbert
a6ac61f735 Update framework 2017-07-14 06:24:07 +09:00
Dean Herbert
ce204b8e7b Merge remote-tracking branch 'ppy/master' into right-mouse-scrollbar 2017-07-14 06:23:07 +09:00
Nabile Rahmani
8014cd55a2 Make the skip button clickable only once. 2017-07-13 21:59:17 +02:00
Dean Herbert
2ff92ac25a Contract sidebar on click
Also makes queueing of expand more correct.
2017-07-13 17:09:12 +09:00
Dean Herbert
939e167d6a Correct offset settings vertically based on toolbar visibility 2017-07-13 17:09:12 +09:00
Dean Herbert
f4fd263671 Fix settings not offsetting scroll operations by fixed header content 2017-07-13 17:09:12 +09:00
Dean Herbert
8460e29bcb Sidebar now pushes full settings out further 2017-07-13 17:09:12 +09:00
Dean Herbert
61c45b0b44 Merge pull request #1003 from Jorolf/ruleset-settings
Add ruleset settings
2017-07-13 17:08:51 +09:00
Dean Herbert
d3f5de9bf9 Move to UI namespace 2017-07-13 15:44:42 +09:00
Dean Herbert
25344d2345 Fix incorrect header 2017-07-13 15:43:18 +09:00
Dean Herbert
fc28617099 Merge remote-tracking branch 'upstream/master' into ruleset-settings 2017-07-13 15:35:53 +09:00
Dan Balasescu
ed42f50058 Merge pull request #1015 from peppy/redundant-empty-arglist
Remove all unnecessary parenthesis where object initialisers are used
2017-07-13 15:56:58 +09:30
Dean Herbert
fcfd8b5465 Update framework 2017-07-13 15:19:47 +09:00
Dean Herbert
de46f3ab07 Remove all unnecessary parenthesis where object initialisers are used
Enforces at CI.
2017-07-13 15:11:33 +09:00
Dean Herbert
03e4b2a599 Add default status colour 2017-07-13 14:55:19 +09:00
Dean Herbert
b13e8599f1 Hide the login overlay when the user panel container by it is clicked 2017-07-13 14:46:17 +09:00
Dean Herbert
d1a5a042d7 Avoid storing locals in UserPanel.
Also make clickable region more correct.
2017-07-13 14:34:51 +09:00
Dean Herbert
b79e309c2f Don't lock scroll position of SectionsContainer header elements on negative scroll
Feels better in all cases.
2017-07-13 14:24:41 +09:00
Dean Herbert
3c7cd97d42 Vertically center "coming soon" text 2017-07-13 14:24:08 +09:00
Dean Herbert
4cf409ab35 Adjust padding slightly 2017-07-13 14:23:52 +09:00
Dean Herbert
c7a13740f9 Move sections to own namespace 2017-07-13 13:53:45 +09:00
Dean Herbert
c02a85bc4a Formatting 2017-07-13 13:52:40 +09:00
Dean Herbert
3a4150c6c3 Merge remote-tracking branch 'upstream/master' into profile
# Conflicts:
#	osu.Game/Graphics/Containers/SectionsContainer.cs
2017-07-13 13:44:21 +09:00
DrabWeb
b196b1d3c6 CI fixes, switch RoomInspector to use BeatmapSetCover. 2017-07-13 01:24:59 -03:00
DrabWeb
fea40ccc1a Share BeatmapSet cover sprite code. 2017-07-13 01:17:47 -03:00
Dean Herbert
80f88cf5bb Merge pull request #977 from VPeruS/window-icon-lin-mac
Insert window icon as EmbeddedResource into osu!.exe
2017-07-13 13:11:10 +09:00
DrabWeb
0624f578eb Update with online beatmap changes. 2017-07-13 01:06:46 -03:00
Dean Herbert
e73382f313 Merge branch 'master' into window-icon-lin-mac 2017-07-13 13:03:44 +09:00
DrabWeb
dc5ec319a2 Merge https://github.com/ppy/osu into drawable-room-update 2017-07-13 01:00:32 -03:00
Dean Herbert
644edbd006 Merge pull request #1008 from DrabWeb/osu-direct-search
osu!direct search
2017-07-13 12:59:55 +09:00
Dean Herbert
f142bd0dc0 Improve formatting of panel creation code 2017-07-13 12:52:51 +09:00
DrabWeb
321ae42351 Formatting. 2017-07-13 00:27:41 -03:00
Dean Herbert
8045e0566f Use a bindable for the current query.
Aso debounce and don't require hitting enter.
2017-07-13 12:22:51 +09:00
Dean Herbert
4e1a998f9d Don't return so early on empty search (never clears results) 2017-07-13 12:20:32 +09:00
Dean Herbert
e30f0a2e69 Avoid potentially calling updateSearch more than once in a single update 2017-07-13 12:20:07 +09:00
DrabWeb
931adcf677 Typo. 2017-07-13 00:13:56 -03:00
DrabWeb
ca12fd3042 Better medal sprite loading, fade in particles, visual test update. 2017-07-13 00:13:18 -03:00
Dean Herbert
190ea3bfab Remove unnused variable 2017-07-13 11:06:28 +09:00
Dean Herbert
3f2f42d13c Always load high resolution for now
Also rename GetBackground to CreateBackground, since it's returning a new instance.
2017-07-13 10:30:09 +09:00
Dean Herbert
2c1f3de47a Rename 2X resources to be defaults 2017-07-13 10:27:39 +09:00
Dean Herbert
56c817e4b6 Merge branch 'master' into osu-direct-search 2017-07-13 10:16:27 +09:00
Dean Herbert
9d47dd9ff9 Add support for right mouse absolute scrolling (when enabled)
Will likely need to be bindable when hooked up to settings and actually used.
2017-07-12 18:57:44 +09:00
EVAST9919
0b1db1502d removed useless bool 2017-07-12 09:42:38 +03:00