Dean Herbert
d7497330b2
Reduce warning/suggestion count to zero.
2017-03-09 15:52:40 +09:00
Dean Herbert
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
Dean Herbert
0cad5d7d41
Fix most warnings.
2017-03-07 13:05:57 +09:00
Dean Herbert
56922b66be
Refactor sliders to have more central position/progress calculations.
2017-03-06 11:11:29 +09:00
Dean Herbert
00ddcb11b4
Fix sliders playing hitsound twice at end.
2017-02-22 13:51:40 +09:00
Dean Herbert
8bf3902cbd
Add the concept of nested DrawableHitObjects.
...
- Applies to Slider Ticks and start circle. repeat/endpoints still need addressing.
- Removed SliderTicksLayer abstraction for now.
2017-02-16 17:02:36 +09:00
Dean Herbert
23677a309f
Merge branch 'master' into slider_ticks
2017-02-16 11:06:23 +09:00
Dean Herbert
7fbc5990d1
Add combo numbers.
2017-02-15 23:23:55 +09:00
Damnae
e2fae24ad5
Merge branch 'master' into slider_ticks
...
Conflicts:
osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
osu.Game.Modes.Osu/Objects/Slider.cs
2017-02-15 10:53:42 +01:00
Dean Herbert
fc192906ea
Handle proxied approach layer better and add slider's approach circle (previously missing).
2017-02-15 01:23:19 +09:00
Damnae
3e7208c8a4
Add slider ticks.
2017-02-14 11:26:24 +01:00
Damnae
a79fde897b
Add StackedPosition/StackedEndPosition and offset slider curves by StackOffset.
2017-02-09 08:29:21 +01:00
Damnae
38b25a7df3
Add hit object stacking.
2017-02-09 07:28:40 +01:00
Dean Herbert
50bd80cb0c
Update and standardise license headers.
2017-02-07 14:27:41 +09:00
Dean Herbert
9b9ed32245
Remove all @2x references, updates resource and framework.
2017-02-06 22:19:47 +09:00
Thomas Müller
8271b139e9
Use the framework's new AlwaysPresent switch instead of setting the alpha to 0.01.
2017-02-05 09:40:58 +01:00
Dean Herbert
c420c55291
Merge branch 'master' into hit-samples
...
# Conflicts:
# osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
2016-12-13 17:57:24 +09:00
Thomas Müller
eef697d842
Wire up CircleSize to hitobjects.
...
Note, that circle sizes still are wrong compared to stable osu. In order to fix this, the base radius of hitcircles needs to become 64, but it currently is 72.
2016-12-11 10:11:22 +01:00
Dean Herbert
8329022a2e
Merge remote-tracking branch 'refs/remotes/upstream/master' into hit-samples
2016-12-08 21:41:02 +09:00
Dean Herbert
40ea6e0d72
Fix incorrect folder name.
2016-12-08 21:36:34 +09:00
