h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 16:57:25 +08:00
Code Issues Releases Wiki Activity
8,049 Commits 3 Branches 653 Tags 366 MiB
aab348bebc
Commit Graph

1609 Commits

Author SHA1 Message Date
Dan Balasescu
0d7592d9a6 Merge branch 'master' into beatmap-background-disposal-fix 2017-08-25 13:35:38 +09:00
Dan Balasescu
ebf3300cb6 Merge branch 'master' into beatmap-background-disposal-fix 2017-08-25 13:06:33 +09:00
Dan Balasescu
1385a6a969 Merge branch 'master' into correct-direct-toolbar-icon 2017-08-25 13:05:47 +09:00
Dean Herbert
67b3cbce2f Fix beatmap background being disposed too early 
Causes weird transitions on the music controller
 2017-08-25 13:04:32 +09:00
Dean Herbert
86bde4b6b2 Use the correct icon for osu!direct in the toolbar 2017-08-25 13:03:34 +09:00
Dean Herbert
7055cb581d Load direct panels more asynchronously to avoid stutter 2017-08-25 11:54:35 +09:00
Dean Herbert
ca0d1b79b2 Disallow multiple download requests for the same panel 2017-08-25 11:54:18 +09:00
Dean Herbert
7f617e2c36 Remove downloaded beatmap panels from osu!direct 2017-08-25 11:53:41 +09:00
Dean Herbert
febf0348be Permit nulls to allow test cases to run successfully 2017-08-24 21:26:50 +09:00
Dean Herbert
0082640548 Add missing licence header 2017-08-24 20:25:18 +09:00
Dean Herbert
9adff5f697 Add osu!direct toggle to toolbar 2017-08-24 20:18:47 +09:00
Dean Herbert
32a23c7fe4 Add initial osu!direct beatmap download and import process 2017-08-24 20:16:03 +09:00
Dean Herbert
9c82593c9e Add cancel event to ProgressNotification 2017-08-24 20:15:45 +09:00
Dean Herbert
cacf256aad Add placeholder download method with progress bar 2017-08-24 18:51:50 +09:00
Dean Herbert
36629f5207 Make ProgressBar usable in more places than just MusicController 2017-08-24 18:51:34 +09:00
Dean Herbert
a2549157ca Add hover effects 2017-08-24 18:18:03 +09:00
Dean Herbert
4e1cf329c8 Move background logic to base class; reduce overdraw after set fades in 2017-08-24 17:39:39 +09:00
Dean Herbert
76a95495d3 Move shared code to base class 2017-08-24 17:30:10 +09:00
naoey
6291bd5ced Handle null current channel in setter, update framework. 2017-08-24 10:40:42 +05:30
naoey
3f403ba524 Merge remote-tracking branch 'upstream/master' into quit-chat-channels 2017-08-24 10:06:29 +05:30
naoey
2cace0e1ab Don't use virtual methods in ctor, always create closeButton. 2017-08-24 09:48:53 +05:30
Dean Herbert
c99ed6fd44 Add reset button 
Also fixes a regression causing multiple rows to be displayed for a single action
 2017-08-23 19:26:49 +09:00
Dan Balasescu
a18507b3b4 Merge branch 'master' into fix-incorrect-notification-count 2017-08-23 17:22:39 +09:00
Dean Herbert
efdd5eb152 Fix global key bindings being fetched with a non-null variant 2017-08-23 16:10:31 +09:00
smoogipooo
68e7cf854f Add variant names. 2017-08-23 14:19:14 +09:00
smoogipooo
c1860f2ce2 Make KeyBindingOverlay support variants as settings sub sections. 2017-08-23 12:49:30 +09:00
smoogipooo
38a4c84163 Load SettingsSubsection in load() 
Fixes header not being displayed with variant bindings. This follows what SettingsSection does.
 2017-08-23 12:48:53 +09:00
