1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 14:17:26 +08:00
osu-lazer/osu.Game
smoogipoo a4caaf56ef Merge remote-tracking branch 'origin/master' into fix-slider-samples
# Conflicts:
#	osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs
#	osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
2018-11-05 16:38:28 +09:00
..
Audio Prefer namespace lookups first 2018-07-10 15:23:47 +09:00
Beatmaps Fix DummyWorkingBeatmap having unrealistic defaults 2018-10-29 15:26:28 +09:00
Configuration Remove ScrollingVisualisation from settings 2018-09-19 18:30:25 +02:00
Database Fix database entries using platform-specific path separator 2018-10-07 19:15:42 +02:00
Graphics Remove redundant type specifications 2018-10-16 11:40:51 +09:00
Input Merge branch 'master' into consistent-terminology-format 2018-10-10 19:19:36 +09:00
IO Update with async changes 2018-08-27 17:05:58 +09:00
IPC Use invariant tolower 2018-09-26 18:44:03 +09:00
Migrations Fix Windows-style path separators not being migrated on Unix systems 2018-10-18 08:29:12 +02:00
Online Update beatmap search API to match latest osu-web structure 2018-10-23 18:05:41 +09:00
Overlays Update beatmap search API to match latest osu-web structure 2018-10-23 18:05:41 +09:00
Properties Normalize all the line endings 2018-04-13 18:26:38 +09:00
Rulesets Merge remote-tracking branch 'origin/master' into fix-slider-samples 2018-11-05 16:38:28 +09:00
Screens Debounce editor summary timeline seeks 2018-11-05 15:59:40 +09:00
Skinning Add missing scale 2018-09-28 11:40:13 +09:00
Storyboards Remove redundant type specifications 2018-10-16 11:40:51 +09:00
Tests Increase placement testcase circlesize 2018-10-26 15:36:09 +09:00
Users Fix last visit not supporting null values 2018-10-05 00:25:40 +09:00
Utils Use HResult 2018-10-31 17:07:05 +09:00
osu!.res And then everything became one 2017-09-19 16:06:58 +09:00
osu.Game.csproj Update osu-resources and osu-framework to use binary fonts 2018-11-03 18:09:11 +01:00
OsuGame.cs Fix cursor not hiding in screenshots 2018-10-02 10:12:07 +09:00
OsuGameBase.cs Merge pull request #3478 from peppy/fix-case-sensitivity-import-extensions 2018-09-26 19:40:00 +09:00