1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 04:17:24 +08:00
osu-lazer/osu.Game
miterosan cd0fe6a09e Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseChatLink.cs
2018-06-17 14:15:14 +02:00
..
Audio Normalize all the line endings 2018-04-13 18:26:38 +09:00
Beatmaps Fix up performance calculators 2018-06-14 16:04:48 +09:00
Configuration Merge branch 'master' into ruleset-configs 2018-06-12 13:13:18 +09:00
Database Remove custom migration exception 2018-06-15 13:38:42 +09:00
Graphics Merge branch 'master' of https://github.com/ppy/osu into Private_Messages 2018-06-17 14:15:14 +02: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 Merge branch 'master' of https://github.com/ppy/osu into Private_Messages 2018-06-17 14:15:14 +02:00
Overlays Merge branch 'master' of https://github.com/ppy/osu into Private_Messages 2018-06-17 14:15:14 +02:00
Properties Normalize all the line endings 2018-04-13 18:26:38 +09:00
Rulesets Fix up performance calculators 2018-06-14 16:04:48 +09:00
Screens Merge branch 'master' into timeline-audio-scrolling 2018-06-17 19:01:16 +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 Merge branch 'master' into timeline-audio-scrolling 2018-06-17 19:01:21 +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 Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework 2018-06-11 20:17:33 +09:00
osu.nuspec Update license year. 2018-01-22 18:22:38 +01:00
OsuGame.cs Merge branch 'master' of https://github.com/ppy/osu into Private_Messages 2018-06-17 14:15:14 +02:00
OsuGameBase.cs Merge branch 'master' of https://github.com/ppy/osu into Private_Messages 2018-06-17 14:15:14 +02:00