RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,446 Commits 3 Branches 651 Tags 354 MiB
Commit Graph

8446 Commits

Author SHA1 Message Date
EVAST9919 d62da4334e Add and place all the bottom bar objects 2017-11-17 12:26:13 +03:00
Dean Herbert c1fd2a3950
Merge pull request #1516 from smoogipoo/mod-improvements 
Various improvements to make DifficultyCalculator support mods
 2017-11-17 15:35:05 +09:00
smoogipoo 95fd323c6b Fix ManiaDifficultyCalculator possibly failing due to nullref 2017-11-17 14:37:06 +09:00
smoogipoo ac6213d1fa CI fixes 2017-11-17 14:26:33 +09:00
smoogipoo 7892eefd68 Fix up mod application + beatmap/hitobject references 2017-11-17 14:23:52 +09:00
smoogipoo cc1720241e Fix DifficultyCalculator using incorrect mods 2017-11-17 12:36:51 +09:00
smoogipoo 5781b45b39 Set TimeRate after mod application 2017-11-17 12:36:17 +09:00
smoogipoo 18f2e92a48 Rework mod applications to hitobject/rulesetcontainer for DifficultyCalculator 2017-11-17 12:36:13 +09:00
smoogipoo 62155e6dd5 Make DifficultyCalculator support mod applications 
Fixes https://github.com/ppy/osu/issues/476.
 2017-11-17 12:36:07 +09:00
Dean Herbert 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
Dean Herbert 62358c0b53
Merge branch 'master' into beatmap_scores 2017-11-16 00:45:17 +09:00
Dean Herbert 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
Dan Balasescu d5bbf0fdd2
Merge branch 'master' into fix-select-no-beatmap 2017-11-16 00:26:15 +09:00
Dean Herbert f912744acc Fix sizing of ModIcon 2017-11-16 00:15:27 +09:00
Dan Balasescu 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
Dean Herbert 8011048540 Fix hard crash when clicking play button with no map selected 
Resolves #1507.
 2017-11-15 20:03:18 +09:00
Dean Herbert 4b3e7c3613
Merge branch 'master' into overlay-improvements 2017-11-15 19:43:34 +09:00
Dean Herbert 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
Dan Balasescu 70d960ba73
Merge branch 'master' into remove-sub-scroll 2017-11-15 19:26:42 +09:00
Dan Balasescu 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
Dean Herbert 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
Dean Herbert af03d883f1 Ensure overlay containers scroll to top when new information is presented 2017-11-15 19:01:30 +09:00
Dean Herbert 8a407a68b3 Ensure only one information overlay is open at once 2017-11-15 18:49:06 +09:00
Dean Herbert eaf1a60fe1
Merge branch 'master' into beatmap_scores 2017-11-15 17:58:07 +09:00
Dean Herbert 530b1e8d91
Merge pull request #1505 from EVAST9919/ratings_fix 
Fix wrong ratings calculations
 2017-11-15 17:56:57 +09:00
EVAST9919 60a2d84e09 Make the x position depends on the avatar size 2017-11-15 10:43:32 +03:00
EVAST9919 093ebb8b17 Apply suggested changes 2017-11-15 10:21:07 +03:00
EVAST9919 ea2fa5fa00 Fix wrong ratings calculations 2017-11-15 09:48:40 +03:00
Dean Herbert 409d049066
Merge branch 'master' into beatmap_scores 2017-11-15 13:58:54 +09:00
Dean Herbert 7dd2720b4b
Merge branch 'master' into beatmap_scores 2017-11-15 13:41:38 +09:00
Dean Herbert 1fea47a616
Merge pull request #1483 from EVAST9919/beatmap-overlay-scores 
Extend Beatmap Set Response
 2017-11-15 13:38:40 +09:00
Dean Herbert a30cf27506 Fix incorrect json mapping for preview urls 2017-11-15 13:26:11 +09:00
Dean Herbert 6933a41b75 Add back high resolution cover regressions 2017-11-15 13:26:02 +09:00
Dean Herbert 6ef60d0b4e
Merge branch 'master' into beatmap-overlay-scores 2017-11-15 13:18:32 +09:00
EVAST9919 8688afecde Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores 2017-11-14 20:13:07 +03:00
Dean Herbert 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
Dean Herbert fa4ae72a06
Merge branch 'master' into warning-fixes 2017-11-14 20:43:23 +09:00
Dean Herbert 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
Dean Herbert 4b9edc4645
Merge branch 'master' into profile_beatmaps 2017-11-14 20:27:17 +09:00
Dan Balasescu 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
Dean Herbert 44671ad9cb Move common width definition to base class 2017-11-14 19:03:50 +09:00
Dean Herbert f96f7e696d Tidy up variables a bit 2017-11-14 18:53:09 +09:00
Dean Herbert 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
smoogipoo 9344502b71 More warning fixes 2017-11-14 18:05:07 +09:00
smoogipoo bd7a6a90f5 Remove unused fields 2017-11-14 17:43:19 +09:00
EVAST9919 08ce2705c6 Add pending and graveyarded beatmapsets to profile page 2017-11-14 08:26:44 +03:00
smoogipoo f6cbde95e2 Remove unused files 2017-11-14 13:06:40 +09:00
smoogipoo cd8d7af9db Clean up a few warnings in preparation for net-standard 2017-11-14 13:06:25 +09:00
EVAST9919 fa6d3f9792 Reduce isLoading calls 2017-11-13 18:49:10 +03:00
EVAST9919 d157e6baf1 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores 2017-11-13 16:02:44 +03:00