MrTheMake
|
f831832c59
|
CI fix
|
2017-08-19 00:13:06 +02:00 |
|
MrTheMake
|
6d401b5f21
|
Merge branch 'master' into leaderboard-scores
|
2017-08-19 00:00:40 +02:00 |
|
Dean Herbert
|
41072640c8
|
Merge pull request #1115 from swoolcock/fix-sliders-ignoring-actions
Fix sliders ignoring actions past the initial hitcircle
|
2017-08-19 00:44:36 +09:00 |
|
Dean Herbert
|
a8996b8b5f
|
Merge branch 'master' into fix-sliders-ignoring-actions
|
2017-08-19 00:30:40 +09:00 |
|
Dean Herbert
|
1249cc8eb9
|
Merge pull request #1095 from smoogipooo/taiko-timingchanges-2
Make taiko use the new ScrollingPlayfield.
|
2017-08-18 22:51:07 +09:00 |
|
Dean Herbert
|
86d97aa16b
|
Merge branch 'master' into taiko-timingchanges-2
|
2017-08-18 22:44:36 +09:00 |
|
Dean Herbert
|
49422a61d7
|
Merge pull request #1099 from swoolcock/fix-track-not-resetting
Fixes an issue where a beatmap would not reset after playing it
|
2017-08-18 22:39:28 +09:00 |
|
Dean Herbert
|
c34033c94a
|
Merge branch 'master' into fix-track-not-resetting
|
2017-08-18 22:31:59 +09:00 |
|
Dean Herbert
|
bc7621607a
|
Merge upstream/master in.
|
2017-08-18 22:20:45 +09:00 |
|
Dan Balasescu
|
df2a5835eb
|
Merge pull request #1131 from peppy/actionable-mouse-buttons
Add support for binding mouse buttons to actions
|
2017-08-18 21:52:58 +09:00 |
|
Dean Herbert
|
d6249e7a63
|
Add support for binding mouse buttons to actions
|
2017-08-18 20:01:41 +09:00 |
|
Shane Woolcock
|
7e0fe6cbcb
|
Fix slider tracking to use pressed actions rather than directly querying the mouse buttons
|
2017-08-18 20:19:23 +09:30 |
|
Dean Herbert
|
c0c90f85af
|
Merge pull request #1110 from swoolcock/fix-spinner-ignoring-actions
Fix spinner not handling left/right action bindings
|
2017-08-18 19:31:22 +09:00 |
|
Shane Woolcock
|
9558d2a161
|
Remove unnecessary using
|
2017-08-18 19:39:28 +09:30 |
|
Shane Woolcock
|
44feef78f1
|
Simplify OsuActionInputManager property
|
2017-08-18 19:32:08 +09:30 |
|
Shane Woolcock
|
4901ac9e35
|
Add some comments explaining why the Track is being forcefully added to the TrackManager
|
2017-08-18 18:01:18 +09:30 |
|
Dean Herbert
|
ffc8f763e5
|
Merge branch 'master' into fix-track-not-resetting
|
2017-08-18 17:24:22 +09:00 |
|
naoey
|
7ad4c046db
|
Make current value behaviour between channels and tabs consistent.
- Trim whitespace
|
2017-08-18 13:35:48 +05:30 |
|
Shane Woolcock
|
529732ea47
|
More CI fixes
|
2017-08-18 16:58:01 +09:30 |
|
Shane Woolcock
|
90dacd9861
|
Trim whitespace
|
2017-08-18 16:49:10 +09:30 |
|
Shane Woolcock
|
9628c0b6d6
|
Change spinner to check currently pressed actions rather than implementing IKeyBindingHandler
|
2017-08-18 16:46:00 +09:30 |
|
Shane Woolcock
|
9c6ca2d159
|
Add lazy weak property to DrawableOsuHitObject to find and cache the containing OsuInputManager, if it exists
|
2017-08-18 16:34:01 +09:30 |
|
Shane Woolcock
|
306c00e593
|
Update framework to include PR #977
|
2017-08-18 16:26:48 +09:30 |
|
Shane Woolcock
|
f951120775
|
Merge branch 'master' into fix-spinner-ignoring-actions
|
2017-08-18 16:25:26 +09:30 |
|
Dan Balasescu
|
9cda37a386
|
Merge pull request #1102 from swoolcock/make-rulesetinfo-iequatable
Fix RulesetInfo equality comparison giving false negatives
|
2017-08-18 15:17:50 +09:00 |
|
smoogipooo
|
90885a31ae
|
Round 2 of CI fixes.
|
2017-08-18 15:09:54 +09:00 |
|
smoogipooo
|
a47b6526a2
|
Fix CI issues.
|
2017-08-18 14:40:36 +09:00 |
|
Dan Balasescu
|
68303accef
|
Merge branch 'master' into make-rulesetinfo-iequatable
|
2017-08-18 14:28:42 +09:00 |
|
Dan Balasescu
|
6ffec70028
|
Merge pull request #1100 from swoolcock/fix-ruleset-changing
No longer update the current ruleset when selecting a new beatmap set
|
2017-08-18 14:27:58 +09:00 |
|
Dan Balasescu
|
0f635c77b3
|
Merge branch 'master' into fix-ruleset-changing
|
2017-08-18 13:42:29 +09:00 |
|
Dan Balasescu
|
5c84dd1dab
|
Merge pull request #1125 from swoolcock/fix-duplicate-difficulty-control-points
Fix duplicate DifficultyControlPoints breaking slider velocities
|
2017-08-18 13:41:36 +09:00 |
|
Dan Balasescu
|
cc6a5824f0
|
Merge branch 'master' into fix-ruleset-changing
|
2017-08-18 13:40:52 +09:00 |
|
Dan Balasescu
|
243a6ca774
|
Update OsuLegacyDecoder.cs
|
2017-08-18 13:27:16 +09:00 |
|
Dan Balasescu
|
5a9375f336
|
Merge branch 'master' into fix-duplicate-difficulty-control-points
|
2017-08-18 13:12:00 +09:00 |
|
Dean Herbert
|
7f6b7e2937
|
Merge pull request #1129 from peppy/fix-nullref
FIx a possible null reference when login fails
|
2017-08-18 12:48:38 +09:00 |
|
Dan Balasescu
|
f5c3af2f20
|
Merge branch 'master' into fix-nullref
|
2017-08-18 12:38:20 +09:00 |
|
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
|
e4b832e8a6
|
Fix a possible nullref when login fails
|
2017-08-18 10:49:41 +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 |
|
Shane Woolcock
|
df683d9114
|
Fix multiple difficulty control points sharing the same time and thus confusing slider velocity calculations
|
2017-08-17 23:28:26 +09:30 |
|
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 |
|
tgi74000
|
dc31a0f0ac
|
Merged ppy/master
|
2017-08-17 13:01:42 +02:00 |
|
MrTheMake
|
586a652b08
|
Changed Mods to be a property
|
2017-08-17 12:24:22 +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 |
|