Commit Graph

16436 Commits

Author SHA1 Message Date
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
89d1f7e9c8 Merge pull request #1378 from huoyaoyuan/text
Number text improvements
2017-10-16 00:13:04 +09:00
db2750592d Fix removal of FileInfo, BeatmapMetadata, BeatmapDifficulty objects 2017-10-15 14:01:35 +03:00
06fe874594 CI fixes. 2017-10-15 16:53:30 +08:00
9b3676c562 Use format string for double instead of Math.Round. 2017-10-15 16:44:15 +08:00
192ebe776f Use localisation engine instead of asking current culture directly. 2017-10-15 16:30:52 +08:00
bed5a64ee2 Construct DwarableScore using null weight. 2017-10-15 16:15:35 +08: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
bd7bc2c0d2 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-preview-fix 2017-10-15 00:14:59 +03:00
f4428980a6 Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-10-15 00:10:15 +03:00
24ca7a5119 Merge remote-tracking branch 'refs/remotes/ppy/master' into song_select_delete 2017-10-15 00:09:50 +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
e8f85a08b8 Fix audio preview still playing after closing the beatmap overlay 2017-10-14 05:58:06 +03: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
6711331f66 Merge remote-tracking branch 'refs/remotes/ppy/master' into intro 2017-10-14 05:18:03 +03:00
7a72f2e3f5 Make sure we restore the clock rate on exiting 2017-10-14 05:15:18 +03:00
bdcc70e0bb Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-10-14 05:06:36 +03:00
502940ddf3 Fix deleting last visible beatmap doesn't trigger selecting null beatmap 2017-10-14 05:05:38 +03:00
c5de97a06f Merge remote-tracking branch 'refs/remotes/ppy/master' into song_select_delete 2017-10-14 05:05:01 +03: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
583f8358b6 Merge remote-tracking branch 'refs/remotes/ppy/master' into song_select_delete 2017-10-14 04:32:12 +03:00
2938ca9488 fix loading animation not playing 2017-10-13 20:44:05 +02:00
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
c660957329 Hide (most) profile sections that aren't populated yet 2017-10-13 20:29:19 +09:00
15373c71b6 Allow scores to open beatmap overlay
Reshuffles depth of beatmap and profile overlays for now.
2017-10-13 20:09:03 +09:00
7550b461e3 Add individual beatmap set lookup request 2017-10-13 19:57:59 +09:00
ead88224c5 Move ModIcon tooltip to base implementation 2017-10-13 19:14:43 +09:00