Commit Graph

264 Commits

Author SHA1 Message Date
9c853b0465 Update framewörk 2017-03-01 19:33:01 +01:00
d46e68b36b Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor
# Conflicts:
#	osu-framework
#	osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
2017-03-01 18:05:58 +01:00
03889e6ca6 Update References to FlowStrategies
References now use the Create*-names instead of the outdated
Get*-names to create instances of FlowStrategies.
2017-02-27 16:55:55 +01:00
68dd3c02aa Fix failing testcase (nullref). 2017-02-27 17:05:12 +09:00
8d91519d59 Update usage of FlowContainer and its subclasses 2017-02-26 21:32:43 +01:00
bc231c6bd4 Remove dispose which is no longer necessary. 2017-02-26 22:08:29 +09:00
1585ae842a Update framework 2017-02-26 11:22:58 +09:00
17a28cd3b6 Don't push Player if we aren't still current. 2017-02-25 11:46:19 +09:00
c4fbfb5a8f Update comment with new knowledge. 2017-02-24 21:46:34 +09:00
5096f6b83d Fix memory leak from Player's InputManager. 2017-02-24 21:01:05 +09:00
c5552dfb27 Merge remote-tracking branch 'upstream/master' into remove-usings 2017-02-24 11:29:34 +09:00
2689de0c0c Update framework and add "Async" suffix to asynchronous methods 2017-02-23 22:32:10 +01:00
a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
aef0eb49a1 Add loading screen. 2017-02-22 21:53:59 +09:00