Dean Herbert
b2db550cb4 Fix notification count including fading (already closed) notifications 2017-08-23 12:47:20 +09:00
smoogipooo
a6266850d6 Make KeyBindingRow take a non-action enum. 2017-08-23 12:46:28 +09:00
Dean Herbert
630d67405f Merge branch 'master' into update-changelog-notification 2017-08-23 00:12:59 +09:00
Dean Herbert
a257c6846e Merge branch 'master' into zero-notifications-closes 2017-08-22 22:45:52 +09:00
jorolf
3025fcdb25 Merge branch 'master' into ranks-section 2017-08-22 13:19:03 +02:00
Dean Herbert
480d839d67 Allow the notification overlay to close when all notifications are dismissed 2017-08-22 19:51:42 +09:00
Dean Herbert
ab0e3ccc55 Make SimpleNotifications support word wrap 2017-08-22 19:33:18 +09:00
Dean Herbert
97acff535d Tidy up conditionals 2017-08-22 18:21:00 +09:00
Dean Herbert
ff8ad30127 Add support for binding mousewheel actions 2017-08-22 14:44:34 +09:00
Dean Herbert
250fb33fbc Merge branch 'master' into ranks-section 2017-08-22 12:46:28 +09:00
Dean Herbert
7693fc1382 Merge branch 'master' into mask-settings-overlay 2017-08-22 00:22:39 +09:00
Dean Herbert
1d0b89d592 Restore usage of AddRange 2017-08-21 18:51:14 +09:00
Dean Herbert
9ba2258f80 Add spaces for smoogipoo 2017-08-21 17:44:39 +09:00
Dean Herbert
877c69d5fe Add local chat echo support 2017-08-21 17:43:26 +09:00
Jorolf
9b20da94e7 change Query to AllRulesets 2017-08-19 22:07:03 +02:00
Jorolf
bae1340b50 mask the settings overlay 2017-08-19 17:00:01 +02:00
Dean Herbert
d6249e7a63 Add support for binding mouse buttons to actions 2017-08-18 20:01:41 +09:00
naoey
7ad4c046db Make current value behaviour between channels and tabs consistent. 
- Trim whitespace
 2017-08-18 13:35:48 +05:30
Dan Balasescu
f5c3af2f20 Merge branch 'master' into fix-nullref 2017-08-18 12:38:20 +09:00
Dean Herbert
02aa38d1c2 Merge branch 'master' into toolbar-button-swap 2017-08-18 11:18:19 +09:00
Dean Herbert
e4b832e8a6 Fix a possible nullref when login fails 2017-08-18 10:49:41 +09:00
MrTheMake
6118209200 Fix unlit initial state of the OnScreenDisplay 2017-08-17 18:46:16 +02:00
Dean Herbert
f459794665 Update MainSettings.cs 2017-08-17 18:11:15 +09:00
Dean Herbert
58b1e9c954 Remove unused DI retrieval 2017-08-17 17:47:55 +09:00
Dean Herbert
a19fc28cff Visually improve settings transitions and back button 2017-08-17 17:31:14 +09:00
naoey
4f7ae1ed8b Clear messages when the current channel is removed. 
- Stop using TabContainer.Children
 2017-08-17 09:00:45 +05:30
Dan Balasescu
69a3251f61 Merge branch 'master' into toolbar-button-swap 2017-08-17 10:39:02 +09:00
Thomas Müller
4ef1be3080 More localised key binding hover colour logic 2017-08-17 08:43:45 +09:00
MrTheMake
94d664a626 Swap the order of the social and chat toolbar buttons 2017-08-16 17:00:30 +02:00
Dean Herbert
0c19202b9a Add basic back button 2017-08-16 23:20:18 +09:00
Dean Herbert
e64f455ff7 Escape to cancel, again 2017-08-16 23:01:10 +09:00
Dean Herbert
71f83dbdfa Add null check for safety 2017-08-16 22:56:32 +09:00
Dean Herbert
5ebec53970 Integrate key binding config with main settings 2017-08-16 22:56:32 +09:00
Dean Herbert
7e21ddb5eb Remove usage of HideOnEscape 2017-08-16 22:56:32 +09:00
Thomas Müller
16372d9b45 Merge branch 'master' into key-config-settings 2017-08-16 17:48:00 +09:00
Dean Herbert
7e1fc47b76 Fix forgotten rename 2017-08-16 17:43:01 +09:00
Dean Herbert
3df51540e1 Code review fixes 2017-08-16 17:39:57 +09:00
Dean Herbert
dc82a88bb8 Improve namespaces of key bindings 2017-08-16 17:24:01 +09:00
Dean Herbert
25a3835c3c Cancel pending sidebar expansion when a button is clicked 2017-08-16 17:06:20 +09:00
Dean Herbert
89987229de Merge remote-tracking branch 'origin/is-alive' into key-config-settings 2017-08-16 15:49:43 +09:00
Dean Herbert
a5007fc64f Fix some remaining usage of local InputManager instances 2017-08-16 13:07:18 +09:00
Dean Herbert
c221472d6e Code tidy-ups 2017-08-16 01:19:21 +09:00
Dean Herbert
72eb082f91 Use .Equals 2017-08-16 01:14:37 +09:00
Dean Herbert
9c75df884f Add initial implementation of KeyConfiguration overlay 2017-08-16 00:17:33 +09:00
Dean Herbert
143ff695ef Remove unused using statements 2017-08-15 17:44:04 +09:00
Dean Herbert
6ded194c53 Remove all usage of DI to retrieve InputManager 
Uses GetContainingInputManager instead, as per framework changes.
 2017-08-15 14:30:50 +09:00
