1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 15:47:26 +08:00
osu-lazer/osu.Game
smoogipoo 577ff4cc7f Merge remote-tracking branch 'origin/master' into mania-mask-container
# Conflicts:
#	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
#	osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
#	osu.Game.Rulesets.Mania/UI/ManiaStage.cs
2018-07-17 13:13:57 +09:00
..
Audio Prefer namespace lookups first 2018-07-10 15:23:47 +09:00
Beatmaps Merge branch 'master' into use-has-flags 2018-07-17 03:50:40 +09:00
Configuration Merge branch 'master' into ruleset-configs 2018-06-12 13:13:18 +09:00
Database Change default to being important 2018-07-16 13:00:21 +09:00
Graphics Don't use in invalidation logic to avoid incorrect execution 2018-07-16 16:39:52 +09:00
Input Add "Select" action 2018-07-03 18:39:15 +09:00
IO Standardise path 2018-06-06 20:55:42 +09:00
IPC Normalize all the line endings 2018-04-13 18:26:38 +09:00
Migrations Remove migration log output 2018-07-13 18:34:38 +09:00
Online Fix links from profile top scores to beatmaps not working correctly 2018-07-05 21:00:23 +09:00
Overlays Merge branch 'master' into use-has-flags 2018-07-17 03:50:40 +09:00
Properties Normalize all the line endings 2018-04-13 18:26:38 +09:00
Rulesets Merge remote-tracking branch 'origin/master' into mania-mask-container 2018-07-17 13:13:57 +09:00
Screens Merge remote-tracking branch 'origin/master' into mania-mask-container 2018-07-17 13:13:57 +09:00
Skinning Strip comments from everything except metadata 2018-07-16 01:04:41 +02:00
Storyboards Merge branch 'master' into storyboard-samples 2018-07-13 18:34:51 +09:00
Tests Update framework 2018-07-11 17:12:01 +09:00
Users Fix regression in drawable rank first display 2018-07-13 19:53:29 +09:00
Utils Implement DebugUtils locally 2018-06-06 18:33:10 +09:00
osu!.res And then everything became one 2017-09-19 16:06:58 +09:00
osu.Game.csproj Update framework 2018-07-12 19:56:41 +09:00
osu.nuspec Update license year. 2018-01-22 18:22:38 +01:00
OsuGame.cs Fix informational overlays not hiding when user toggles other overlay views 2018-07-13 20:34:41 +09:00
OsuGameBase.cs Update framework 2018-07-11 17:12:01 +09:00