1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 06:19:38 +08:00
osu-lazer/osu.Game
Shane Woolcock 10b91e18bd Merge branch 'master' into samah-ios
# Conflicts:
#	osu.Game/osu.Game.csproj
2019-01-19 18:03:58 +10:30
..
Audio Revert audio changes 2019-01-19 17:40:37 +10:30
Beatmaps Revert audio changes 2019-01-19 17:40:37 +10:30
Configuration Add UI scale 2019-01-09 19:01:33 +09:00
Database Do not delete file on import failure 2018-12-18 22:49:53 +03:00
Graphics Fix sliders don't show tooltip until first change 2019-01-17 17:03:53 +09:00
Input Merge branch 'master' into scoredatabase 2018-11-30 14:59:58 +09:00
IO Add LegacyFileArchiveReader 2018-11-28 16:13:16 +09:00
IPC Initial scoremanager/scorestore structure 2018-11-28 16:50:16 +09:00
Migrations Add explicit beatmap -> scores relationship rather than relying on cascades 2019-01-08 17:53:43 +09:00
Online remove blank lines 2019-01-11 10:34:56 +01:00
Overlays Remove stray using 2019-01-17 20:23:15 +09:00
Properties Add basic visual tests 2018-12-29 18:47:35 +10:30
Replays Remove User from Replay 2018-11-30 18:25:14 +09:00
Rulesets remove blank lines 2019-01-11 10:34:56 +01:00
Scoring Fix PP not display on profile overlay 2019-01-04 16:33:35 +09:00
Screens Merge branch 'master' into fix-room-inspector-cover 2019-01-17 21:49:25 +09:00
Skinning Remove TryGetValue as it won't work 2019-01-10 19:01:41 +09:00
Storyboards Use Find instead of FirstOrDefault 2019-01-05 19:35:33 +03:00
Tests Fix OsuTestCase beatmap not having a correct default beatmap 2018-12-05 20:33:27 +09:00
Users remove blank lines 2019-01-11 10:34:56 +01: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 Merge branch 'master' into samah-ios 2019-01-19 18:03:58 +10:30
OsuGame.cs Add UI scale 2019-01-09 19:01:33 +09:00
OsuGameBase.cs Ensure beatmap textures are loaded via CreateTextureLoaderStore 2019-01-12 23:05:49 +10:30