Dean Herbert
dccefe1c0e Make the settings sidebar optional 
Also removes an unnecessary secondary list of SidebarButtons by using generic containers.
 2017-08-14 14:40:48 +09:00
naoey
381c709639 Fix selectorTab Depth if it's wonky when new tabs are added. 2017-08-14 10:11:34 +05:30
naoey
8dbbc623c7 Add next tab selection logic in game, make IsRemovable public. 
- Don't clear DrawableChannel when unjoined
 2017-08-14 10:11:30 +05:30
naoey
3b6ffadcc7 Renaming to match framework changes. 
- IsClosable -> IsRemovable
- EasingTypes -> Easing
- Also remove all messages on a channel being un-joined
 2017-08-14 10:11:25 +05:30
naoey
2ae3ce8b91 Add ability to close chat tabs. 2017-08-14 10:11:14 +05:30
Dean Herbert
66fa84a451 Make settings more modular 2017-08-14 13:09:59 +09:00
Dean Herbert
fe2911f165 Fix some formatting issues 2017-08-13 10:36:57 +09:00
Dean Herbert
48d4ed55e9 Move a lot of code to framework 2017-08-11 16:11:46 +09:00
Jorolf
15e4e487e2 I hope this works 2017-08-09 22:58:06 +02:00
Jorolf
acc9b20b0f move another thing to LoadComplete instead of the constructor 2017-08-09 22:37:05 +02:00
Jorolf
c877a5a8b7 update TestCase 2017-08-09 19:26:27 +02:00
Jorolf
c2c9095b02 fix CI issues 2017-08-09 18:57:55 +02:00
Jorolf
274ebbd1f7 remove duplicated code and "simplify" ShowMore logic 2017-08-09 18:45:37 +02:00
Jorolf
9f005488f7 make it work again after merge 2017-08-09 17:32:09 +02:00
Jorolf
7d7cfe5d92 Merge branch 'master' of git://github.com/ppy/osu into ranks-section 2017-08-08 23:13:25 +02:00
Jorolf
1c2329f111 generalize the hover code 2017-08-08 23:11:46 +02:00
Huo Yaoyuan
8843d97895 Remove depth setting in SectionsContainer and profile. 2017-08-05 18:01:10 +08:00
Dean Herbert
0d9ea97828 Allow Rulesets to create a non-FontAwesome icon 
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
 2017-08-03 14:36:21 +09:00
