1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 15:27:26 +08:00
osu-lazer/osu.Game
smoogipooo f484792546 Merge branch 'refactor_hitrenderer' into beatmap_conversion
Conflicts:
	osu.Game/Modes/UI/HitRenderer.cs
2017-03-12 01:27:28 +09:00
..
Beatmaps General fixups. 2017-03-12 01:26:07 +09:00
Configuration KeyCounter visibility 2017-03-01 13:22:01 +03:00
Database Reduce warning/suggestion count to zero. 2017-03-09 15:52:40 +09:00
Graphics Merge branch 'master' into counter_bindables 2017-03-10 14:21:33 +09:00
Input Improve comment of SetFrameFromTime. 2017-03-06 14:15:43 +09:00
IO/Legacy Reduce warning/suggestion count to zero. 2017-03-09 15:52:40 +09:00
IPC Reduce warning/suggestion count to zero. 2017-03-09 15:52:40 +09:00
Modes Merge branch 'refactor_hitrenderer' into beatmap_conversion 2017-03-12 01:27:28 +09:00
Online Fix warnings not covered by resharper locally. 2017-03-09 16:07:34 +09:00
Overlays Merge pull request #458 from Lahvuun/master 2017-03-10 13:20:07 +09:00
Properties Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Screens Make HudOverlay not dependent on Ruleset. 2017-03-10 16:16:07 +09:00
Users Fix some license headers. 2017-03-02 18:45:20 +09:00
app.config Update license headers. 2017-03-08 15:50:52 +09:00
osu.Game.csproj Cleanups. 2017-03-12 01:08:34 +09:00
OsuGame.cs Merge remote-tracking branch 'upstream/master' into replay 2017-03-07 13:50:08 +09:00
OsuGameBase.cs Reduce warning/suggestion count to zero. 2017-03-09 15:52:40 +09:00
packages.config Update license headers. 2017-03-08 15:50:52 +09:00