1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 11:27:24 +08:00
Commit Graph

8 Commits

Author SHA1 Message Date
Thomas Müller
fec127eb8c Merge branch 'master' of github.com:ppy/osu into unified_shader
# Conflicts:
#	osu-framework
#	osu.Game/Overlays/Options.cs
2016-10-16 15:17:24 +02:00
Thomas Müller
7751a85e14 Update framework. 2016-10-16 14:10:06 +02:00
Huo Yaoyuan
f4c381f745 Use OverlayContainer in framework. 2016-10-16 17:14:17 +08:00
Huo Yaoyuan
1c97edaac2 Base class for overlays. 2016-10-13 23:04:57 +08:00
Huo Yaoyuan
c93a440d3b Make Options:IStateful. 2016-10-13 22:27:37 +08:00
Dean Herbert
4052a665bf Remove all non-load Game access. 2016-10-12 15:47:08 +09:00
Dean Herbert
ac16bffe49 Bring framework and resources up-to-date. 2016-10-01 19:05:26 +09:00
Dean Herbert
154226b9a3 Basic white-boxing of all game modes. 2016-09-29 23:51:17 +09:00