1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-13 21:27:54 +08:00
Commit Graph

6557 Commits

Author SHA1 Message Date
Dean Herbert
a1049ffe01 Merge pull request #1116 from MrTheMake/toolbar-button-swap
Swap the order of the social and chat toolbar buttons
2017-08-18 11:24:10 +09:00
Dean Herbert
02aa38d1c2 Merge branch 'master' into toolbar-button-swap 2017-08-18 11:18:19 +09:00
Dean Herbert
34c1834d38 Merge pull request #1127 from MrTheMake/onscreendisplay-fix
Fix unlit initial state of the OnScreenDisplay
2017-08-18 11:12:42 +09:00
Dean Herbert
d919d8b0a3 Merge branch 'master' into onscreendisplay-fix 2017-08-18 11:06:12 +09:00
Dean Herbert
34698ed983 Merge pull request #1128 from PoULkY/master
Allow OsuButtons to be filtered in settings
2017-08-18 10:43:36 +09:00
PoULkY
cc39aad7f8 Fix OsuButton doesn't implement IFilterable 2017-08-18 01:23:44 +07:00
MrTheMake
6118209200 Fix unlit initial state of the OnScreenDisplay 2017-08-17 18:46:16 +02:00
Dean Herbert
4ad99a2464 Merge pull request #1121 from peppy/settings-transition-fixes
Visually improve settings transitions and back button
2017-08-17 21:18:21 +09: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
a44ff5a2c2 Fix regression causing global hotkeys to no longer work 2017-08-17 17:47:44 +09:00
Dean Herbert
a19fc28cff Visually improve settings transitions and back button 2017-08-17 17:31:14 +09:00
Dean Herbert
18980bc26e Merge pull request #1119 from smoogipooo/fix-testcasehitobjects
Fix hitobjects in TestCaseHitObjects not receiving actions
2017-08-17 13:40:18 +09:00
smoogipooo
cceeb864d5 Fix hitobjects in TestCaseHitObjects not receiving actions. 2017-08-17 12:16:33 +09:00
Dan Balasescu
69a3251f61 Merge branch 'master' into toolbar-button-swap 2017-08-17 10:39:02 +09:00
Dan Balasescu
166301fb2d Merge pull request #1113 from Tom94/use-slider-step
Use SliderStep instead of TestCaseSliderBar
2017-08-17 09:47:11 +09:00
Thomas Müller
94d081064d Merge remote-tracking branch 'origin/master' into use-slider-step 2017-08-17 08:50:48 +09:00
Thomas Müller
d031f4c101 Merge pull request #1118 from peppy/key-config-integration
Integrate key configuration with settings overlay
2017-08-17 08:49:44 +09:00
Thomas Müller
4ef1be3080 More localised key binding hover colour logic 2017-08-17 08:43:45 +09:00
Thomas Müller
118d0f0970 Update framework 2017-08-17 07:28:07 +09:00
Thomas Müller
55b159b976 Remove unnecessary usings 2017-08-17 07:26:24 +09:00
Thomas Müller
8c05a40fbf Use SliderStep instead of TestCaseSliderBar
This greatly simplifies TestCaseKeyCounter and TestCaseHitObject and allows more future automation.
2017-08-17 07:26:24 +09:00
MrTheMake
94d664a626 Swap the order of the social and chat toolbar buttons 2017-08-16 17:00:30 +02:00
Dean Herbert
c6c9c5431f Update framework 2017-08-16 23:22:12 +09:00
Dean Herbert
0c19202b9a Add basic back button 2017-08-16 23:20:18 +09:00
Dean Herbert
09089a3126 Fix potential nullref 2017-08-16 23:20:08 +09:00
Dean Herbert
e64f455ff7 Escape to cancel, again 2017-08-16 23:01:10 +09:00
Dean Herbert
c41ba7b704 Update with latest framework changes 2017-08-16 22:56:32 +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
99c54e348c Merge pull request #1112 from peppy/key-config-settings
Key configuration
2017-08-16 20:09:55 +09:00
Thomas Müller
16372d9b45 Merge branch 'master' into key-config-settings 2017-08-16 17:48:00 +09:00
Thomas Müller
1610cfaa28 Merge pull request #1114 from peppy/fix-sidebar-click-expansion
Cancel pending sidebar expansion when a button is clicked
2017-08-16 17:43:22 +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
54698f2d8f Use IntAction instead of new 2017-08-16 17:27:09 +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
7d00365154 Update framework 2017-08-16 13:24:40 +09:00
Dean Herbert
a5007fc64f Fix some remaining usage of local InputManager instances 2017-08-16 13:07:18 +09:00
Dean Herbert
6ee4716ec5 Update framework 2017-08-16 12:39:18 +09:00
Dean Herbert
2c7f0629ef Merge remote-tracking branch 'upstream/master' into is-alive 2017-08-16 12:11:32 +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
2bd0981738 Improve default key binding logic
Defaults will be added to the database as long as the database has unbalanced counts for any actions.
2017-08-15 23:59:58 +09:00
Dean Herbert
3bee36f6a2 Add index to Action column
Is used for default assignment
2017-08-15 23:59:06 +09:00
Dan Balasescu
5d07711cd4 Merge pull request #1111 from peppy/fix-skip-icons
Fix skip button icons not displaying correctly
2017-08-15 23:03:16 +09:00