1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 22:27:25 +08:00
Commit Graph

7835 Commits

Author SHA1 Message Date
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
TocoToucan
db2750592d Fix removal of FileInfo, BeatmapMetadata, BeatmapDifficulty objects 2017-10-15 14:01:35 +03: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
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
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
Dean Herbert
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
Dean Herbert
3644fa46be Make sure the loading overlay is hidden when preview is user cancelled 2017-10-14 10:53:39 +09:00
Jorolf
2938ca9488 fix loading animation not playing 2017-10-13 20:44:05 +02:00
Dean Herbert
120d3fbbec Merge pull request #1061 from jorolf/ranks-section
Add best performance / first place ranks to profile overlay
2017-10-13 23:01:16 +09:00
Dean Herbert
c660957329 Hide (most) profile sections that aren't populated yet 2017-10-13 20:29:19 +09:00
Dean Herbert
15373c71b6 Allow scores to open beatmap overlay
Reshuffles depth of beatmap and profile overlays for now.
2017-10-13 20:09:03 +09:00
Dean Herbert
7550b461e3 Add individual beatmap set lookup request 2017-10-13 19:57:59 +09:00
Dean Herbert
ead88224c5 Move ModIcon tooltip to base implementation 2017-10-13 19:14:43 +09:00
Dean Herbert
146d800bda Make weight nullable rather than using weird negative defaults 2017-10-13 19:02:50 +09:00
Dean Herbert
520b806305 Merge remote-tracking branch 'upstream/master' into ranks-section 2017-10-13 18:49:05 +09:00
Dean Herbert
bf9c71a6a3 Merge pull request #1345 from EVAST9919/user_overlay_tooltip
Add tooltip to username in the profile overlay
2017-10-13 17:21:00 +09:00
Dean Herbert
070aceef1e Move font and text size to class ProfileLink class 2017-10-13 17:03:31 +09:00
Dean Herbert
77c98a34e3 Merge remote-tracking branch 'upstream/master' into user_overlay_tooltip 2017-10-13 17:00:26 +09:00
Dean Herbert
91d64573c3 Merge pull request #1286 from jorolf/direct-previews
Add osu!direct previews
2017-10-13 14:27:19 +09:00
Dean Herbert
5b16f5d3b5 Remove unused field 2017-10-13 14:19:25 +09:00
Dean Herbert
f9a1240325 Merge remote-tracking branch 'upstream/master' into direct-previews 2017-10-13 14:06:46 +09:00
Dean Herbert
abf5418080 Apply some renames and refactoring of loading logic
Reduced publicly facing properties where possible. Also fixes a potentially bad state issue when the beatmapset was changed while a load was in progress.
2017-10-13 14:06:34 +09:00
Dan Balasescu
7aab21e407 Merge pull request #1355 from peppy/catch-improvements
Add (mostly correct) droplets
2017-10-12 22:44:02 +09:00