1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 05:32:54 +08:00
osu-lazer/osu.Game
Dean Herbert fde3ab420a Merge branch 'master'
Conflicts:
	osu.Game/osu.Game.csproj
2016-10-13 12:23:36 +09:00
..
Beatmaps Merge branch 'master' 2016-10-13 12:23:36 +09:00
Configuration Add basic VolumeControl and saving of volume to config. 2016-10-08 15:54:00 +09:00
Database Fix casing on private properties 2016-10-13 12:17:52 +09:00
GameModes Fix regressions with HitRenderers, while also cleaning them up. 2016-10-13 10:10:15 +09:00
Graphics Make stuff compile again (but StarCounter hits assertions). 2016-10-12 16:11:40 +09:00
Input Add in-game chat display, along with a global hotkey handling method. 2016-10-08 19:23:21 +09:00
Online Fix regressions with HitRenderers, while also cleaning them up. 2016-10-13 10:10:15 +09:00
Overlays Merge branch 'master' into limit-game-access 2016-10-12 20:44:33 +09:00
Properties License -> Licence. 2016-08-26 17:27:49 +09:00
Users Add basic class structure for Beatmap/HitObject/SampleInfo/User. 2016-09-06 21:41:16 +09:00
osu.Game.csproj Merge branch 'master' 2016-10-13 12:23:36 +09:00
OsuGame.cs Update osu-framework 2016-10-13 12:18:23 +09:00
OsuGameBase.cs Start implementing legacy decoder 2016-10-13 12:16:48 +09:00
packages.config Implement OszArchiveReader 2016-10-12 11:32:40 -04:00
VolumeControl.cs Remove all non-load Game access. 2016-10-12 15:47:08 +09:00