1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-08 00:37:40 +08:00
Commit Graph

7921 Commits

Author SHA1 Message Date
Dean Herbert
31dc5c97f2 Fix intro and duplicate inserts 2017-10-17 11:22:42 +09:00
Dean Herbert
ef10bb73db osu.Game csproj fixes 2017-10-17 10:31:54 +09:00
Dean Herbert
799f510217 FileStore logic fixes 2017-10-17 10:25:18 +09:00
Dean Herbert
81476ebe75 Correct and simplify BeatmapStore and BeatmapManager 2017-10-17 10:17:21 +09:00
Dean Herbert
eff1c20e38 CI fixing 2017-10-16 22:00:54 +09:00
Dean Herbert
e378d0685d Remove weird additions 2017-10-16 20:37:10 +09:00
Dean Herbert
08698b51ec Merge remote-tracking branch 'upstream/master' into EfCore 2017-10-16 18:52:30 +09:00
Dean Herbert
9ee6d1e3f9 Correct and simplify KeyBindingStore 2017-10-16 18:42:49 +09:00
Dean Herbert
6eea0e5cc1 Merge pull request #1380 from smoogipoo/update-framework
Update framework
2017-10-16 17:25:32 +09:00
smoogipoo
f9aba6fa27 Update framework once more 2017-10-16 17:11:54 +09:00
Dean Herbert
acc299c7b9 Correct and simplify RulesetStore 2017-10-16 17:02:31 +09:00
smoogipoo
767775988e Add NS and OS as abbreviations
Satisfies Jetbrains Rider
2017-10-16 16:54:28 +09:00
Dean Herbert
ec51314e37 Remove duplicate command 2017-10-16 16:11:34 +09:00
Dean Herbert
1f4a943f74 Fix test case runs not being correctly isolated on mono 2017-10-16 15:23:28 +09:00
Dean Herbert
7049a73490 Remove ValidTypes from databased stored; explicitly expose query methods instead 2017-10-16 14:47:33 +09:00
Dean Herbert
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
Dean Herbert
5b6c331434 Fix all keybindings being reset every startup 2017-10-16 14:12:08 +09:00
Dean Herbert
a5ccf12e4a Fix ValueTuple mess 2017-10-16 14:04:04 +09:00
Dean Herbert
29b46a5c5e Add missing reference to System.ValueTuple 2017-10-16 13:23:41 +09:00
Dean Herbert
4981630131 Fix formatting regressions 2017-10-16 13:12:51 +09:00
Dean Herbert
0a6dcdd405 Fix remaining warnings 2017-10-16 13:09:10 +09:00
Dean Herbert
d73c0c0c98 Fix test regression 2017-10-16 13:09:01 +09:00
Dean Herbert
8a0b184dd6 Revert "Return back DatabaseBackedStore's query and populate functions"
This reverts commit 7cf5d63cd3.
2017-10-16 12:59:59 +09:00
Dean Herbert
04e5f764a3 Revert "Fix removal of FileInfo, BeatmapMetadata, BeatmapDifficulty objects" 2017-10-16 12:59:59 +09:00
TocoToucan
56e8c7303c Revert "Fix inconsistent lock usage in BeatmapManager"
This reverts commit 4a064da30f.
2017-10-16 12:59:59 +09:00
Dean Herbert
e3d31bdd10 Not implemented instead of incorrect 2017-10-16 12:59:59 +09:00
Dean Herbert
845c5ef39a Update framework 2017-10-16 12:59:59 +09:00
Dean Herbert
129cca0704 Tidy up context creation 2017-10-16 12:59:59 +09:00
Huo Yaoyuan
5a684f926f CI fixes. 2017-10-16 12:59:59 +09:00
Huo Yaoyuan
c2836a8393 Use format string for double instead of Math.Round. 2017-10-16 12:59:59 +09:00
Huo Yaoyuan
f837117495 Use localisation engine instead of asking current culture directly. 2017-10-16 12:59:59 +09:00
Huo Yaoyuan
90592b0757 Construct DwarableScore using null weight. 2017-10-16 12:59:59 +09:00
TocoToucan
4a064da30f Fix inconsistent lock usage in BeatmapManager 2017-10-15 21:56:33 +03:00
Dean Herbert
e7c7ebdd9d Ignore migrations directory for inspections 2017-10-16 02:15:05 +09:00
Dean Herbert
ba4cfd6a2f Update appveyor worker image to vs2017 2017-10-16 01:25:58 +09:00
Dean Herbert
76ee6ed8fa Update CodeFileSanity to ignore migrations folder 2017-10-16 01:21:17 +09:00
Dean Herbert
0a8b3ad619 Add one more licence header 2017-10-16 00:58:56 +09:00
Dean Herbert
a232033469 Fix some file headers and unused files 2017-10-16 00:54:09 +09:00
Dean Herbert
298349ba77 Update framework 2017-10-16 00:16:15 +09:00
Dean Herbert
89d1f7e9c8 Merge pull request #1378 from huoyaoyuan/text
Number text improvements
2017-10-16 00:13:04 +09:00
TocoToucan
db2750592d Fix removal of FileInfo, BeatmapMetadata, BeatmapDifficulty objects 2017-10-15 14:01:35 +03:00
Huo Yaoyuan
06fe874594 CI fixes. 2017-10-15 16:53:30 +08:00
Huo Yaoyuan
9b3676c562 Use format string for double instead of Math.Round. 2017-10-15 16:44:15 +08:00
Huo Yaoyuan
192ebe776f Use localisation engine instead of asking current culture directly. 2017-10-15 16:30:52 +08:00
Huo Yaoyuan
bed5a64ee2 Construct DwarableScore using null weight. 2017-10-15 16:15:35 +08:00
TocoToucan
7cf5d63cd3 Return back DatabaseBackedStore's query and populate functions 2017-10-15 00:40:41 +03:00
TocoToucan
5f083f10a7 Add System.ValueTuple NuGet package 2017-10-14 16:19:03 +03:00
Dean Herbert
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
smoogipoo
9226456f3c Update framework 2017-10-14 16:36:43 +09:00
smoogipoo
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