Commit Graph

12664 Commits

Author SHA1 Message Date
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
146d800bda Make weight nullable rather than using weird negative defaults 2017-10-13 19:02:50 +09:00
520b806305 Merge remote-tracking branch 'upstream/master' into ranks-section 2017-10-13 18:49:05 +09:00
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
070aceef1e Move font and text size to class ProfileLink class 2017-10-13 17:03:31 +09:00
77c98a34e3 Merge remote-tracking branch 'upstream/master' into user_overlay_tooltip 2017-10-13 17:00:26 +09:00
91d64573c3 Merge pull request #1286 from jorolf/direct-previews
Add osu!direct previews
2017-10-13 14:27:19 +09:00
5b16f5d3b5 Remove unused field 2017-10-13 14:19:25 +09:00
f9a1240325 Merge remote-tracking branch 'upstream/master' into direct-previews 2017-10-13 14:06:46 +09:00
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
a0cb624c9d start at 1 2017-10-12 10:28:55 -04:00
7aab21e407 Merge pull request #1355 from peppy/catch-improvements
Add (mostly correct) droplets
2017-10-12 22:44:02 +09:00
bb6b656ec6 Fix code review issues 2017-10-12 22:27:22 +09:00
d234791bdd Merge remote-tracking branch 'upstream/master' into catch-improvements 2017-10-12 22:25:47 +09:00
d9207c0cf6 Merge pull request #1360 from smoogipoo/editor-waveform-timeline
Add editor compose mode timeline with waveform display
2017-10-12 22:24:37 +09:00
c0d64bf409 Use Gray instead of FromHex for grays 2017-10-12 22:19:29 +09:00
37fc69b9f7 Set a default zoom level that isn't the whole track 2017-10-12 22:19:02 +09:00
37b88d834e Adjust padding slightly 2017-10-12 22:10:37 +09:00
d98f1a2bb7 Merge remote-tracking branch 'upstream/master' into editor-waveform-timeline 2017-10-12 21:48:08 +09:00
24588eeb6a Merge pull request #1338 from smoogipoo/editor-waveform
Waveform display for use in the editor
2017-10-12 21:45:10 +09:00
fb8d8ec552 Update framework 2017-10-12 21:26:25 +09:00
182bb71eb0 Merge branch 'master' into editor-waveform 2017-10-12 20:49:48 +09:00
8d28999dd6 Merge pull request #1365 from peppy/remove-codeanalysis-reference
Remove references to CodeAnalysisRulesets
2017-10-12 20:49:34 +09:00