1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 12:27:25 +08:00
osu-lazer/osu.Game
smoogipooo 0521d4b761 Merge branch 'master' into dynamic-vertex-attributes
# Conflicts:
#	osu-framework
2017-06-10 17:26:16 +09:00
..
Audio Simplify constructor of SampleInfoList. 2017-05-08 19:30:55 +08:00
Beatmaps Fix Black Space after } and Symbol Spacing 2017-06-08 14:48:42 +08:00
Configuration More Clean UP 2017-06-07 20:07:18 +08:00
Database EOF remove blank spaces 2017-06-08 14:56:03 +08:00
Graphics Merge branch 'master' into dynamic-vertex-attributes 2017-06-10 17:26:16 +09:00
Input/Handlers Update framework 2017-05-11 21:25:43 +09:00
IO Remove unused namespace. 2017-05-16 22:20:05 +08:00
IPC Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
Online Fix Black Space after } and Symbol Spacing 2017-06-08 14:48:42 +08:00
Overlays Fix some discrepancies when changing settings 2017-06-08 20:57:21 +09:00
Properties Remove all trailing whitespaces in this repo. 2017-04-06 16:21:18 +08:00
Rulesets Change to fa_question for now, pending flyte redesign. 2017-06-05 09:40:22 +09:00
Screens Merge remote-tracking branch 'upstream/master' into johnneijzen-master 2017-06-08 20:33:39 +09:00
Users Fix Black Space after } and Symbol Spacing 2017-06-08 14:48:42 +08:00
osu.Game.csproj Fix issue where nuget was only sometimes updating modules case-sensitive 2017-06-09 12:03:18 +02:00
OsuGame.cs Fix some discrepancies when changing settings 2017-06-08 20:57:21 +09:00
OsuGameBase.cs update osu to use the framework's TooltipContainer 2017-06-03 14:50:35 +02:00
packages.config Update nuget packages. 2017-04-12 19:35:16 +09:00