1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 21:27:24 +08:00
Commit Graph

42971 Commits

Author SHA1 Message Date
kj415j45
9a5d4ffd43
Add GeneralSettingsStrings 2021-08-12 12:34:02 +08:00
kj415j45
97041de09f
Preparation for localisation. 2021-08-12 12:34:02 +08:00
Dean Herbert
054e0e8eed
Merge pull request #14241 from smoogipoo/fix-osu-editor-exception
Fix out-of-order hits in editor causing exceptions
2021-08-12 12:40:00 +09:00
Dean Herbert
ee4fc049bc
Merge branch 'master' into fix-osu-editor-exception 2021-08-12 12:15:04 +09:00
Dan Balasescu
448b66f36c
Merge pull request #14224 from peppy/multiplayer-kick-support
Add kick button (and required server shared interface updates)
2021-08-12 12:09:16 +09:00
Dan Balasescu
60e988aac3
Merge branch 'master' into multiplayer-kick-support 2021-08-12 11:46:56 +09:00
Dan Balasescu
7742749b71
Merge pull request #14179 from peppy/multiplayer-team-vs-leaderboard
Show team colours in gameplay leaderboard and add a team score bar
2021-08-12 11:46:48 +09:00
smoogipoo
9393c6351d Fix another potential test case failure 2021-08-12 11:08:52 +09:00
smoogipoo
531fba8f39 Fix potential test case failure 2021-08-12 11:05:31 +09:00
smoogipoo
543482111b Remove outdated todo 2021-08-12 10:40:14 +09:00
smoogipoo
5d0b92e28c Fix multi spectator test not showing teams 2021-08-12 10:38:20 +09:00
smoogipoo
c160e50f4f Merge branch 'master' into multiplayer-team-vs-leaderboard 2021-08-12 10:27:31 +09:00
smoogipoo
fbaa480b3e Fix out-of-order hits in editor causing exceptions 2021-08-12 10:08:54 +09:00
Dan Balasescu
ce7ff04512
Merge pull request #14220 from peppy/update-framework
Update framework
2021-08-11 19:08:56 +09:00
Dan Balasescu
369794501b
Merge branch 'master' into update-framework 2021-08-11 18:11:36 +09:00
Dan Balasescu
2c935df190
Merge pull request #14221 from peppy/bring-back-osu-game-test-scene
Bring back `TestSceneOsuGame`
2021-08-11 18:09:51 +09:00
Dean Herbert
d6352637d6 Also add tooltip and context menu item 2021-08-11 17:45:34 +09:00
Dean Herbert
bb51ebd0ef Don't show button on self 2021-08-11 17:42:46 +09:00
Dean Herbert
50bda6023c Add test coverage 2021-08-11 17:31:54 +09:00
Dean Herbert
7aab8c32ec Add kick button and hook up logic 2021-08-11 17:31:54 +09:00
Dean Herbert
e8ad0fba75 Add required server methods for kicking users 2021-08-11 17:20:41 +09:00
Dean Herbert
3f067e3a8d Remove likely unnecessary score null check 2021-08-11 16:59:42 +09:00
Dean Herbert
313db934da
Merge pull request #14148 from nekodex/context-menu-sounds
Add open/close sounds to context menus
2021-08-11 16:43:00 +09:00
Dean Herbert
0ffe740ca1 Bring back TestSceneOsuGame
I marked this as headless to avoid it being "ungrouped", but it turns
out this is quite useful to have around and I have searched for it on
multiple occasions.
2021-08-11 16:24:49 +09:00
Dean Herbert
d1dfb785d8
Merge branch 'master' into context-menu-sounds 2021-08-11 16:21:13 +09:00
Dean Herbert
f8683e2256 Update framework 2021-08-11 16:17:21 +09:00
Dean Herbert
ee3b373e8a Correctly handle tied scores 2021-08-11 14:48:37 +09:00
Dean Herbert
cf82bca09c Change logic to only handle the case of exactly two teams 2021-08-11 14:44:13 +09:00
Dan Balasescu
c54a37a4ca
Merge pull request #14218 from peppy/nub-animation-speed
Adjust checkbox / sliderbar animation speeds to match sound effects better
2021-08-11 12:56:14 +09:00
Dean Herbert
a3a9d0579f Adjust checkbox / sliderbar animation speeds to match sound effects better 2021-08-11 12:33:14 +09:00
Dan Balasescu
56b23fc765
Merge branch 'master' into context-menu-sounds 2021-08-11 11:46:10 +09:00
Dan Balasescu
298f7b9f18
Merge pull request #14173 from ggliv/catch-mod-mirror
Add "Mirror" mod to osu!catch
2021-08-11 10:09:18 +09:00
Dan Balasescu
a3159bda8c
Merge branch 'master' into catch-mod-mirror 2021-08-11 09:41:03 +09:00
Bartłomiej Dach
a9e53107d1
Also mirror banana showers 2021-08-10 22:33:28 +02:00
Bartłomiej Dach
637e5cb6b7
Fix offsets not being mirrored 2021-08-10 22:33:28 +02:00
Bartłomiej Dach
30cb4280a4
Add test for catch beatmap mirroring 2021-08-10 22:33:28 +02:00
Bartłomiej Dach
4268e4d750
Fix nested menus layering close samples if multiple menu levels are closed 2021-08-10 20:40:53 +02:00
Bartłomiej Dach
cf69c356ae
Merge pull request #14205 from smoogipoo/fix-legacy-slider-alpha
Fix incorrect legacy skin slider body alpha
2021-08-10 20:18:45 +02:00
Bartłomiej Dach
89c9fb4320
Merge branch 'master' into fix-legacy-slider-alpha 2021-08-10 19:59:33 +02:00
Bartłomiej Dach
9b01b4b5cb
Merge pull request #14207 from peppy/update-framework-resources
Update framework and resources
2021-08-10 17:01:12 +02:00
Dean Herbert
58db6b758d Update resources 2021-08-10 18:47:39 +09:00
Dean Herbert
60302e3daa Update framework 2021-08-10 18:46:20 +09:00
Dean Herbert
a503274e1d Pass through MultiplayerRoomUsers instead of ints to avoid re-retrieval 2021-08-10 18:39:20 +09:00
Dan Balasescu
b8748a86c5
Merge pull request #14204 from peppy/fix-null-ref-online-tracking-component
Fix potential null reference in online status resolution in multiplayer match
2021-08-10 18:36:13 +09:00
Dan Balasescu
a8df5360fd
Merge pull request #14145 from ekrctb/fix-dho-state-overwrite
Fix DHO state overwritten at `LoadComplete` if it is already changed
2021-08-10 18:30:05 +09:00
Dan Balasescu
33d4d635f2
Merge branch 'master' into fix-dho-state-overwrite 2021-08-10 17:55:18 +09:00
Dan Balasescu
79c2eedbd3
Merge pull request #14197 from peppy/add-playlist-item-download-progress
Add simple download progress display to download buttons on playlist items
2021-08-10 17:55:04 +09:00
Dean Herbert
53d03745e0 Remove unused test scene 2021-08-10 17:48:47 +09:00
Dan Balasescu
9cda5235a0
Merge branch 'master' into fix-dho-state-overwrite 2021-08-10 17:40:36 +09:00
smoogipoo
f86ef54e93 Fix incorrect legacy slider body alpha 2021-08-10 17:38:51 +09:00