1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 21:43:04 +08:00
Commit Graph

6503 Commits

Author SHA1 Message Date
Shane Woolcock
b1abf83fee Change spinner action checks to switches 2017-08-16 17:51:57 +09:30
Dean Herbert
ceead888b5 Merge branch 'master' into fix-spinner-ignoring-actions 2017-08-16 17:00:53 +09:00
Shane Woolcock
9448e2f192 Remove unnecessary OnMouseDown/Up from SpinnerDisc 2017-08-16 17:25:48 +09:30
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
Shane Woolcock
9e5deb63d1 Fix spinner not handling left/right action bindings 2017-08-15 16:42:26 +09:30
Dean Herbert
70f148f0b4 Fix icons on skip button 2017-08-15 09:30:46 +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
MillhioreF
a8cf7ff93a Add a better error message for corrupt maps with no .osu files 2017-08-09 23:27:13 -05:00
MillhioreF
10321497ca Add decoder entries for v3/4 2017-08-09 21:21:43 -05:00
Dean Herbert
720bd38d8e Fix CI issues 2017-08-09 17:30:37 +09:00
Dean Herbert
34b12fbfa4 Add global actions; improve default assignment 2017-08-09 17:10:32 +09:00
Dan Balasescu
bd84e507de Merge pull request #1093 from peppy/catch
Stored bindings, more catch and less HitRenderer
2017-08-09 15:26:54 +09:00
Dean Herbert
459a4cafb1 Remove unnecessary HandleInput 2017-08-09 15:17:05 +09:00
Dean Herbert
3b48a6c668 Fix CI issues 2017-08-09 15:15:41 +09:00
Dean Herbert
976cff9af6 Merge remote-tracking branch 'upstream/master' into catch
# Conflicts:
#	osu.Desktop.Tests/Visual/TestCaseScrollingPlayfield.cs
2017-08-09 15:08:43 +09:00
Dean Herbert
1afe8eba7c Merge pull request #1087 from smoogipooo/timingchange-improvements
Rework scrolling playfields to be a lot more usable.
2017-08-09 14:56:40 +09:00
smoogipooo
e6c100da27 Fix CI. 2017-08-09 14:51:00 +09:00
smoogipooo
2715324a76 Fix possible incorrect reversing behavior for horizontal playfields. 2017-08-09 14:50:52 +09:00
Dean Herbert
c70f96a9cd Add basic documentation and split out classes. 2017-08-09 14:50:10 +09:00
smoogipooo
f70c00423a Missed one. 2017-08-09 14:25:49 +09:00
smoogipooo
ea073c02b3 Showcase both horizontal and vertical styles in TestCaseScrollingPlayfield. 2017-08-09 14:24:48 +09:00
smoogipooo
346aebebc0 Fix origins not being set correctly when reverting from reversed playfield. 2017-08-09 14:24:48 +09:00