Commit Graph

16 Commits

Author SHA1 Message Date
aaed714160 Adjust Explode alpha slightly. 2017-02-16 22:48:47 +09:00
9c4bb82dd6 Merged upstream/master. 2017-02-16 13:23:11 +01:00
3068fa1a62 Namespace does not correspond to file location. 2017-02-16 11:30:31 +01:00
31a617363a Improve the feel of spinners. 2017-02-15 23:24:08 +09:00
7fbc5990d1 Add combo numbers. 2017-02-15 23:23:55 +09:00
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
12e265a3e2 Combine triangle system implementations. 2017-02-15 20:39:10 +09:00
10dfe47638 Add spinners and improve TestCaseHitObjects. 2017-02-15 01:23:20 +09:00
50bd80cb0c Update and standardise license headers. 2017-02-07 14:27:41 +09:00
9b9ed32245 Remove all @2x references, updates resource and framework. 2017-02-06 22:19:47 +09:00
0a9e3ce1b0 Don't handle input in triangle particle effect containers. 2016-12-15 22:58:19 +09:00
db5c2efa15 Rename tracking variable and change conditional as per feedback. 2016-12-13 18:12:35 +09:00
c420c55291 Merge branch 'master' into hit-samples
# Conflicts:
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
2016-12-13 17:57:24 +09:00
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
8329022a2e Merge remote-tracking branch 'refs/remotes/upstream/master' into hit-samples 2016-12-08 21:41:02 +09:00
40ea6e0d72 Fix incorrect folder name. 2016-12-08 21:36:34 +09:00