Commit Graph

7850 Commits

Author SHA1 Message Date
5b6c331434 Fix all keybindings being reset every startup 2017-10-16 14:12:08 +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
4981630131 Fix formatting regressions 2017-10-16 13:12:51 +09:00
0a6dcdd405 Fix remaining warnings 2017-10-16 13:09:10 +09:00
d73c0c0c98 Fix test regression 2017-10-16 13:09:01 +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
56e8c7303c Revert "Fix inconsistent lock usage in BeatmapManager"
This reverts commit 4a064da30f.
2017-10-16 12:59:59 +09:00
e3d31bdd10 Not implemented instead of incorrect 2017-10-16 12:59:59 +09:00
845c5ef39a Update framework 2017-10-16 12:59:59 +09:00
129cca0704 Tidy up context creation 2017-10-16 12:59:59 +09:00
5a684f926f CI fixes. 2017-10-16 12:59:59 +09:00
c2836a8393 Use format string for double instead of Math.Round. 2017-10-16 12:59:59 +09:00
f837117495 Use localisation engine instead of asking current culture directly. 2017-10-16 12:59:59 +09:00
90592b0757 Construct DwarableScore using null weight. 2017-10-16 12:59:59 +09:00
4a064da30f Fix inconsistent lock usage in BeatmapManager 2017-10-15 21:56:33 +03:00
e7c7ebdd9d Ignore migrations directory for inspections 2017-10-16 02:15:05 +09:00
ba4cfd6a2f Update appveyor worker image to vs2017 2017-10-16 01:25:58 +09:00
76ee6ed8fa Update CodeFileSanity to ignore migrations folder 2017-10-16 01:21:17 +09:00
0a8b3ad619 Add one more licence header 2017-10-16 00:58:56 +09:00
a232033469 Fix some file headers and unused files 2017-10-16 00:54:09 +09:00
298349ba77 Update framework 2017-10-16 00:16:15 +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
5f083f10a7 Add System.ValueTuple NuGet package 2017-10-14 16:19:03 +03:00
89c17ed13e Initialise batteries
Note that this is in the wrong place. But so is the rest of this code.
2017-10-14 21:40:26 +09:00
9226456f3c Update framework 2017-10-14 16:36:43 +09: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
ec7cc5e473 Merge pull request #1375 from peppy/back-to-desktop
Add back osu.Desktop project
2017-10-14 16:28:35 +09:00
31b26e1d0a Merge branch 'master' into back-to-desktop 2017-10-14 16:18:28 +09:00
838e1ccd25 Merge pull request #1371 from peppy/fix-duplicate-user
Fix beatmap author being stored in two different places
2017-10-14 16:18:01 +09:00
167eefa397 Add logging 2017-10-14 15:16:08 +09:00
97b14f7d81 Update vscode launch configuration 2017-10-14 15:06:43 +09:00
7ecf4b2154 Update framework 2017-10-14 15:05:18 +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
37ed710cbe Merge branch 'master' into fix-duplicate-user 2017-10-14 13:36:53 +09:00
300cbd3026 Merge pull request #1372 from smoogipoo/better-medal-loading
Only update positions when the medalContainer is loaded.
2017-10-14 13:32:38 +09:00
674ad4a30c Fix compile errors 2017-10-14 12:49:03 +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
9385fd1cfa Merge branch 'master' into better-medal-loading 2017-10-14 12:29:15 +09:00
ed152c08ac Fix regressions 2017-10-14 12:27:32 +09:00
c3b9644d77 Move infoFlow to local variable 2017-10-14 11:59:18 +09:00
1efb33210f Only update positions when the medalContainer is loaded. 2017-10-14 11:40:49 +09:00
cd722e4abb Fix beatmap author being stored in two different places 2017-10-14 11:39:55 +09:00
b82f3fc710 Merge pull request #1370 from jorolf/direct-preview-loading-fix
Fix osu!direct preview loading animation not playing
2017-10-14 10:59:22 +09:00
3644fa46be Make sure the loading overlay is hidden when preview is user cancelled 2017-10-14 10:53:39 +09:00
2938ca9488 fix loading animation not playing 2017-10-13 20:44:05 +02:00