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 |
|
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 |
|