1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 21:27:23 +08:00
Commit Graph

8572 Commits

Author SHA1 Message Date
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
Dean Herbert
f5974a7486
Merge pull request #1475 from EVAST9919/profile-overlay-visual
Drawable Score visual improvements
2017-11-13 21:37:24 +09:00
Dean Herbert
0168b7eb88 Merge remote-tracking branch 'upstream/master' into profile-overlay-visual 2017-11-13 21:21:57 +09:00
Dean Herbert
b8c54adc83
Merge pull request #1465 from EVAST9919/profile-beatmaps-section
Add Beatmaps Section in the Profile Overlay
2017-11-13 21:16:44 +09:00
Dean Herbert
97fc4347e9
Merge branch 'master' into profile-beatmaps-section 2017-11-13 20:44:57 +09:00
Dean Herbert
f87962dcd0
Merge pull request #1496 from smoogipoo/fix-replay-clock
Fix replay clock always running one frame behind
2017-11-13 20:43:23 +09:00
Dean Herbert
1a8864fa00
Merge branch 'master' into fix-replay-clock 2017-11-13 20:15:37 +09:00
Dean Herbert
3fcfdd288c
Merge pull request #1498 from peppy/fix-player-loader-song-playback
Fix audio not playing during player loading
2017-11-13 20:15:26 +09:00
Dean Herbert
952530e1a8 Update framework 2017-11-13 20:03:58 +09:00
Dean Herbert
ae6d4aa38d Merge remote-tracking branch 'upstream/master' into fix-replay-clock 2017-11-13 20:03:29 +09:00
Dean Herbert
46ad986301
Merge branch 'master' into profile-beatmaps-section 2017-11-13 20:02:40 +09:00
Dan Balasescu
dbcf876294
Merge branch 'master' into fix-player-loader-song-playback 2017-11-13 19:52:28 +09:00
Dan Balasescu
082e51969d
Merge pull request #1493 from smoogipoo/rewinding-robustness
Fix nested hit object judgements not being reverted
2017-11-13 19:52:14 +09:00
Dean Herbert
a2cb9d4086 Fix audio not playing during player loading
Regression due to changed audio initialisation logic.
2017-11-13 19:43:00 +09:00
Dean Herbert
e12d0c5875
Merge branch 'master' into rewinding-robustness 2017-11-13 19:35:48 +09:00
smoogipoo
495155874c Make sure that the clock is only updated once per time value 2017-11-13 19:30:57 +09:00
Dan Balasescu
c52da05b42
Merge pull request #1497 from peppy/logo-fixes
Fix multiple order-of-execution issues with osu! logo
2017-11-13 19:20:44 +09:00
Dean Herbert
49a5af60e2 Fix multiple order-of-execution issues with osu! logo
Also sets better defaults.
2017-11-13 18:43:16 +09:00
smoogipoo
0cec51110a Fix replay clock always running 1 frame behind
* Fixes swells never completing.
* Fixes forward playback missing notes every now and then.
* Probably more stuff.
2017-11-13 17:55:21 +09:00
Dean Herbert
615984ca9c
Merge pull request #1492 from peppy/performance-improvements
Fix some startup stutters
2017-11-13 14:04:31 +09:00
smoogipoo
ae8407a3f3 Fix nested hitobject judgements not being removed 2017-11-13 14:00:35 +09:00
smoogipoo
8adf0a6db3 Null-check in disposal of DatabasedKeyBindingInputManager 2017-11-13 13:58:44 +09:00
Dean Herbert
ee3a5b38f4
Merge branch 'master' into performance-improvements 2017-11-13 13:50:57 +09:00
Dan Balasescu
9056f2d978
Merge pull request #1491 from EVAST9919/replay-setting-visual
Replay speed setting visual improvements
2017-11-13 13:33:22 +09:00
Dean Herbert
e006090c5b Fix SpriteIcon loading textures on the update thread 2017-11-13 13:13:43 +09:00