Commit Graph

8452 Commits

Author SHA1 Message Date
a66edea6dc Move sqlite batteries to osu.Desktop
Fixes e_sqlite.dll not being copied to output on Windows
2017-11-21 15:33:05 +09:00
538acadd23 Update framework 2017-11-21 15:29:15 +09:00
e98d9e8a8c Explicitly define constant 2017-11-20 19:44:06 +09:00
7cfca866e2 Don't compile osu.Desktop.Deploy now 2017-11-20 19:43:46 +09:00
aac41d2de6 Disable resharper inspections on case-by-case basis 2017-11-20 18:55:48 +09:00
f0966a2e12 Update framework 2017-11-20 18:40:00 +09:00
e608d2841b Prefer net461 2017-11-20 16:10:34 +09:00
756f6f2d16 Remove net461 targets 2017-11-20 10:10:28 +09:00
067c018422 Cleanups 2017-11-19 17:31:35 +09:00
7f757123e5 Update vscode launch configurations 2017-11-19 17:24:32 +09:00
5fd16c6268 Make osu.Desktop.Deploy work 2017-11-19 16:30:41 +09:00
db4c912e1e Fix up assembly name 2017-11-19 14:46:51 +09:00
440c1a9f83 Make osu.Desktop and osu.Game.Tests compile under net461+netstandard 2017-11-19 14:30:56 +09:00
d2ab0621f3 Make osu.Game + rulesets compile with netstandard 2017-11-19 13:46:51 +09:00
f461f03b08 Make osu! compile with framework changes 2017-11-16 14:51:31 +09:00
f6bdfa9876 Merge pull request #1485 from EVAST9919/beatmap_scores
Add top scores section into beatmap overlay display
2017-11-16 01:01:15 +09:00
62358c0b53 Merge branch 'master' into beatmap_scores 2017-11-16 00:45:17 +09:00
a3dc39cf4f Merge pull request #1511 from peppy/fix-select-no-beatmap
Fix hard crash when clicking play button with no map selected
2017-11-16 00:38:41 +09:00
d5bbf0fdd2 Merge branch 'master' into fix-select-no-beatmap 2017-11-16 00:26:15 +09:00
f912744acc Fix sizing of ModIcon 2017-11-16 00:15:27 +09:00
fb37dc7d77 Merge pull request #1508 from peppy/overlay-improvements
Ensure only one information overlay is open at once
2017-11-16 00:02:56 +09:00
8011048540 Fix hard crash when clicking play button with no map selected
Resolves #1507.
2017-11-15 20:03:18 +09:00
4b3e7c3613 Merge branch 'master' into overlay-improvements 2017-11-15 19:43:34 +09:00
4b973dc827 Merge pull request #1510 from peppy/remove-sub-scroll
Remove scrollability from sub-areas in beatmap overaly
2017-11-15 19:43:11 +09:00
70d960ba73 Merge branch 'master' into remove-sub-scroll 2017-11-15 19:26:42 +09:00
9549b85a00 Merge pull request #1509 from peppy/overlay-scroll-to-top
Ensure overlay containers scroll to top when new information is presented
2017-11-15 19:26:26 +09:00
fda810eb8f Remove scrollability from sub-areas in beatmap overaly
The areas that are scrollable inside the beatmap overlay make for a very frustrating experience. Let's disable them for now.
2017-11-15 19:02:56 +09:00
af03d883f1 Ensure overlay containers scroll to top when new information is presented 2017-11-15 19:01:30 +09:00
8a407a68b3 Ensure only one information overlay is open at once 2017-11-15 18:49:06 +09:00
eaf1a60fe1 Merge branch 'master' into beatmap_scores 2017-11-15 17:58:07 +09:00
530b1e8d91 Merge pull request #1505 from EVAST9919/ratings_fix
Fix wrong ratings calculations
2017-11-15 17:56:57 +09:00
60a2d84e09 Make the x position depends on the avatar size 2017-11-15 10:43:32 +03:00
093ebb8b17 Apply suggested changes 2017-11-15 10:21:07 +03:00
ea2fa5fa00 Fix wrong ratings calculations 2017-11-15 09:48:40 +03:00
409d049066 Merge branch 'master' into beatmap_scores 2017-11-15 13:58:54 +09:00
7dd2720b4b Merge branch 'master' into beatmap_scores 2017-11-15 13:41:38 +09:00
1fea47a616 Merge pull request #1483 from EVAST9919/beatmap-overlay-scores
Extend Beatmap Set Response
2017-11-15 13:38:40 +09:00
a30cf27506 Fix incorrect json mapping for preview urls 2017-11-15 13:26:11 +09:00
6933a41b75 Add back high resolution cover regressions 2017-11-15 13:26:02 +09:00
6ef60d0b4e Merge branch 'master' into beatmap-overlay-scores 2017-11-15 13:18:32 +09:00
8688afecde Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores 2017-11-14 20:13:07 +03:00
9abf0dd757 Merge pull request #1501 from smoogipoo/warning-fixes
Clean up a few warnings in preparation for net-standard
2017-11-14 20:51:54 +09:00
fa4ae72a06 Merge branch 'master' into warning-fixes 2017-11-14 20:43:23 +09:00
e08e9e61fc Merge pull request #1502 from EVAST9919/profile_beatmaps
Add pending and graveyarded beatmapsets to profile page
2017-11-14 20:33:34 +09:00
4b9edc4645 Merge branch 'master' into profile_beatmaps 2017-11-14 20:27:17 +09:00
fff53be00f Merge pull request #1504 from peppy/less-beatmap-requests
Reduce number of rqeuests to display beatmaps in profile
2017-11-14 19:14:08 +09:00
44671ad9cb Move common width definition to base class 2017-11-14 19:03:50 +09:00
f96f7e696d Tidy up variables a bit 2017-11-14 18:53:09 +09:00
160b988735 Reduce number of rqeuests to display beatmaps in profile
Comes at the cost of losing some information which should be loaded. This will be fixed at the osu-web end.
2017-11-14 18:51:41 +09:00
9344502b71 More warning fixes 2017-11-14 18:05:07 +09:00