1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-18 23:02:55 +08:00
Commit Graph

30837 Commits

Author SHA1 Message Date
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
Dan Balasescu
372754f1a2
Merge pull request #9649 from peppy/hide-repeat-judgements
Hide slider repeat judgements temporarily
2020-07-22 20:36:00 +09:00
Dan Balasescu
a640541324
Merge pull request #9612 from peppy/input-handler-updates
Input handler updates in line with framework changes
2020-07-22 20:30:32 +09:00
Dean Herbert
2c62b23d85 Update naming 2020-07-22 19:53:45 +09:00
Dean Herbert
798bf05038 Update framework 2020-07-22 19:51:52 +09:00
Dean Herbert
bd6a51f545 Hide slider repeat judgements temporarily 2020-07-22 19:30:10 +09:00
Dean Herbert
53a9ac3c1a Fix slider ball rotation being applied to follow circle and specular layer 2020-07-22 19:06:39 +09:00
smoogipoo
e423630b7c Rename RoomScore -> MultiplayerScore 2020-07-22 18:37:00 +09:00
smoogipoo
0957c5f74c Re-namespace multiplayer requests/responses 2020-07-22 18:34:04 +09:00
Dean Herbert
2126f6bffc Add slider "sliding" sample support 2020-07-22 16:37:58 +09:00
Dean Herbert
3ed40d3a6b Fix SkinnableSounds not continuing playback on skin change 2020-07-22 16:37:58 +09:00
Dean Herbert
ac602846df Expose balance and sample loading methods in DrawableHitObject 2020-07-22 16:37:58 +09:00
Dean Herbert
11f48ee4db
Merge branch 'master' into overlay-header-padding 2020-07-22 16:22:20 +09:00
Dean Herbert
c52cddc5d8
Merge pull request #9641 from EVAST9919/spotlights-selector-refactor 2020-07-22 16:22:04 +09:00
smoogipoo
6b7f05740e Fix potential missing ruleset 2020-07-22 12:48:12 +09:00
smoogipoo
aca4110e36 Use existing star difficulty if non-local beatmap/ruleset 2020-07-22 12:47:53 +09:00
Dean Herbert
cccb47e6e0 Add user cover background to expanded version of score panel 2020-07-22 11:29:23 +09:00
Andrei Zavatski
ad9492804a Apply suggestions 2020-07-21 22:56:44 +03:00
Andrei Zavatski
0a71194ea6 Fix SpotlightSelector is a VisibilityContainer without a reason 2020-07-21 22:46:08 +03:00
Andrei Zavatski
0145ca09e5 Apply changes to overlays 2020-07-21 20:11:10 +03:00
Andrei Zavatski
e96f8f1cb6 Make content side padding adjustable for OverlayHeader 2020-07-21 20:02:22 +03:00
smoogipoo
00e6217f60 Don't store BeatmapInfo/RulesetInfo references, remove TimedExpiryCache 2020-07-21 23:50:54 +09:00
smoogipoo
107b5ca4f2 Add support for bindable retrieval 2020-07-21 23:13:04 +09:00
smoogipoo
599a15edb8 Merge branch 'master' into beatmap-difficulty-manager 2020-07-21 20:09:53 +09:00
Dean Herbert
bc079fccf5 Add health drain for spinner ticks 2020-07-21 19:52:16 +09:00
Dean Herbert
1560e1786a Revert back to bool for application 2020-07-21 19:48:44 +09:00
Dean Herbert
3aa0f82c9d Merge branch 'master' into add-spinner-bonus-score 2020-07-21 19:22:57 +09:00
Dean Herbert
a4680d7a89 Reduce test range as to not hit spin cat 2020-07-21 19:22:42 +09:00
Dean Herbert
7f2ae694cc Simplify rewind handling 2020-07-21 19:21:30 +09:00
Dean Herbert
947f4e0d4c Move tick handling to DrawableSpinner itself 2020-07-21 19:20:19 +09:00
Dean Herbert
05102bc1ba Split ticks up into bonus and non-bonus 2020-07-21 18:22:37 +09:00