1b455019a8
Merge remote-tracking branch 'upstream/master' into revert-to-default-glow
2017-10-23 11:56:17 +09:00
5af6fb41f5
Fixed .NET Standard build on Linux.
2017-10-23 02:03:46 +02:00
cf468d6708
Fix linux build
...
Build is failing on linux because of case sensitive file system. This change fixes it.
2017-10-22 20:14:38 +07:00
98044a17d3
Fix misaligned settings buttons
2017-10-21 13:16:06 +10:30
908c6d827f
ValueTuple please
2017-10-19 14:49:23 +09:00
5d5ea5fb2e
Fix all remaining db structure issues
2017-10-19 14:05:11 +09:00
71d614b813
FIx missing columns yet again
2017-10-18 21:57:54 +09:00
ac4b2797dc
valuetuple nightmare
2017-10-18 20:07:25 +09:00
4e8019b313
Add some more missing indices
2017-10-17 19:59:22 +09:00
b9d0fb96ed
Fix cascade deletions
2017-10-17 18:26:28 +09:00
cd41862e3b
Add back transaction support for beatmap importing
2017-10-17 15:00:27 +09:00
ef10bb73db
osu.Game csproj fixes
2017-10-17 10:31:54 +09:00
eff1c20e38
CI fixing
2017-10-16 22:00:54 +09:00
e378d0685d
Remove weird additions
2017-10-16 20:37:10 +09:00
1a16784db9
Add BindingRedirects rule to fix dependency when running via nunit
...
See https://github.com/ErikEJ/EntityFramework.SqlServerCompact/issues/463
2017-10-16 14:18:01 +09:00
a5ccf12e4a
Fix ValueTuple mess
2017-10-16 14:04:04 +09:00
29b46a5c5e
Add missing reference to System.ValueTuple
2017-10-16 13:23:41 +09:00
8a0b184dd6
Revert "Return back DatabaseBackedStore's query and populate functions"
...
This reverts commit 7cf5d63cd3
2017-10-16 12:59:59 +09:00
04e5f764a3
Revert "Fix removal of FileInfo, BeatmapMetadata, BeatmapDifficulty objects"
2017-10-16 12:59:59 +09:00
db2750592d
Fix removal of FileInfo, BeatmapMetadata, BeatmapDifficulty objects
2017-10-15 14:01:35 +03:00
7cf5d63cd3
Return back DatabaseBackedStore's query and populate functions
2017-10-15 00:40:41 +03:00
e3ce641ea0
Merge remote-tracking branch 'refs/remotes/ppy/master' into intro
2017-10-15 00:15:25 +03:00
f4428980a6
Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed
2017-10-15 00:10:15 +03:00
9924f518b7
Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore
...
# Conflicts:
# osu-framework
# osu.Game/Beatmaps/BeatmapMetadata.cs
# osu.Game/osu.Game.csproj
# osu.Game/packages.config
2017-10-14 16:36:37 +09:00
179542daf1
Standardise AssemblyInfos
2017-10-14 15:02:20 +09:00
c5046f6b3c
Add back osu.Desktop project
...
While it was nice having less projects to deal with, it meant hacks to get around circular dependencies between rulesets and osu.Game. For now, let's just restore the osu.Desktop project and call it a day.
This allows for the project to build again with default visual studio settings.
2017-10-14 14:33:05 +09:00
b178be21d1
Let's not rename columns yet
2017-10-14 14:30:58 +09:00
b83d7cd4df
Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore
...
# Conflicts:
# osu-framework
# osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
# osu.Game/Beatmaps/BeatmapInfo.cs
# osu.Game/Online/API/Requests/GetBeatmapSetsResponse.cs
2017-10-14 12:38:59 +09:00
6711331f66
Merge remote-tracking branch 'refs/remotes/ppy/master' into intro
2017-10-14 05:18:03 +03:00
bdcc70e0bb
Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed
2017-10-14 05:06:36 +03:00
7550b461e3
Add individual beatmap set lookup request
2017-10-13 19:57:59 +09:00
520b806305
Merge remote-tracking branch 'upstream/master' into ranks-section
2017-10-13 18:49:05 +09:00
f9a1240325
Merge remote-tracking branch 'upstream/master' into direct-previews
2017-10-13 14:06:46 +09:00
d98f1a2bb7
Merge remote-tracking branch 'upstream/master' into editor-waveform-timeline
2017-10-12 21:48:08 +09:00
182bb71eb0
Merge branch 'master' into editor-waveform
2017-10-12 20:49:48 +09:00
70c55b23f4
Remove references to CodeAnalysisRulesets
...
Having these produce warnings under certain compile environments.
2017-10-12 20:37:20 +09:00
622659336d
Merge + update framework
2017-10-12 17:02:39 +09:00
78f2037d84
Remove now obsolete RatioAdjust
2017-10-12 09:42:06 +02:00
de8f9325a3
Implement TimelineButton and use for the magnification buttons
2017-10-12 16:10:33 +09:00
df6409308a
Merge remote-tracking branch 'origin/master' into editor-waveform-timeline
...
# Conflicts:
# osu-framework
2017-10-12 15:32:11 +09:00
57a9116355
Merge remote-tracking branch 'refs/remotes/ppy/master' into intro
2017-10-12 06:41:06 +03:00
8b01f8671f
Merge from ppy/master
2017-10-10 21:07:36 +03:00
c2f3c0e6df
Add TestCaseIconButton to demonstrate IconButton usages
2017-10-10 18:32:09 +09:00
1cf8c0284a
Re-namespace a few classes
2017-10-10 15:22:39 +09:00
0baceaaf0d
Merge remote-tracking branch 'refs/remotes/ppy/master' into intro
2017-10-10 00:56:54 +03:00
cbae19b604
Fix BeatmapMetadata removing
2017-10-10 00:17:12 +03:00
cb58a1371e
Merge branch 'editor-waveform' into editor-waveform-timeline
...
# Conflicts:
# osu.Game/osu.Game.csproj
2017-10-09 18:10:52 +09:00
b97b575b27
Merge remote-tracking branch 'origin/master' into editor-waveform
...
# Conflicts:
# osu-framework
2017-10-09 17:20:24 +09:00
de2181b8f5
Merge branch 'master' of git://github.com/ppy/osu into direct-previews
2017-10-06 21:02:48 +02:00
5a8b8dacbb
move stuff thats duplicated in PreviewButton and DirectPanel to PlayButton
2017-10-06 21:02:00 +02:00
