smoogipoo 56032a4522 Merge branch 'mania-selection-movement' into inter-column-movements ...

# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
#	osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs

56032a4522 · 2018-11-26 11:45:48 +09:00

History

..

Audio

Prefer namespace lookups first

2018-07-10 15:23:47 +09:00

Beatmaps

Merge branch 'master' into osuTK

2018-11-21 18:53:11 +09:00

Configuration

Resolve merge conflicts

2018-11-18 16:10:36 +03:00

Database

Fix database entries using platform-specific path separator

2018-10-07 19:15:42 +02:00

Graphics

Merge remote-tracking branch 'origin/master' into external_link_warning

2018-11-23 15:19:52 +09:00

Input

OpenTK -> osuTK

2018-11-20 17:14:59 +09:00

IO

OpenTK -> osuTK

2018-11-20 17:14:59 +09:00

IPC

Use invariant tolower

2018-09-26 18:44:03 +09:00

Migrations

Fix Windows-style path separators not being migrated on Unix systems

2018-10-18 08:29:12 +02:00

Online

Merge remote-tracking branch 'origin/master' into external_link_warning

2018-11-23 15:19:52 +09:00

Overlays

Don't focus overlay again after set is fetched

2018-11-25 14:49:09 +05:30

Properties

Normalize all the line endings

2018-04-13 18:26:38 +09:00

Rulesets

Merge branch 'mania-selection-movement' into inter-column-movements

2018-11-26 11:45:48 +09:00

Screens

Merge branch 'mania-selection-movement' into inter-column-movements

2018-11-26 11:45:48 +09:00

Skinning

OpenTK -> osuTK

2018-11-20 17:14:59 +09:00

Storyboards

OpenTK -> osuTK

2018-11-20 17:14:59 +09:00

Tests

Merge branch 'mania-selection-movement' into inter-column-movements

2018-11-26 11:45:48 +09:00

Users

OpenTK -> osuTK

2018-11-20 17:14:59 +09:00

Utils

Use HResult

2018-10-31 17:07:05 +09:00

osu!.res

And then everything became one

2017-09-19 16:06:58 +09:00

osu.Game.csproj

Update package

2018-11-20 17:30:03 +09:00

OsuGame.cs

Merge remote-tracking branch 'origin/master' into external_link_warning

2018-11-23 15:19:52 +09:00

OsuGameBase.cs

OpenTK -> osuTK

2018-11-20 17:14:59 +09:00