Dean Herbert
cc0f61f545
Merge branch 'refs/heads/master' into dependency-injection
...
# Conflicts:
# osu-framework
# osu.Game/GameModes/OsuGameMode.cs
# osu.Game/GameModes/Play/Player.cs
# osu.Game/OsuGame.cs
# osu.Game/Overlays/MusicController.cs
# osu.Game/Overlays/Options/EditorSection.cs
# osu.Game/Overlays/Options/Input/MouseOptions.cs
# osu.Game/Overlays/Options/Online/InGameChatOptions.cs
# osu.Game/Overlays/Options/SkinSection.cs
2016-11-12 20:18:26 +09:00
Drew DeVault
ee24cd310c
Convert everything to DI pattern
2016-11-10 16:41:18 -05:00
Thomas Müller
103176826f
Ensure transformations are never used prior to being added to the Drawable tree.
2016-11-06 11:13:52 +01:00
Thomas Müller
32ee20b843
Merge branch 'master' of github.com:ppy/osu into better-clocks
...
# Conflicts:
# osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
2016-11-06 10:08:24 +01:00
Thomas Müller
5f2bf165a2
Remove now obsolete clock usages.
2016-11-06 10:06:09 +01:00
Thomas Müller
619d97c642
Fix indentation and typo.
2016-11-05 13:51:52 +01:00
Thomas Müller
07e74068e7
Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2
...
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
# osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
2016-11-05 13:35:15 +01:00
Dean Herbert
2ee5e2efb7
Bring framework up-to-date.
...
# Conflicts:
# osu-framework
2016-11-05 18:18:52 +09:00
Dean Herbert
10f2ed4387
Add explicit privates.
2016-11-04 16:12:35 +09:00
Dean Herbert
b17d219ace
Share Triangles logic.
2016-11-04 16:11:22 +09:00
Dean Herbert
108b7092c9
Fix regression in hitcircle appearance.
2016-11-04 16:08:04 +09:00
Dean Herbert
74c655ebfc
Fix input not working.
2016-11-04 15:43:53 +09:00
Dean Herbert
92b85b251e
Fix scale more.
2016-11-04 15:43:53 +09:00
Dean Herbert
e939746159
Fix scale ratio of gamefield.
2016-11-04 15:43:53 +09:00
Dean Herbert
f5f5aa9eac
Fix some incorrect default values.
2016-11-04 15:43:53 +09:00
Dean Herbert
a4e2f25065
Flush recursively, more transform tidying.
2016-11-04 15:43:53 +09:00
Dean Herbert
1854160321
Add hit time and the ability for an external operator to block hits.
2016-11-04 15:43:53 +09:00
Dean Herbert
fbaae94ba4
Limit state changes to apply only once.
2016-11-04 15:43:53 +09:00
Dean Herbert
8d4e7038b3
Part -> Layer.
2016-11-04 15:43:53 +09:00
Dean Herbert
b86f308af6
Add async workflow.
2016-11-01 23:24:14 +09:00
Dean Herbert
13b5fb0578
Update transforms to not accept clock.
2016-10-28 17:42:00 +09:00
Dean Herbert
43f0409893
Start to structure flow of information in Player.
...
- Allow basic clicking of hitobjects.
- Break non-osu! game modes temporarily.
- Fix some issues with RollingCounters.
- Add the ability to increment counters.
2016-10-19 19:44:03 +09:00
Dean Herbert
94968a8b7c
Add initial implementation of osu! HitCircle.
2016-10-19 16:19:01 +09:00
Dean Herbert
2566d6bfe0
Fix regressions with HitRenderers, while also cleaning them up.
2016-10-13 10:10:15 +09:00