1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 17:07:38 +08:00
osu-lazer/osu.Game
smoogipoo 7414a6aadd Merge remote-tracking branch 'huoyaoyuan/master' into health-processor
# Conflicts:
#	osu.Game.Rulesets.Catch/CatchRuleset.cs
#	osu.Game.Rulesets.Mania/ManiaRuleset.cs
#	osu.Game.Rulesets.Taiko/TaikoRuleset.cs
2019-12-26 14:56:54 +09:00
..
Audio Reword comment 2019-11-21 10:37:50 +09:00
Beatmaps Merge branch 'master' into remove-legacy-id 2019-12-25 21:01:12 +09:00
Configuration Add lighten background during breaks setting 2019-12-10 15:10:35 +03:00
Database Merge branch 'master' into fix-local-score-availability 2019-12-18 01:15:20 +09:00
Graphics Merge branch 'master' into allow-ctrl-tabbing-on-more-tab-controls 2019-12-24 08:29:56 -08:00
Input Use typeparamref. 2019-11-17 20:48:23 +08:00
IO CA1715: use prefix for generic parameters. 2019-12-17 13:00:25 +08:00
IPC Move ArchiveModelManager import process to async flow 2019-06-10 13:42:22 +09:00
Migrations Use correct database migration 2019-09-13 13:57:55 +03:00
Online Fix user not getting an initial status 2019-12-18 14:07:03 +09:00
Overlays Merge branch 'master' into allow-ctrl-tabbing-on-more-tab-controls 2019-12-25 20:49:45 +09:00
Properties Merge remote-tracking branch 'upstream/master' into android 2019-01-29 18:13:43 -06:00
Replays Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Rulesets Merge remote-tracking branch 'huoyaoyuan/master' into health-processor 2019-12-26 14:56:54 +09:00
Scoring Fix score serialisation failing for unknown mod properties 2019-12-19 14:58:56 +09:00
Screens Merge remote-tracking branch 'huoyaoyuan/master' into health-processor 2019-12-26 14:56:54 +09:00
Skinning Remove redundant logic 2019-12-25 14:55:22 +09:00
Storyboards Merge branch 'master' into fix-storyboard-crash 2019-12-19 11:44:20 +09:00
Tests Mods -> SelectedMods 2019-12-13 21:45:38 +09:00
Updater Add post-update notification for iOS users 2019-12-20 14:02:01 +09:00
Users Fix status capitalisation 2019-12-18 14:07:21 +09:00
Utils Fix spacing 2019-11-21 22:55:31 +09:00
osu!.res
osu.Game.csproj Update framework 2019-12-25 18:51:44 +09:00
OsuGame.cs Fix currenTrackCompleted not being run on main thread 2019-12-02 18:26:45 +09:00
OsuGameBase.cs Fix crash on trying to retrieve mods from unavailable ruleset 2019-12-15 02:37:30 +09:00