MrTheMake
4d8e5898fd Updates according to the framework and formatting 2017-08-01 17:28:18 +02:00
Dean Herbert
209d024caa Merge branch 'master' into musiccontroller-canbeatmapchange 2017-08-01 11:54:05 +09:00
Dean Herbert
f67822a59b Add progress for deleting all maps 2017-07-31 18:52:59 +09:00
Dean Herbert
57d45b180c Merge remote-tracking branch 'upstream/master' into import-from-stable 2017-07-31 17:31:10 +09:00
Dean Herbert
502ccae0ca Merge branch 'master' into notification-improvements 2017-07-31 17:12:11 +09:00
Jorolf
02a22e3f77 remove empty argument list 2017-07-29 15:16:31 +02:00
Jorolf
cca49d6ed5 some renaming, a show more button and a placeholder if no scores exist 2017-07-29 15:06:46 +02:00
Jorolf
4720a47363 Merge branch 'master' of git://github.com/ppy/osu into ranks-section 2017-07-29 00:45:14 +02:00
Jorolf
88f206cfe4 rename file 2017-07-29 00:39:47 +02:00
Jorolf
0fc36065f4 replace Play with Score 2017-07-29 00:31:52 +02:00
Dean Herbert
4bb8f40b49 AutoSize notifications (and add animation) 2017-07-28 17:00:30 +09:00
Dean Herbert
74044baeff Don't cancel a ProgressNotification when clicking by default 2017-07-28 17:00:27 +09:00
Dean Herbert
b3e3c4a226 Fix setting a ProgressNotification's progress too early crashing 2017-07-28 17:00:24 +09:00
Dean Herbert
5dfed1dba5 Add word-wrap functionality of ProgressNotification 
Fixes a potential threading issue when updating Text.
 2017-07-28 17:00:20 +09:00
Dean Herbert
0d332d4754 Fix NotificationOverlay no longer automatically displaying 2017-07-28 16:59:42 +09:00
Dean Herbert
a55586f2ad FIx potential sequence of execution issues in PlaylistOverlay 2017-07-28 15:04:58 +09:00
Dean Herbert
02a04afb29 Ensure notification posts are always scheduled to local thread 
Posts can be triggered by Logger.Log events which are not guaranteed to be on the update thread.
 2017-07-28 15:03:53 +09:00
Dean Herbert
f705589bf2 Rename NotificationManager to NotificationOverlay 2017-07-28 15:03:42 +09:00
Dean Herbert
e448f79154 Fix deleted beatmaps not correctly being removed from the playlist 2017-07-28 12:58:35 +09:00
Dean Herbert
7d4218ea6c Add option to import from osu-stable 
Also adds an option to delete all beatmaps for testing purposes.
 2017-07-28 12:58:35 +09:00
EVAST9919
3263aa2ca7 Always return true while dragging 2017-07-27 17:02:23 +03:00
EVAST9919
eb4880cdd5 Applied suggestions 2017-07-27 16:33:10 +03:00
EVAST9919
ed08bcf844 Merge remote-tracking branch 'refs/remotes/ppy/master' into chat_dragging 2017-07-27 16:19:21 +03:00
Dean Herbert
6f4efbeda6 Merge remote-tracking branch 'upstream/master' into database-tidy 2017-07-27 17:41:29 +09:00
Dean Herbert
5f53426a9a *Database -> *Store 
Welcome back BeatmapManager
 2017-07-27 16:56:41 +09:00
Dan Balasescu
d375459fa9 Merge branch 'master' into chat-line-word-wrap 2017-07-27 16:54:15 +09:30
Dean Herbert
cbe7b08642 Make BeatmapStore's BeatmapDatabase private 2017-07-27 15:34:13 +09:00
Dean Herbert
96b08b8777 Simplify and document DatabaseStore API 2017-07-27 15:06:10 +09:00
Jorolf
7b8997cfc2 CI stuff 2017-07-26 19:42:34 +02:00
Jorolf
8e685a98d4 add RanksSection 2017-07-26 19:21:45 +02:00
Dean Herbert
9e20a02c0a Split out BeatmapDatabase into BeatmapStore 
Hide database functionality at a lower level in preparation from eventually making it private.
 2017-07-26 16:31:34 +09:00
