1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 05:27:23 +08:00
Commit Graph

1351 Commits

Author SHA1 Message Date
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
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
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
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
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
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