1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 04:32:53 +08:00
Commit Graph

43746 Commits

Author SHA1 Message Date
Dean Herbert
a1936b141b Refactor base class to allow correct usage in taiko drum 2021-08-25 16:56:44 +09:00
Dean Herbert
681215e5b5 Rewrite object lookup to use previous entry regardless
This changes the fallback logic to always prefer the previous resolved
lifetime entry rather than fallback to the first entry ever. I think
this is more correct in all cases.

Also rewrites the inline comments to hopefully be easier to parse.
2021-08-25 16:56:44 +09:00
Dean Herbert
4a294d4de4 Optimise fallback logic to reduce lookups to bare minimum 2021-08-25 16:56:44 +09:00
Dean Herbert
6aa894e55e Split out separate component 2021-08-25 16:56:44 +09:00
Dan Balasescu
d5fcc5f762
Merge pull request #14485 from peppy/fix-mania-hold-note-input-gobbling
Fix osu!mania hold notes eating input whenever on screen
2021-08-25 15:35:20 +09:00
Dan Balasescu
10cdb1c963
Merge pull request #14484 from peppy/user-events-in-participant-list
Add ability to handle user join/leave/kick events in `MultiplayerComposite`s
2021-08-25 15:14:28 +09:00
Dan Balasescu
351015357c
Merge branch 'master' into user-events-in-participant-list 2021-08-25 14:39:26 +09:00
Dean Herbert
6a1cf12763
Merge pull request #14480 from bdach/countdown-beatmap-info
Add countdown settings to beatmap info
2021-08-25 14:38:34 +09:00
Dean Herbert
e1ab3434ed Add ability to handle user join/leave/kick events in MultiplayerComposites 2021-08-25 14:37:14 +09:00
Salman Ahmed
ca527262e3
Merge branch 'master' into countdown-beatmap-info 2021-08-25 08:30:27 +03:00
Dean Herbert
414457ba57 Add basic xmldoc explaining CountdownOffset 2021-08-25 13:24:52 +09:00
Dan Balasescu
6fcbf81995
Merge pull request #14284 from LeNitrous/activity-on-multiplayer-screens
Update Discord user status for multiplayer/playlists
2021-08-25 11:22:26 +09:00
Bartłomiej Dach
acc27fc79c
Add test case for countdown in encode-decode stability test 2021-08-24 22:04:56 +02:00
Bartłomiej Dach
a6c2cbd2e5
Add countdown settings to beatmap info model 2021-08-24 21:55:10 +02:00
Bartłomiej Dach
e503182a8d
Merge branch 'master' into activity-on-multiplayer-screens 2021-08-24 18:50:55 +02:00
Dean Herbert
6252b8aa42 Fix hold notes handling all input ever 2021-08-24 19:08:04 +09:00
Dean Herbert
4289773371
Merge pull request #14476 from smoogipoo/fix-hud-test-failure-2
Fix gameplay HUD load not always completing if initially hidden
2021-08-24 17:18:40 +09:00
Dean Herbert
568a8ee97e
Merge branch 'master' into fix-hud-test-failure-2 2021-08-24 16:54:48 +09:00
Dean Herbert
3f0f820653 Add comment explaining reasoning for override 2021-08-24 16:54:19 +09:00
Dean Herbert
08f757a584
Merge pull request #14474 from smoogipoo/fix-multi-crash
Fix crash when entering multiplayer gameplay
2021-08-24 16:20:18 +09:00
Dan Balasescu
6a916a264f
Merge pull request #14441 from Henry-YSLin/mod-incompatibility-ui
Show mods that are incompatible with the current selection
2021-08-24 16:16:35 +09:00
Dan Balasescu
ea98ce1b39
Merge pull request #14465 from peppy/improve-stable-skin-import
Improve skin stable import behaviour to better handle similar skins
2021-08-24 16:08:15 +09:00
smoogipoo
9f17c38e36 Fix hud overlay components being blocked from load 2021-08-24 15:18:27 +09:00
smoogipoo
342f2d756d Fix test not working intermittently 2021-08-24 15:18:05 +09:00
Dean Herbert
16c0f3d5b4
Merge pull request #14272 from gagahpangeran/pinned-comment
Add pinned comment section in comment container
2021-08-24 15:11:49 +09:00
Dean Herbert
a5f6c287ea Split out pinned comment content to only be constructed when required 2021-08-24 14:43:28 +09:00
Dean Herbert
4bbc98737f Fix english in test steps 2021-08-24 14:39:03 +09:00
Dean Herbert
8cd972a9fe Merge branch 'master' into pinned-comment 2021-08-24 14:37:31 +09:00
Dean Herbert
aba9688a6b
Merge pull request #14475 from frenzibyte/improve-beatmap-info-wedge
Update beatmap info wedge text on mod change without full refresh
2021-08-24 14:27:36 +09:00
smoogipoo
16ddbcd208 Don't bind to RoomId where it's expected to be constant 2021-08-24 14:25:40 +09:00
Dean Herbert
c3b7ce0b05 Remove stray newline 2021-08-24 14:02:50 +09:00
Dean Herbert
afd01d22d6 Adjust visuals of incompatible icon and move to own class 2021-08-24 14:01:49 +09:00
Salman Ahmed
847726547a Move mod value change callback inside wedge info text component 2021-08-24 07:53:49 +03:00
Dean Herbert
bf0a1167ec Improve update flow and ensure selected mods is read from local context 2021-08-24 13:35:39 +09:00
smoogipoo
b719887810 Fix test compile errors 2021-08-24 13:34:23 +09:00
smoogipoo
de0de451fe Refactor to remove resolved dependency 2021-08-24 13:29:19 +09:00
smoogipoo
df170afbc4 Fix multiplayer crashing when entering gameplay 2021-08-24 13:22:06 +09:00
smoogipoo
c2974cfc65 Add full multiplayer gameplay flow test 2021-08-24 13:20:01 +09:00
smoogipoo
956c1cc216 Merge branch 'master' into activity-on-multiplayer-screens 2021-08-24 12:33:34 +09:00
Dan Balasescu
8ff30ffd1d
Merge pull request #14435 from bdach/difficulty-cache-difficulty-adjust
Fix difficulty cache lookups sharing underlying mod instances
2021-08-24 12:32:19 +09:00
Dan Balasescu
dfd61e413a
Merge branch 'master' into difficulty-cache-difficulty-adjust 2021-08-24 12:08:52 +09:00
Dean Herbert
3c9718339c
Merge pull request #14444 from frenzibyte/decouple-ruleset-bindables
Decouple rankings overlay's ruleset selector from the game-wide ruleset bindable
2021-08-24 11:58:13 +09:00
Henry Lin
b8fe03b77f Use Mod.Equals for comparison 2021-08-24 09:50:09 +08:00
Henry Lin
6e3d05c7ce Display an icon to signify incompatibility instead of a red tint 2021-08-24 09:42:53 +08:00
Salman Ahmed
9d807656f2 Add more complete test coverage of decoupling 2021-08-23 21:08:59 +03:00
Salman Ahmed
d91bb5c37c
Merge pull request #14467 from rednir/update-section-selection-childcount
Fix settings section not being selected when the search term changes
2021-08-23 21:07:41 +03:00
Salman Ahmed
13a24ed36f
Merge branch 'master' into update-section-selection-childcount 2021-08-23 20:43:46 +03:00
Bartłomiej Dach
5ebc9d15be
Merge pull request #14462 from peppy/editor-setup-file-selector-popovers
Show editor file choosers in a popover rather than inline
2021-08-23 18:53:54 +02:00
Bartłomiej Dach
ccf337bdc2
Merge branch 'master' into editor-setup-file-selector-popovers 2021-08-23 18:28:44 +02:00
Davran Dilshat
6bea744e34 invalidate scroll position 2021-08-23 17:13:25 +01:00