Dean Herbert
fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
Dean Herbert
3c7546e2c1 Merge remote-tracking branch 'upstream/master' into no-more-colourinfo 2017-07-25 10:14:48 +09:00
Dean Herbert
ed7bb329de Add word wrap support to chat 2017-07-24 18:11:25 +09:00
Dean Herbert
038e47ceda Merge branch 'master' into drawableflag-ctor 2017-07-24 16:46:20 +09:00
Nabile Rahmani
c80f5c708a Less verbose DrawableFlag constructor. 2017-07-24 09:25:49 +02:00
Dean Herbert
750d96be8f Merge branch 'master' into playlist-beatmaplist-sync 2017-07-24 14:12:04 +09:00
Ben Pig Chu
950c55d6d0 No need to dispose/unbind the delegates 2017-07-24 13:10:51 +08:00
Dean Herbert
64f2e2dc32 Use Colour instead of ColourInfo 2017-07-23 13:06:16 +02:00
EVAST9919
dd96e101d4 Merge remote-tracking branch 'refs/remotes/ppy/master' into chat_dragging 2017-07-23 13:26:23 +03:00
Ben Pig Chu
76edcb4a67 Update playlist when adding or removing beatmap set 2017-07-23 14:21:10 +08:00
Thomas Müller
e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
Thomas Müller
e36b65bfe0 Merge branch 'master' into better-transforms 2017-07-22 10:50:58 +02:00
Dean Herbert
7549d3a2c4 Allow ChatLines to exist without UserProfileOverlay 
Fixes testcases failing when logged in.
 2017-07-22 17:18:20 +09:00
Thomas Müller
0f2bcb2904 Update framework 2017-07-21 18:23:01 +02:00
Thomas Müller
a7dc8a892b Update framework 2017-07-21 17:24:09 +02:00
EVAST9919
66f816692f Better boolean naming 2017-07-21 13:40:09 +03:00
EVAST9919
270ab5c987 Allow ChatOverlay resize only if it dragged by the tabs area only 2017-07-21 13:37:22 +03:00
Thomas Müller
2cd8f6b30c Merge branch 'master' of github.com:ppy/osu into better-transforms 
# Conflicts:
#	osu-framework
 2017-07-21 11:15:26 +02:00
Dean Herbert
cb3402098a Merge remote-tracking branch 'upstream/master' into user-profile-fixes 2017-07-20 19:32:00 +09:00
Dean Herbert
3bdd4d7d02 Centralise TrackManager.AddItem logic to avoid duplicate adds 2017-07-20 17:46:33 +09:00
Dean Herbert
67b95926c4 Remove usage of SetExclusive 
Also immediately disposes WorkingBeatmaps on ValueChanged.
 2017-07-20 16:45:44 +09:00
Jorolf
bac8693c81 Merge branch 'user-profile-fixes' of github.com:Jorolf/osu into user-profile-fixes 2017-07-20 01:08:42 +02:00
Jorolf
e0fb2563b5 remove using 2017-07-20 01:08:26 +02:00
jorolf
c2a2f77210 Merge branch 'master' into user-profile-fixes 2017-07-20 01:06:36 +02:00
Jorolf
b016103894 add link to user page 2017-07-20 01:03:00 +02:00
Thomas Müller
c4619f614a Merge branch 'master' of github.com:ppy/osu into better-transforms 
# Conflicts:
#	osu-framework
 2017-07-19 19:15:51 +02:00
MrTheMake
6ff2b73c30 Merge branch 'master' of https://github.com/ppy/osu into musiccontroller-canbeatmapchange 2017-07-19 16:50:29 +02:00
Dean Herbert
2c5019ff7c Forward action in saner way 2017-07-19 18:22:46 +09:00
Dean Herbert
b6b7ae47db Merge branch 'master' into user-profile-fixes 2017-07-19 18:15:38 +09:00
Dean Herbert
2eccb3822a Make link text not suck 2017-07-19 17:54:04 +09:00
Dean Herbert
59416584c1 Don't show theme song in playlist 2017-07-19 15:16:35 +09:00
Thomas Müller
4d8261fe0b Merge branch 'master' of https://github.com/ppy/osu into better-transforms 
# Conflicts:
#	osu-framework
#	osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
#	osu.Game/Overlays/DragBar.cs
 2017-07-18 15:16:02 +03:00
Thomas Müller
a225b542d5 Sender is always non-null 2017-07-18 12:35:36 +03:00
Thomas Müller
fce5a191f1 Migrate padding into the scroll content to not cut off effects 2017-07-18 12:26:27 +03:00
Thomas Müller
e58ea97604 Improve design as requested 2017-07-18 12:26:05 +03:00
Thomas Müller
c8eeea64c3 Merge branch 'master' of https://github.com/ppy/osu into custom-chat-colours 2017-07-18 10:54:15 +03:00
Thomas Müller
e72c009dd7 Highlight custom-named users 2017-07-18 10:53:41 +03:00
Dean Herbert
4b4b03756a Don't use dodgy OnLoaded "event" 2017-07-18 15:37:58 +09:00
Dean Herbert
82217be988 Fix dodgy event clearing 
Also use local ariables where possible.
 2017-07-18 15:24:52 +09:00
