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
EVAST9919
e3ce641ea0
Merge remote-tracking branch 'refs/remotes/ppy/master' into intro
2017-10-15 00:15:25 +03:00
EVAST9919
bd7bc2c0d2
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-preview-fix
2017-10-15 00:14:59 +03:00
EVAST9919
f4428980a6
Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed
2017-10-15 00:10:15 +03:00
EVAST9919
24ca7a5119
Merge remote-tracking branch 'refs/remotes/ppy/master' into song_select_delete
2017-10-15 00:09:50 +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
Dan Balasescu
ec7cc5e473
Merge pull request #1375 from peppy/back-to-desktop
...
Add back osu.Desktop project
2017-10-14 16:28:35 +09:00
Dan Balasescu
31b26e1d0a
Merge branch 'master' into back-to-desktop
2017-10-14 16:18:28 +09:00
Dan Balasescu
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
smoogipoo
167eefa397
Add logging
2017-10-14 15:16:08 +09:00
Dean Herbert
97b14f7d81
Update vscode launch configuration
2017-10-14 15:06:43 +09:00
Dean Herbert
7ecf4b2154
Update framework
2017-10-14 15:05:18 +09:00
Dean Herbert
179542daf1
Standardise AssemblyInfos
2017-10-14 15:02:20 +09:00
Dean Herbert
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
smoogipoo
b178be21d1
Let's not rename columns yet
2017-10-14 14:30:58 +09:00
Dean Herbert
37ed710cbe
Merge branch 'master' into fix-duplicate-user
2017-10-14 13:36:53 +09:00
Dean Herbert
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
smoogipoo
674ad4a30c
Fix compile errors
2017-10-14 12:49:03 +09:00
smoogipoo
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
Dean Herbert
9385fd1cfa
Merge branch 'master' into better-medal-loading
2017-10-14 12:29:15 +09:00
Dean Herbert
ed152c08ac
Fix regressions
2017-10-14 12:27:32 +09:00
smoogipoo
c3b9644d77
Move infoFlow to local variable
2017-10-14 11:59:18 +09:00
EVAST9919
e8f85a08b8
Fix audio preview still playing after closing the beatmap overlay
2017-10-14 05:58:06 +03:00
smoogipoo
1efb33210f
Only update positions when the medalContainer is loaded.
2017-10-14 11:40:49 +09:00
Dean Herbert
cd722e4abb
Fix beatmap author being stored in two different places
2017-10-14 11:39:55 +09:00
EVAST9919
6711331f66
Merge remote-tracking branch 'refs/remotes/ppy/master' into intro
2017-10-14 05:18:03 +03:00
EVAST9919
7a72f2e3f5
Make sure we restore the clock rate on exiting
2017-10-14 05:15:18 +03:00
EVAST9919
bdcc70e0bb
Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed
2017-10-14 05:06:36 +03:00
EVAST9919
502940ddf3
Fix deleting last visible beatmap doesn't trigger selecting null beatmap
2017-10-14 05:05:38 +03:00
EVAST9919
c5de97a06f
Merge remote-tracking branch 'refs/remotes/ppy/master' into song_select_delete
2017-10-14 05:05:01 +03:00
