Dean Herbert
4644f6afdb
Fix SliderBody's accent colour and thread-safety.
2017-03-23 17:11:51 +09:00
smoogipooo
2c76a2350c
Use AccentColour everywhere in drawable osu! hit objects.
2017-03-23 16:19:12 +09:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible.
2017-03-23 13:50:08 +09:00
Dean Herbert
4f3ab879de
Make DrawableHitObject's UpdateState safer by blocking calls at a higher level with not yet loaded.
...
UpdateState is called in LoadComplete for cases where the state may have changed before a load operation.
2017-03-22 09:43:44 +09:00
Adrian Wielgosik
3270fdcfde
Fix auto-sliders in TestCaseHitObject
2017-03-21 22:48:33 +01:00
smoogipooo
cce1ae055f
Make DrawableHitObject expires explicit.
2017-03-17 15:30:19 +09:00
Dean Herbert
ab8a5afdb9
AlwaysReceiveInput and InternalContains.
2017-03-16 17:38:36 +09:00
smoogipooo
42da0f1a72
Merge remote-tracking branch 'origin/master' into generic_judgements_2
...
Conflicts:
osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
osu.Game.Modes.Catch/UI/CatchHitRenderer.cs
osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs
osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
osu.Game/Modes/UI/HitRenderer.cs
osu.Game/osu.Game.csproj
2017-03-15 21:36:43 +09:00
smoogipooo
a9bc253b8c
General refactoring (no more casts :D).
2017-03-15 19:18:23 +09:00
smoogipooo
6a31219781
Add further abstraction to Sliders/IHasCurve.
2017-03-15 12:52:25 +09:00
smoogipooo
f50e0bbf3c
Rework/rewrite beatmap parsing to parse to base hit objects, which mode-specific beatmap converters can then use.
2017-03-13 19:15:25 +09:00
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
