1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 08:07:40 +08:00
Commit Graph

26 Commits

Author SHA1 Message Date
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
20fcb8848b
Move constants to base OsuHitObject representation. 2017-03-06 12:58:14 +09:00
Dean Herbert
1c5b918f9e Add osu! autoplay generation.
Doesn't work on complex sliders yet.
2017-03-05 17:46:00 +09:00
Thomas Müller
73fef85b12 Remove unnecessary usings 2017-03-04 19:43:59 +01:00
Thomas Müller
a14bdf8624 Use Color4Extensions from Framework and remove redundant Name 2017-03-04 19:42:37 +01:00
Dean Herbert
f0e9ed4636
Fix regression in TrianglesPiece. 2017-03-01 11:56:14 +09:00
Thomas Müller
1585ae842a Update framework 2017-02-26 11:22:58 +09:00
Thomas Müller
a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Dean Herbert
735961977b
Improve feel of spinners. 2017-02-22 18:23:06 +09:00
Dean Herbert
aaed714160
Adjust Explode alpha slightly. 2017-02-16 22:48:47 +09:00
Nabile Rahmani
9c4bb82dd6 Merged upstream/master. 2017-02-16 13:23:11 +01:00
Nabile Rahmani
3068fa1a62 Namespace does not correspond to file location. 2017-02-16 11:30:31 +01:00
Dean Herbert
31a617363a
Improve the feel of spinners. 2017-02-15 23:24:08 +09:00
Dean Herbert
7fbc5990d1
Add combo numbers. 2017-02-15 23:23:55 +09:00
Dean Herbert
bab219c428
Fix SliderBall weirdness (not correctly staying circular).
Also adjusts tracking to only change during sldier active time.
2017-02-15 21:51:16 +09:00
Dean Herbert
12e265a3e2
Combine triangle system implementations. 2017-02-15 20:39:10 +09:00
Dean Herbert
10dfe47638 Add spinners and improve TestCaseHitObjects. 2017-02-15 01:23:20 +09: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
Dean Herbert
0a9e3ce1b0 Don't handle input in triangle particle effect containers. 2016-12-15 22:58:19 +09:00
Dean Herbert
db5c2efa15 Rename tracking variable and change conditional as per feedback. 2016-12-13 18:12:35 +09: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