1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 15:32:55 +08:00
osu-lazer/osu.Game
smoogipoo 55475d129f Merge remote-tracking branch 'origin/master' into mania-mask-container
# Conflicts:
#	osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
2018-06-07 19:19:20 +09:00
..
Audio Normalize all the line endings 2018-04-13 18:26:38 +09:00
Beatmaps Merge branch 'master' into disallow-beatmap-change 2018-06-07 15:34:19 +09:00
Configuration Merge branch 'master' into osu-hd-setting 2018-05-17 19:39:17 +02:00
Database Merge branch 'master' into fix-database-migration-failure 2018-06-06 22:44:35 +09:00
Graphics Merge branch 'master' into disallow-beatmap-change 2018-06-06 20:26:17 +09:00
Input Resolve merge conflict 2018-05-18 00:25:47 +03:00
IO Standardise path 2018-06-06 20:55:42 +09:00
IPC Normalize all the line endings 2018-04-13 18:26:38 +09:00
Migrations Remove unique constraints on hash columns 2018-05-29 16:26:32 +09:00
Online Fix web request failures not being correctly handled at an APIRequest level 2018-06-03 13:01:52 +09:00
Overlays Use new bind method 2018-06-07 16:46:54 +09:00
Properties Normalize all the line endings 2018-04-13 18:26:38 +09:00
Rulesets Merge remote-tracking branch 'origin/master' into mania-mask-container 2018-06-07 19:19:20 +09:00
Screens Merge remote-tracking branch 'origin/master' into mania-mask-container 2018-06-07 19:19:20 +09:00
Skinning User pattern matching 2018-04-25 16:32:06 +09:00
Storyboards Rename GameBeatmap -> BindableBeatmap 2018-06-06 20:16:20 +09:00
Tests Use new bind method 2018-06-07 16:46:54 +09:00
Users Updated UserStatus.cs to make more sense(UNTESTED) 2018-04-26 12:57:24 +02:00
Utils Implement DebugUtils locally 2018-06-06 18:33:10 +09:00
osu!.res And then everything became one 2017-09-19 16:06:58 +09:00
osu.Game.csproj Use new bind method 2018-06-07 16:46:54 +09:00
osu.nuspec Update license year. 2018-01-22 18:22:38 +01:00
OsuGame.cs Rewrite much state logic 2018-06-06 16:17:51 +09:00
OsuGameBase.cs Merge branch 'master' into disallow-beatmap-change 2018-06-07 00:38:40 +09:00