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 |
|
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
|
a74ebdfe56
|
Update framework
|
2017-08-15 14:30:25 +09:00 |
|
Dean Herbert
|
97ac8e1a64
|
Update usages of IsAlive/IsLoaded in line with framework changes
|
2017-08-15 13:57:48 +09:00 |
|
Dean Herbert
|
70f148f0b4
|
Fix icons on skip button
|
2017-08-15 09:30:46 +09:00 |
|
Dean Herbert
|
4da76cd98e
|
Initial key configuration UI implementation
|
2017-08-14 22:31:35 +09:00 |
|
Dean Herbert
|
46bfa4db29
|
Load defaults, pass around live IEnumerable, add PK for updating
|
2017-08-14 22:31:23 +09:00 |
|
Dean Herbert
|
7c9d6c9c83
|
Initial refactoring of key binding logic
|
2017-08-14 20:19:25 +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 |
|
Dan Balasescu
|
384b8c0600
|
Merge pull request #1108 from peppy/fix-leaderboard-icons
Fix leaderboard icons not displaying correctly
|
2017-08-14 13:05:22 +09:00 |
|
Dean Herbert
|
c57c106b9d
|
Merge branch 'master' into fix-leaderboard-icons
|
2017-08-14 12:54:54 +09:00 |
|
Dean Herbert
|
9e1ffa27dc
|
Fix leaderboard icons not displaying correctly
|
2017-08-14 12:52:20 +09:00 |
|
Dan Balasescu
|
371917838f
|
Merge pull request #1098 from MillhioreF/MillhioreF/fix_stable_import_errors
Fix or clarify various errors when importing from stable
|
2017-08-14 12:51:39 +09:00 |
|
Dan Balasescu
|
bdf064e6ee
|
Merge branch 'master' into MillhioreF/fix_stable_import_errors
|
2017-08-14 12:40:35 +09:00 |
|
MillhioreF
|
e216bfcf10
|
Recommended fixes (obsolete try/catch, fix infinite loop during variable parsing in a better way)
|
2017-08-13 00:40:05 -05:00 |
|
Thomas Müller
|
07487b5ca9
|
Merge pull request #1101 from peppy/global-bindings
Fix some formatting regressions
|
2017-08-13 11:22:17 +09:00 |
|
Dean Herbert
|
fe2911f165
|
Fix some formatting issues
|
2017-08-13 10:36:57 +09:00 |
|
Dean Herbert
|
b822c7dd3e
|
Merge pull request #1094 from peppy/global-bindings
Implement KeyBindings for rulesets and osu! game
|
2017-08-12 23:32:57 +09:00 |
|
Dean Herbert
|
b6fb68c6e2
|
Update framework
|
2017-08-12 22:13:40 +09:00 |
|
Dean Herbert
|
99458aab48
|
Propagate framework updates
|
2017-08-12 19:54:07 +09:00 |
|
Dean Herbert
|
48d4ed55e9
|
Move a lot of code to framework
|
2017-08-11 16:11:46 +09:00 |
|
Dean Herbert
|
8ae010f62b
|
Don't pass through repeat events if we've already handled an action
|
2017-08-11 11:46:21 +09:00 |
|
Dean Herbert
|
a93a92a2bb
|
Remove GlobalHotkeys
|
2017-08-10 19:52:45 +09:00 |
|
Dean Herbert
|
641b3bd27e
|
Improve documentation
|
2017-08-10 19:36:47 +09:00 |
|
Dean Herbert
|
798fff00b2
|
Remove shortcomings, remove InputState.Data usage, make everything amazing
No more casting!
|
2017-08-10 19:28:24 +09:00 |
|
Dean Herbert
|
1fe273cbc0
|
Move GameplayCursor to osu! ruleset and make work with OsuActions
|
2017-08-10 18:37:41 +09:00 |
|
Dean Herbert
|
e9a11ebc9f
|
Use new population methods and implement osu! ruleset actions
|
2017-08-10 18:31:12 +09:00 |
|
Dean Herbert
|
b6bb07c0b5
|
Add ConcurrentActionModes to support osu! gameplay more easily
|
2017-08-10 18:28:22 +09:00 |
|
Dean Herbert
|
c82db54fb5
|
Rename OsuAction to GlobalAction
|
2017-08-10 17:22:08 +09:00 |
|
Dean Herbert
|
6ba5bdf1e6
|
Add description attributes to all actions
|
2017-08-10 17:14:30 +09:00 |
|
Dean Herbert
|
da50101c25
|
Don't match on partial key chords when concurrent is disallowed
|
2017-08-10 16:45:33 +09:00 |
|
Dean Herbert
|
d9e36237c7
|
Move all OsuGame events to OsuAction
|
2017-08-10 16:45:10 +09:00 |
|
Dean Herbert
|
30bd1d70b5
|
ActionMapping doesn't support concurrent actions by default
But can when required. Also supports key combination bindings now.
|
2017-08-10 16:08:43 +09:00 |
|
MillhioreF
|
e42c279229
|
More generic catching for broken hitobject strings
|
2017-08-10 01:50:20 -05:00 |
|
MillhioreF
|
2e5a7374a8
|
Actually use mapName whoops
|
2017-08-10 01:49:34 -05:00 |
|
MillhioreF
|
f819ffce2b
|
Make the legacy decoder more resilient against leading linebreaks
|
2017-08-10 00:08:39 -05:00 |
|
MillhioreF
|
c16dbc05aa
|
Add new error for malformed (too many variables) hit objects during import
|
2017-08-09 23:41:22 -05:00 |
|
MillhioreF
|
64d92c1557
|
Fix infinite loop when importing maps that have storyboard elements with '$' in the filename
|
2017-08-09 23:31:18 -05:00 |
|