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

31106 Commits

Author SHA1 Message Date
Dean Herbert
15df0dc870
Merge pull request #9664 from smoogipoo/fix-catch-banana-performance
Load nested hitobjects during map load
2020-07-24 22:11:08 +09:00
Dean Herbert
a6a7961af9 Change div to subtraction to fix calculation 2020-07-24 22:09:25 +09:00
Dean Herbert
dd45f0bd40 Adjust max spins to "match" stable 2020-07-24 21:10:46 +09:00
Dan Balasescu
7ea5687a1c
Merge pull request #9663 from bastoo0/patch-1
Fix inconsistency between this and osu-performance
2020-07-24 20:16:18 +09:00
Dean Herbert
d0895b24fc
Merge branch 'master' into add-spinner-bonus-score 2020-07-24 19:42:31 +09:00
Dean Herbert
c2a6bb1226 Merge branch 'master' into add-spinner-bonus-score 2020-07-24 19:41:36 +09:00
Dean Herbert
82e4050fdd Fix xmldoc 2020-07-24 19:41:34 +09:00
bastoo0
466921f3c7
Merge branch 'master' into patch-1 2020-07-24 12:39:56 +02:00
Dean Herbert
dfcd26be2d
Merge pull request #9439 from Game4all/gameplay-disable-winkey 2020-07-24 19:34:48 +09:00
Dean Herbert
eb84f25036 Adjust maximum spins to roughly match stable 2020-07-24 19:34:13 +09:00
smoogipoo
8f841b47e6 Cancel previous initial state computations 2020-07-24 19:31:08 +09:00
bastoo0
2b068298cc
Fix inconsistency between this and osu-performance
The bonus value for HD is given twice here (probably a merge issue). The correct bonus is currently used on stable: 736515a034/src/performance/catch/CatchScore.cpp (L68)
2020-07-24 12:01:23 +02:00
smoogipoo
5f98195144 Load nested hitobjects during map load 2020-07-24 18:16:36 +09:00
Dean Herbert
d2aaba3918
Merge pull request #9637 from smoogipoo/beatmap-difficulty-manager
Add dynamic computation of beatmap difficulty
2020-07-24 16:53:17 +09:00
Dean Herbert
dbe9180c55 Rename class and remove screen conditionals 2020-07-24 16:38:48 +09:00
smoogipoo
877b985e90 Remove local cancellation token 2020-07-24 16:11:28 +09:00
Dean Herbert
8052d59d9a
Merge pull request #9662 from Poliwrath/jpeg-quality
Increase screenshot quality when using JPEG setting
2020-07-24 15:57:52 +09:00
Poliwrath
05235c70c5 remove jpeg quality setting, use 92 for quality 2020-07-24 02:26:45 -04:00
Poliwrath
4e0f16a450 Add JPEG screenshot quality setting 2020-07-24 02:00:18 -04:00
Dean Herbert
05acd8c8d6
Merge pull request #9661 from peppy/limit-notification-length 2020-07-24 14:50:35 +09:00
Dan Balasescu
4d7d4a7c7a
Merge pull request #9613 from peppy/fix-menu-cursor-container-allocs
Reduce memory allocations in MenuCursorContainer
2020-07-24 14:17:29 +09:00
Dean Herbert
d093dc09f9 Limit notification text length to avoid large error messages degrading performance 2020-07-24 14:10:05 +09:00
smoogipoo
44b0aae20d Allow nullable ruleset, reword xmldoc 2020-07-24 13:54:47 +09:00
smoogipoo
b10b99a670 Change method signatures to remove tracked/untracked 2020-07-24 13:52:43 +09:00
smoogipoo
de007cc1c6 Use IEnumerable mods instead of IReadOnlyList 2020-07-24 13:40:01 +09:00
smoogipoo
264bd7ced1 Apply general refactoring from review 2020-07-24 13:38:53 +09:00
Dean Herbert
f75f1231b7 Invert conditional for readability 2020-07-24 10:41:09 +09:00
Dean Herbert
0d44769288
Merge branch 'master' into osu-logo-no-update-transforms 2020-07-24 10:36:37 +09:00
Dean Herbert
df3b91d029
Merge branch 'master' into fix-menu-cursor-container-allocs 2020-07-24 10:36:26 +09:00
Dean Herbert
e43d3ddfc7
Merge branch 'master' into add-spinner-bonus-score 2020-07-24 10:36:10 +09:00
smoogipoo
76284a0f01 Move cancellation out of condition 2020-07-23 23:18:51 +09:00
Dean Herbert
1e9ee9c798
Merge pull request #9656 from peppy/update-framework
Update framework
2020-07-23 23:05:16 +09:00
Dean Herbert
0050f6348f
Merge branch 'master' into add-spinner-bonus-score 2020-07-23 23:05:04 +09:00
Dean Herbert
d0b35d7b32 Update framework 2020-07-23 22:13:37 +09:00
Dan Balasescu
f3247b07be
Merge pull request #9646 from peppy/add-slider-slide-support
Add slider "sliding" sample support
2020-07-23 21:53:27 +09:00
Dan Balasescu
497d7a6d0e
Merge pull request #9639 from EVAST9919/overlay-header-padding
Make content side padding adjustable for OverlayHeader
2020-07-23 21:28:19 +09:00
smoogipoo
c348599189 Merge branch 'master' into add-slider-slide-support 2020-07-23 21:24:45 +09:00
smoogipoo
f883cb85d7 Null out the sample too 2020-07-23 21:24:31 +09:00
Dan Balasescu
9ed50a0498
Merge branch 'master' into overlay-header-padding 2020-07-23 20:58:07 +09:00
Dan Balasescu
2997fb3f4e
Merge pull request #9635 from peppy/perfect-mod-combo-objects-only
Make perfect mod ignore all non-combo-affecting hitobjects
2020-07-23 20:54:39 +09:00
Dan Balasescu
01edce7130
Merge pull request #9642 from peppy/score-panel-expanded-cover-background
Add user cover background to expanded version of score panel
2020-07-23 20:36:15 +09:00
Lucas A
5e6adfff99 Disable windows key only while in gameplay. 2020-07-23 12:45:14 +02:00
Dan Balasescu
f106106dc4
Merge pull request #9648 from peppy/fix-slider-ball-rotation
Fix slider ball rotation being applied to follow circle and specular layer
2020-07-23 19:39:58 +09:00
Dean Herbert
acff270e96 Fix failing test by moving slider closer 2020-07-23 19:14:18 +09:00
Lucas A
4102dae999 Revert commit 939441ae 2020-07-23 11:56:46 +02:00
Dean Herbert
ee05d5cb14 Remove no-longer-necessary play trigger on skin change 2020-07-23 09:06:15 +09:00
Dean Herbert
e3cf958f27
Merge pull request #9650 from smoogipoo/refactor-multi-requests
Re-namespace multiplayer requests and responses
2020-07-23 08:12:21 +09:00
jorolf
50f72ac9cb rename classes 2020-07-22 22:10:59 +02:00
Dan Balasescu
860f10ceee
Merge pull request #9645 from peppy/fix-skinnable-sound-contianuance
Fix SkinnableSounds not continuing playback on skin change
2020-07-22 21:38:21 +09:00
Dean Herbert
113fac84dd Fix circle container type 2020-07-22 21:14:04 +09:00