Commit Graph

7822 Commits

Author SHA1 Message Date
afaf3b4116 Merge branch 'master' into notification-thread-safety 2017-10-19 21:12:53 +09:00
f49f02fda4 Merge pull request #1387 from peppy/fix-duplicate-opentk-reference
Remove duplicate reference to opentk package
2017-10-19 21:12:39 +09:00
a724a20b02 Remove duplicate reference to opentk package 2017-10-19 20:07:25 +09:00
9eb220af89 Merge pull request #1384 from EVAST9919/simplify-letterboxing
Simplify gradient usage in Letterbox Overlay
2017-10-18 11:21:32 +09:00
bae91d7de7 Simplify gradient usage in Letterbox Overlay 2017-10-18 05:06:17 +03:00
518e5a2245 Make ProgressNotification's status and progress thread-safe
Quite regularly a task will hold a reference to a progress notification and udpate it as progress is made. Therefore these operations should be thread-safe.
2017-10-18 10:07:20 +09:00
6eea0e5cc1 Merge pull request #1380 from smoogipoo/update-framework
Update framework
2017-10-16 17:25:32 +09:00
f9aba6fa27 Update framework once more 2017-10-16 17:11:54 +09:00
767775988e Add NS and OS as abbreviations
Satisfies Jetbrains Rider
2017-10-16 16:54:28 +09:00
89d1f7e9c8 Merge pull request #1378 from huoyaoyuan/text
Number text improvements
2017-10-16 00:13:04 +09: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
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
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
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
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
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
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
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
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