Lucas A 82e314da59 Fix merge conflicts.		2020-09-03 21:56:47 +02:00
..
Audio
Beatmaps	Merge branch 'master' into beatmap-track-rework	2020-09-01 16:06:38 +09:00
Configuration	Remove setting.	2020-08-16 17:18:40 +02:00
Database
Extensions
Graphics	Fix UserProfile weirdness	2020-09-03 17:11:34 +09:00
Input	Add ability to skip cutscene with forward mouse button	2020-08-17 23:21:44 -07:00
IO
IPC
Migrations
Online	Persist nulls to the top score bindable	2020-09-02 14:29:46 +09:00
Overlays	Fix UserProfile weirdness	2020-09-03 17:11:34 +09:00
Properties
Replays
Rulesets	Revert IStatisticRow changes	2020-08-27 20:13:44 +02:00
Scoring	Use extension methods instead of reading directly	2020-08-27 18:18:32 +02:00
Screens	Fix merge conflicts.	2020-09-03 21:56:47 +02:00
Skinning	Revert "Add marker interface for beatmap skins"	2020-08-31 18:29:46 +02:00
Storyboards	Fix potential crash if disposing a DrawableStoryboardSample twice	2020-08-21 18:19:47 +09:00
Tests	Remove rate adjustment from player test scene	2020-09-02 14:25:24 +09:00
Updater
Users
Utils
osu!.res
osu.Game.csproj	Update resources	2020-09-03 21:56:36 +09:00
OsuGame.cs	Adjust toolbar button sizing	2020-09-03 16:34:58 +09:00
OsuGameBase.cs