Commit Graph

149 Commits

Author SHA1 Message Date
Huo Yaoyuan f05b83d7d4 Use typeparamref. 2019-11-17 20:48:23 +08:00
Huo Yaoyuan e9b8cbb516 Apply other styles. 2019-11-11 20:27:04 +08:00
Huo Yaoyuan ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
Dean Herbert b59973c712 Update in line with framework changes 2019-08-27 18:43:58 +09:00
Dean Herbert 5963f7d914 Update comment 2019-08-13 19:52:40 +09:00
Dean Herbert 5dbde38a6b Group key bindings together 2019-08-13 12:40:20 +09:00
Dean Herbert f3380c9372 Remove "jukebox" terminology 2019-08-13 12:06:57 +09:00
Lucas A e4eed83d85 Add dual bindings for Jukebox hotkeys 2019-08-11 19:14:49 +02:00
Lucas A 7825923cb6 Use media keys as default bindings for jukebox. 2019-08-10 16:33:16 +02:00
Lucas A 8c630b4f4c Merge branch 'refactor-osd' into music-controller-hotkeys 2019-08-10 16:25:59 +02:00
Dean Herbert b6e15fb791 Update framework 2019-07-11 22:33:51 +09:00
Lucas A b32b078e48 Set default keybindings for jukebox to stable's ones. 2019-07-10 21:55:43 +02:00
Lucas A 5f8bd6eca7 Fix CI issues + minor issues 2019-07-05 16:51:15 +02:00
Lucas A 70372dd03d Add global actions for game-wide music jukebox manipulation 2019-07-05 16:14:04 +02:00
Dean Herbert 93b6d5b7e3 Fix keybindings being offset 2019-06-25 17:16:19 +09:00
Dean Herbert 2ea5165803 Change case to match; change hotkey to be more globally usable (previous has conflict on macOS) 2019-06-24 18:19:17 +09:00
Dean Herbert d70248338d Merge remote-tracking branch 'upstream/master' into quickEscape 2019-06-24 18:14:48 +09:00
Dean Herbert c39c37a18d Apply more missed cases 2019-04-01 12:44:46 +09:00
Dean Herbert 0788a7e9f1
Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Dean Herbert 42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
Dean Herbert 26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
smoogipoo d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
Dean Herbert 4a59ccb81d
Merge branch 'master' into fix-idle-weirdness 2019-01-25 17:52:59 +09:00
Dean Herbert 8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Dean Herbert 4c2c7bd937 Fix global idle state being entered when overlays are visible 2019-01-04 16:26:10 +09:00
Dean Herbert 271dcded3c
Merge branch 'master' into scoredatabase 2018-11-30 14:59:58 +09:00
Jack Scotson e11b2218cb
Merge branch 'master' into keypad-enter 2018-11-29 13:51:07 +00:00
smoogipoo 14ff4bc26a Move primary key attribute to IHasPrimaryKey 2018-11-28 13:19:23 +09:00
Dean Herbert 32b36f2883 Use IBindable<> 2018-11-26 17:07:30 +09:00
Dean Herbert 266873740d Specify RelativeSizeAxes in ctor
This is basically always the behaviour we want.
2018-11-26 17:07:20 +09:00
Dean Herbert 68f0d25550 Mvoe private method to bottom 2018-11-26 16:33:58 +09:00
Dean Herbert 8d65d49126 Use bindable flow for checking idle time 2018-11-26 16:32:59 +09:00
Dean Herbert fe5b043a59
Merge branch 'master' into fix_idle_tracker 2018-11-26 15:24:44 +09:00
smoogipoo f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Roman Kapustin 285b199d7d Make IdleTracker IHandleGlobalInput 2018-11-19 20:50:46 +03:00
Roman Kapustin 3c0ce2b615 Revert "Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle""
This reverts commit bcdaee7d39.
2018-11-19 20:48:59 +03:00
smoogipoo bcdaee7d39 Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle"
This reverts commit 3e2e2a7000, reversing
changes made to d94801b6c6.
2018-11-19 17:52:31 +09:00
Scotsoo 4dab5db2e5 Allowing keypad enter to be used along with normal enter 2018-11-13 17:09:28 +00:00
Dean Herbert eaa5ef5168
Merge branch 'master' into return_to_large_logo_after_idle 2018-10-12 22:14:23 +09:00
Dean Herbert 841b2e8692
Merge branch 'master' into consistent-terminology-format 2018-10-10 19:19:36 +09:00
Roman Kapustin baf9e028c3 Fix possible idleTracker nullref 2018-09-26 19:44:01 +03:00
ekrctb c8e9d9375f Use new InputStateChangeEvent for RulesetInputManager 2018-09-19 11:36:55 +09:00
Joehu f99eff1192 Use consistent terminology format 2018-09-15 07:30:11 -07:00
Dean Herbert 0f37758314 Update framework 2018-07-21 16:21:53 +09:00
HoutarouOreki 4cc22387d4 Avoid interversion key configuration conflicts 2018-07-11 12:03:05 +02:00
HoutarouOreki ffe82aad25 Add basic quick exit functionality 2018-07-10 21:57:09 +02:00
Dean Herbert 5fc17bacf3 Add "Select" action
Allows progressing forwards in the interface
2018-07-03 18:39:15 +09:00
smoogipoo f0ec117bcb Merge remote-tracking branch 'origin/master' into add-scroll-speed-keybinds
# Conflicts:
#	osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
2018-07-02 17:21:18 +09:00
ekrctb d6084c0b30 Adapt to new input handling changes 2018-06-22 18:10:27 +09:00
Dean Herbert 7f0cb0bbf6 Add key bindings for scroll speed
Closes #2689.
- [ ] Depends on ppy/osu-framework#1569 being fixed.
2018-05-31 12:10:53 +09:00