9af0104e3e
Fix NaN when dragging music controller
...
When dragging music controller we divide by the dragged distance.
When dragging to the origin of the drag this resulted in NaN.
Now, we check for this and use 0 in this case.
2017-03-18 12:46:12 +01:00
ab8a5afdb9
AlwaysReceiveInput and InternalContains.
2017-03-16 17:38:36 +09:00
879a78156d
Merge branch 'master' into mod_application
2017-03-14 12:38:55 +09:00
3913a0a9ee
Fix removal of the last one beatmap.
2017-03-14 05:35:58 +08:00
c0e29652a6
Initial attempt at making mods apply better.
2017-03-12 22:13:43 +09:00
e6f4fe9e61
Merge pull request #458 from Lahvuun/master
...
Options sidebar flickering fix.
2017-03-10 13:20:07 +09:00
9dd835e256
didn't see this was unnecessary after my changes
2017-03-09 21:43:11 +01:00
d9a4a677fd
Added Descriptions to Rulesets + PlayModes list
2017-03-09 21:37:03 +01:00
427a0dd0f5
Options sidebar flickering fix.
2017-03-09 22:29:39 +02:00
9007409072
Follow appveyor's code style check.
2017-03-09 16:44:45 +08:00
115ebd4773
Merge branch 'master' into modselect
2017-03-09 17:31:25 +09:00
1b182b1361
Fix typo.
2017-03-09 15:55:40 +08:00
dad6060149
Fix warnings not covered by resharper locally.
2017-03-09 16:07:34 +09:00
d7497330b2
Reduce warning/suggestion count to zero.
2017-03-09 15:52:40 +09:00
a048e666d7
Fix autoproperty which doesn't work on mono.
2017-03-09 14:26:09 +09:00
da751804b6
Reduce error count.
2017-03-09 14:24:16 +09:00
3eece390cb
Abstract constructors -> protected.
2017-03-09 14:01:08 +09:00
0c4c1689b6
Merge branch 'master' into modselect
2017-03-09 12:51:40 +09:00
5a42035f88
Update license headers.
2017-03-08 15:50:52 +09:00
b19405c987
Allow null in mod list to generate a placeholder ModButton.
2017-03-07 19:52:51 +08:00
8979b28496
Remove usages of the 'new' keyword.
2017-03-07 16:17:51 +08:00
b56d6c767b
Merge branch 'master' into modselect
2017-03-07 16:10:53 +08:00
bff1179624
Merge branch 'master' into replay
...
# Conflicts:
# osu.Game/Modes/Mod.cs
2017-03-07 14:32:14 +09:00
ecdbcb20cf
Fix error-level inspections.
2017-03-07 13:52:47 +09:00
4430255ec4
Merge remote-tracking branch 'upstream/master' into replay
...
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
# osu.Desktop/OsuGameDesktop.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
# osu.Game/Database/BeatmapDatabase.cs
# osu.Game/Graphics/Cursor/OsuCursorContainer.cs
# osu.Game/IPC/BeatmapImporter.cs
# osu.Game/Modes/Mod.cs
# osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
# osu.Game/Modes/UI/Playfield.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/Screens/Play/PlayerInputManager.cs
2017-03-07 13:50:08 +09:00
3e4cd0dc7c
Merge remote-tracking branch 'upstream/master' into less-mods-enum
...
# Conflicts:
# osu.Game.Modes.Mania/ManiaMod.cs
# osu.Game.Modes.Osu/OsuMod.cs
# osu.Game/Modes/Mod.cs
2017-03-07 13:42:50 +09:00
0cad5d7d41
Fix most warnings.
2017-03-07 13:05:57 +09:00
bc74f453aa
Merge branch 'master' into replay
2017-03-07 11:41:16 +09:00
9106c45858
Fix remaining errors.
2017-03-07 10:42:59 +09:00
9b92e99ce9
Merge branch 'master' into increase-ci-strictness
2017-03-06 21:44:39 +01:00
6e9c4a4251
Merge branch 'master' into options-footer
2017-03-06 20:01:51 +01:00
27edc9971e
Update deselect logic.
...
Change to DeselectTypes to avoid enumerating children for multi times.
2017-03-07 01:15:21 +08:00
eda7e1b26f
Fix and update mode changing handling.
2017-03-07 01:01:42 +08:00
5cd859ecf1
Fix missed color during loading.
2017-03-07 00:46:36 +08:00
836484ba51
Add abstract ModType for ModSection.
2017-03-07 00:32:22 +08:00
318ab68af1
Use Bindable<IEnumerable<Mod>> to fit other changes.
2017-03-07 00:17:06 +08:00
59d1fdb032
Simplify ModSection.
2017-03-07 00:12:06 +08:00
dcc7386609
Add option toggle for debug cached setting.
2017-03-06 22:07:46 +09:00
564b3f0706
Refactor icon management of ModButton.
2017-03-06 19:03:26 +08:00
a91d897282
Handle left and right mouse button only.
2017-03-06 18:02:51 +08:00
f6f20cafd3
Merge remote-tracking branch 'peppy/less-mods-enum' into modselect
2017-03-06 17:35:15 +08:00
12a3b1414f
Add sane defaults for abstract Mod class and remove remaining use of enum.
2017-03-06 18:29:19 +09:00
45f500920c
Don't use Mods enum for handling incompatible mods.
2017-03-06 18:29:17 +09:00
ad75ead665
selectedMod -> selectedIndex
2017-03-06 17:21:25 +08:00
c2cf5242e1
Remove one-entry backing fields.
2017-03-06 17:14:41 +08:00
463c887879
Fix WaveOverlayContainer staying visible when hidden.
2017-03-06 17:32:13 +09:00
b5aff9df5f
Add options footer.
2017-03-06 17:30:46 +09:00
e356758a7d
Don't expicitly set origin of TextAwesome.
2017-03-06 17:06:48 +09:00
a34e6453bf
Simplify SelectedMods.
2017-03-06 15:39:27 +08:00
2de25c23b4
Make Mods IEnumerable.
2017-03-06 15:20:55 +09:00
