Commit Graph

8 Commits

Author SHA1 Message Date
smoogipoo c9e4a07e12 Merge remote-tracking branch 'origin/master' into remove-approachcircle-hax
# Conflicts:
#	osu.Game.Rulesets.Osu/Edit/OsuEditPlayfield.cs
#	osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
2018-04-20 18:04:43 +09:00
Dean Herbert 32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
smoogipoo cea3e1c7f5 Remove now unnecessary approachcircle proxy disables
Prereqs:
- [ ] ppy/osu-framework#1505
2018-04-09 18:44:50 +09:00
smoogipoo d4cb00e08f Don't display judgements in OsuEditPlayfield 2018-04-04 17:12:41 +09:00
smoogipoo 512e4d2c9f Rewrite the way that cursor overrides are done game-wide 2018-01-12 18:13:17 +09:00
Dean Herbert 37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
smoogipoo def2e5bd17 Make editor discard approach circles
Temporary solution for now.
2017-12-22 22:16:54 +09:00
smoogipoo 677f3653eb Hide osu! playfield cursor 2017-11-30 19:19:34 +09:00