Dean Herbert
c5d23daa6b Merge remote-tracking branch 'upstream/master' into remove-dragbar 
# Conflicts:
#	osu.Game/Overlays/DragBar.cs
 2017-07-18 13:44:23 +09:00
Dean Herbert
4229f933fe Rename link class, add hover colour 2017-07-18 10:51:11 +09:00
Jorolf
9c70d03a33 replace SpriteText with OsuSpriteText 2017-07-17 21:12:50 +02:00
Jorolf
80dc888769 address CI concerns 2017-07-17 21:11:54 +02:00
Jorolf
edd4e622cf add hyper links to twitter, website and skype 2017-07-17 20:31:10 +02:00
Jorolf
b9eb7a8445 make chat message users open UserProfileOverlay 2017-07-17 20:26:55 +02:00
Jorolf
689866f5dd minor improvements 2017-07-17 20:25:57 +02:00
Thomas Müller
87bcd526f3 Get rid of raw AddDelay calls within osu.Game 2017-07-17 16:51:21 +03:00
Dean Herbert
93290ef966 Rename populate method 2017-07-17 13:56:50 +09:00
Dean Herbert
a63124c935 User property instead of weirdly named method 2017-07-17 13:39:29 +09:00
Dean Herbert
f322c264a0 One constant per line 2017-07-17 13:24:05 +09:00
Dean Herbert
5d77a5f988 Allow closing profile by clicking basically anywhere 2017-07-17 10:15:55 +09:00
Thomas Müller
19fb03e737 Try different formatting style 2017-07-16 18:28:20 +03:00
Thomas Müller
032e9df67b ApplyDelay -> AddDelay 2017-07-16 17:47:29 +03:00
Thomas Müller
99221260c4 Replace several usages of BeginDelayedSequence with LINQ-style 2017-07-16 17:42:01 +03:00
Thomas Müller
71105bb9ee Delay -> ApplyDelay; DelayReset -> ResetDelay 2017-07-16 14:06:46 +03:00
Thomas Müller
6063219b72 Update framework 2017-07-16 13:59:26 +03:00
Thomas Müller
a5e610a7ba Update framework and fix compilation 
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
 2017-07-14 19:18:12 +03:00
Huo Yaoyuan
26b36c08a3 Prefer ScrollTo in SectionsContainer. 2017-07-14 22:56:27 +08:00
Huo Yaoyuan
6cf36da389 Merge branch 'master' into profile 2017-07-14 22:52:19 +08:00
MrTheMake
c0fd4a765e Removed unused variable 2017-07-14 12:46:07 +02:00
MrTheMake
d2c18026f2 Removed unnecessary variables 2017-07-14 12:45:24 +02:00
MrTheMake
a95339dc1d Removed the reopening of the playlist overlay 2017-07-14 12:37:56 +02:00
MrTheMake
c053733ea9 Updated to use ppy's implementation 2017-07-14 12:09:55 +02:00
MrTheMake
8e0d59bfed Updated to use ppy's implementation 2017-07-14 12:08:56 +02:00
Dan Balasescu
fa0c0e3b48 Merge branch 'master' into fix-track-rotation 2017-07-14 19:38:48 +10:00
Dan Balasescu
c13dc943f8 Merge branch 'master' into fix-track-rotation 2017-07-14 19:25:54 +10:00
Dan Balasescu
a6d917285a Merge branch 'master' into settings-improvements 2017-07-14 19:22:45 +10:00
Dan Balasescu
3914b3ba13 Merge branch 'master' into right-mouse-scrollbar 2017-07-14 19:15:00 +10:00
Dean Herbert
9dba363b08 Use button boundaries to decide when to expand sidebar 2017-07-14 17:57:01 +09:00
Dean Herbert
b957bca4c5 Merge branch 'master' into settings-improvements 2017-07-14 17:27:09 +09:00
Dean Herbert
3aeed86392 Merge branch 'master' into drawable-room-update 2017-07-14 15:29:27 +09:00
Dean Herbert
bce4b838d8 Formatting 2017-07-14 14:40:50 +09:00
Dean Herbert
133bcdec7a Move async loading to a higher level to simplify logic 2017-07-14 14:39:15 +09:00
Dean Herbert
980fb18ed6 Remove unnecessary alpha/alwayspresent changes 2017-07-14 14:30:35 +09:00
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
ce204b8e7b Merge remote-tracking branch 'ppy/master' into right-mouse-scrollbar 2017-07-14 06:23:07 +09: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
fc28617099 Merge remote-tracking branch 'upstream/master' into ruleset-settings 2017-07-13 15:35:53 +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
b13e8599f1 Hide the login overlay when the user panel container by it is clicked 2017-07-13 14:46:17 +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
fea40ccc1a Share BeatmapSet cover sprite code. 2017-07-13 01:17:47 -03: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
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
Dean Herbert
54f6befd67 Merge branch 'master' into fix-track-rotation 2017-07-12 13:18:16 +09:00
Thomas Müller
9d523ea012 Update framework 2017-07-12 11:06:13 +09:00
DrabWeb
204d2ee43d Convert MedalOverlay animation durations to constants. 2017-07-11 22:43:16 -03:00
DrabWeb
29cdbc65bc CI fixes. 2017-07-11 22:38:13 -03:00
DrabWeb
aef2a3bdda Cleanup. 2017-07-11 22:26:58 -03:00
DrabWeb
16bb96e6aa Async medal sprite loading. 2017-07-11 22:12:49 -03:00
Jorolf
f7c9e449d4 add ruleset settings 2017-07-11 20:25:24 +02:00
Dean Herbert
773ef26ce3 Make MusicController support disabled beatmap bindable 2017-07-11 18:38:49 +09:00
Dean Herbert
311c2aec1c Fix next track not automatically playing when music controller is not visible 2017-07-11 17:53:36 +09:00
DrabWeb
2ee0f3f5f6 Update with framework changes. 2017-07-11 02:11:08 -03:00
DrabWeb
202e3ca530 Merge https://github.com/ppy/osu into medal-splash 2017-07-11 02:00:36 -03:00
DrabWeb
a9ff0b5317 Make SlimMenu more opaque. 2017-07-11 01:59:52 -03:00
DrabWeb
b448603d6c CI fixes. 2017-07-11 01:42:51 -03:00
DrabWeb
fc7b4ceff1 Fix osu!direct visual test initially not having a mode selected. 2017-07-11 01:30:59 -03:00
DrabWeb
fbe414d780 Cleanup. 2017-07-11 01:03:38 -03:00
DrabWeb
84701846ec Merge https://github.com/ppy/osu into osu-direct-search 2017-07-11 00:26:49 -03:00
Huo Yaoyuan
752f625a62 Set relative axes inside AsyncLoadWrapper. 2017-07-11 09:19:36 +08:00
Huo Yaoyuan
fd4a054921 Merge branch 'master' into profile 2017-07-11 09:16:32 +08:00
Dean Herbert
d6d79432c9 Update framework 2017-07-11 09:59:08 +09:00
Dean Herbert
0e2dc9388a More changes in-line with framework changes. 2017-07-10 12:55:47 +09:00
Huo Yaoyuan
6f2b49dea8 Merge branch 'master' into profile. 2017-07-10 10:36:23 +08:00
Dean Herbert
f856e89b58 Fix CI issues 2017-07-10 03:37:51 +09:00
Dean Herbert
7952e7caa9 Fix typos 2017-07-10 03:22:08 +09:00
Dean Herbert
2c8b8c3f9c Update loop logic in line with framework changes 2017-07-09 18:23:34 +09:00
Thomas Müller
1b55692368 Merge branch 'master' into better-fill-mode 2017-07-08 12:49:46 +03:00
Thomas Müller
45d07e39c1 Update framework & change logic slightly 2017-07-08 12:41:15 +03:00
Thomas Müller
178685292a Merge branch 'master' of https://github.com/ppy/osu into better-fill-mode 2017-07-08 12:25:08 +03:00