1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 10:57:30 +08:00
Commit Graph

8260 Commits

Author SHA1 Message Date
smoogipoo
ecd0b84d94 Use max_sync_offset constant 2021-04-08 22:15:07 +09:00
smoogipoo
1b5679b0d7 Refactor ctor 2021-04-08 22:14:26 +09:00
smoogipoo
7d276144b8 Fix player sizing + masking 2021-04-08 22:13:54 +09:00
smoogipoo
709016f0d6 Add initial multiplayer screen implementation 2021-04-08 22:07:00 +09:00
smoogipoo
d64b236f86 Add a container that provides an isolated gameplay context 2021-04-08 21:27:16 +09:00
smoogipoo
125358158b Merge branch 'master' into multiplayer-spectator-screen 2021-04-08 21:13:37 +09:00
Dean Herbert
1e23f671fa
Merge pull request #12321 from smoogipoo/add-spectate-button-and-state
Add multiplayer spectating user state and button
2021-04-08 19:48:58 +09:00
smoogipoo
fd2a14a0bf Only set button state once 2021-04-08 16:31:40 +09:00
Dean Herbert
a55e62188e Change state icon to binoculars so the eye isn't staring at me 2021-04-08 15:54:58 +09:00
Dean Herbert
b73860cb5f Slightly alter button colour scheme to make text more legible and reduce saturation 2021-04-08 15:47:55 +09:00
smoogipoo
72a42ceaf7 Merge branch 'multiplayer-spectator-player-grid' into multiplayer-spectator-screen 2021-04-08 00:19:00 +09:00
smoogipoo
5dc939c2f3 More documentation 2021-04-08 00:12:21 +09:00
smoogipoo
024adb699c Add test and fix several issues 2021-04-08 00:12:21 +09:00
smoogipoo
648a9d5258 Add multiplayer spectator player grid 2021-04-08 00:12:21 +09:00
smoogipoo
65014d9596 Merge branch 'apply-screen-suspension-changes' into multiplayer-spectator-screen 2021-04-07 22:28:44 +09:00
smoogipoo
99bee73ac1 Merge branch 'master' into add-spectate-button-and-state 2021-04-07 22:07:52 +09:00
smoogipoo
1f4c17b8f8 Apply changes to AllowScreenSuspension bindable 2021-04-07 21:20:44 +09:00
Dan Balasescu
6eb809f4c4
Merge pull request #9194 from boswelja/rebind-song-select
Allow rebinding Song Select mods/random/options keys
2021-04-07 20:55:45 +09:00
smoogipoo
93c5935ebc Add match subscreen support + test 2021-04-07 20:46:30 +09:00
Dean Herbert
0f2c03d54b Add back "rewind" text, showing temporarily after a rewind occurs 2021-04-07 18:29:45 +09:00
smoogipoo
abd637ffaa Add button to footer 2021-04-07 17:35:18 +09:00
Dean Herbert
afc745f999 Merge branch 'master' into rebind-song-select 2021-04-07 17:13:25 +09:00
smoogipoo
56c13148f1 Fix typo in class name 2021-04-07 16:45:10 +09:00
smoogipoo
c744f77cfa Add participant panel state 2021-04-07 16:40:24 +09:00
smoogipoo
6be9c9f0f4 Link up ready button to spectate state 2021-04-07 16:35:50 +09:00
smoogipoo
6de91d7b6b Add spectate button + test 2021-04-06 21:37:27 +09:00
Dean Herbert
d4c55070e7
Merge pull request #12283 from bdach/setup-screen-design-refresh
Refresh setup screen appearance to be closer to design
2021-04-06 18:33:34 +09:00
Dan Balasescu
ba3689b5b9
Merge pull request #12269 from PercyDan54/beatmap-details
Use OnlineViewContainer for BeatmapDetails
2021-04-06 17:52:32 +09:00
Dean Herbert
3113eefcf6 Don't attempt to load content when not online 2021-04-06 17:12:00 +09:00
Dean Herbert
899d708dac Move loading layer up one level to correct padding 2021-04-06 17:09:51 +09:00
Dean Herbert
1934e8e1fe Fix loading layer being in the wrong place 2021-04-06 16:30:47 +09:00
Dean Herbert
59e6c46644 Remove unnecessary online state logic 2021-04-06 16:23:27 +09:00
Dean Herbert
dafa8bbe4e Refactor BeatmapDetails to use GridContainer to keep a consistent layout 2021-04-06 16:21:20 +09:00
Dean Herbert
9d0839be8f Remove no longer necessary FinishTranforms call 2021-04-06 15:35:07 +09:00
Dean Herbert
316a557a99 Split select area background into own class to reduce hover state complexity 2021-04-06 15:34:34 +09:00
Dean Herbert
7d301a6336 Improve timeline hover display before time zero with a gradient fade 2021-04-06 14:34:16 +09:00
Dean Herbert
35dd1c68aa Fix drag/selection events not propagating correctly to TimelineBlueprintContainer when before time zero 2021-04-06 14:34:16 +09:00
Dean Herbert
8ff13845d1 Add marker showing where 00:00:000 is 2021-04-06 14:24:22 +09:00
Bartłomiej Dach
0a1417bc67 Swap order of background/audio track changing methods
Mostly for quality of reviewing (restores previous order) and more
consistency overall.
2021-04-04 13:10:12 +02:00
Bartłomiej Dach
a0f0ae7979 Adjust spacings in resources section 2021-04-04 12:53:51 +02:00
Bartłomiej Dach
f2d4ca7676 Add background chooser text box 2021-04-04 12:50:50 +02:00
Bartłomiej Dach
9394af32f5 Move drag & drop support logic to chooser component 2021-04-04 12:34:52 +02:00
Bartłomiej Dach
294d911426 Move background chooser to header 2021-04-03 20:53:07 +02:00
Bartłomiej Dach
61f9eb51c4 Split background chooser to own component 2021-04-03 20:36:30 +02:00
Bartłomiej Dach
3572178bdc Add tab control to setup screen header 2021-04-03 20:13:20 +02:00
Bartłomiej Dach
95d7e6c74b Explicitly associate setup sections with titles 2021-04-03 19:58:49 +02:00
Bartłomiej Dach
bdd1072dce Adjust colours and spacing to be closer to design 2021-04-03 18:52:50 +02:00
Bartłomiej Dach
4df7ff21c7 Fix editor arrow seek snapping not updating after control point changes
The editor clock, which is responsible for performing the seek, was not
aware of changes in control points due to reading from the wrong
beatmap. `loadableBeatmap` is not actually changed by any of the editor
components; `playableBeatmap` and `editorBeatmap` are.

For now this is changed to use `playableBeatmap`. A better follow-up
would be to use `editorBeatmap`, but it would probably be best to move
the beat snap bindable into `EditorBeatmap` first.
2021-04-03 14:02:46 +02:00
Dean Herbert
eb1e850f99
Merge pull request #12254 from smoogipoo/spectator-refactor
Move frame-handling spectator logic into abstract base class
2021-04-03 17:23:33 +09:00
hbnrmx
824fb9f398 reopen FileSelector in the directory of the previous selection 2021-04-02 18:01:26 +02:00
hbnrmx
438f3e6349 move fallback text to PlaceholderText 2021-04-02 17:57:21 +02:00
PercyDan54
a5a19319cc
Fix code style 2021-04-02 21:15:28 +08:00
smoogipoo
cd53074941 Schedule spectator callbacks 2021-04-02 21:27:20 +09:00
PercyDan54
1ff77754fd
Use OnlineViewContainer 2021-04-02 20:14:31 +08:00
smoogipoo
d2950105fb Add comment explaining use of lock 2021-04-02 20:31:34 +09:00
Dean Herbert
45d16fb916 Rename event parameter for clarity 2021-04-02 16:56:47 +09:00
smoogipoo
9bc2a486e0 Make SoloSpectator use the new SpectatorScreen class 2021-04-01 22:10:17 +09:00
smoogipoo
9e95441aa6 Rename Spectator -> SoloSpectator 2021-04-01 22:08:52 +09:00
smoogipoo
af478fb2eb Add abstract spectator screen class 2021-04-01 22:02:32 +09:00
Dan Balasescu
f8c1dfe57f
Merge branch 'master' into editor-fix-speed-multiplier-precision 2021-03-31 17:17:25 +09:00
Dean Herbert
0c53b4eb93 Fix wrong counting and add test 2021-03-31 14:09:39 +09:00
Dean Herbert
e0c61f4dc5 Fix retry count not updating correctly
Regressed with changes to player reference retention logic. Could add a
test but the logic is so local now it seems quite redundant.
2021-03-31 13:57:58 +09:00
Dean Herbert
90c75a64cf Fix legacy control point precision having an adverse effect on the editor 2021-03-30 15:24:11 +09:00
Dan Balasescu
d2ef0ba644
Merge branch 'master' into add-editor-nudging-support 2021-03-30 14:34:43 +09:00
Dan Balasescu
1bb9f018a0
Merge branch 'master' into fix-timeline-depth-ordering 2021-03-29 20:47:47 +09:00
Dan Balasescu
3cf6a3f56d
Merge pull request #12076 from peppy/add-timeline-stacking-support
Implement editor timeline stacking support
2021-03-29 20:44:52 +09:00
Dean Herbert
690debe507
Merge pull request #12030 from LeNitrous/editor-platform-clipboard-copy 2021-03-29 19:31:16 +09:00
Dean Herbert
3909eda095 Avoid using a StringBuilder 2021-03-29 18:51:28 +09:00
Dean Herbert
90ab765cf5 Reorder methods and surround with region 2021-03-29 18:46:32 +09:00
Dan Balasescu
4a5fc82388
Merge branch 'master' into add-timeline-stacking-support 2021-03-29 18:42:59 +09:00
Nathan Alo
cdb779f764 move copy logic inside ComposeScreen 2021-03-29 17:30:23 +08:00
Dean Herbert
16e184e531
Merge pull request #12183 from frenzibyte/legacy-sprite-text-fonts
Improve code quality of constructing legacy sprite texts
2021-03-27 20:39:33 +09:00
Nathan Alo
21398e25b5 null check composer and ensure the correct start time from selected hit objects 2021-03-27 10:02:21 +08:00
Nathan Alo
c96321206a fix appveyor complaints 2021-03-26 16:17:24 +08:00
Nathan Alo
71a0616861 remove extra semi colons 2021-03-26 15:34:45 +08:00
Nathan Alo
374f8c5e22 move to compose namespace and add license header 2021-03-26 15:33:28 +08:00
Dean Herbert
cb48e5f158 Fix timeline not visually ordering hitobjects in a stable way 2021-03-26 16:33:18 +09:00
Nathan Alo
b8b7eb4c4b refactor logic to its own component and handle hit object to string conversion to its ruleset-specific composers 2021-03-26 15:25:20 +08:00
Nathan Alo
2bea69456e remove implementations 2021-03-26 15:24:33 +08:00
Dean Herbert
77969bb223 Merge branch 'master' into add-timeline-stacking-support 2021-03-26 16:17:10 +09:00
Dean Herbert
6a4157d193 Remove unused using statement 2021-03-26 16:13:43 +09:00
Dean Herbert
7faca766e4 Fix crash on attempting to join lobby using key press during a pending join
Closes https://github.com/ppy/osu/issues/12040.
2021-03-26 14:49:05 +09:00
Salman Ahmed
6aa0c9d8fd Merge branch 'master' into legacy-sprite-text-fonts 2021-03-25 14:52:01 +03:00
Dean Herbert
f6647de769 Add support for nudging objects in the editor using ctrl+arrow keys
Closes #12042.
2021-03-25 19:56:28 +09:00
Dean Herbert
8d4ff867bf Fix barlines showing up in the osu!mania editor's timeline 2021-03-25 16:30:31 +09:00
Dean Herbert
9fdd23b134 Fix various issues with stacking 2021-03-25 16:28:30 +09:00
Dean Herbert
bdc783b55f Merge branch 'master' into add-timeline-stacking-support 2021-03-25 15:28:30 +09:00
Dean Herbert
7b3336783f
Stabilise ordering instead of simple reversing
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-03-25 15:24:59 +09:00
Dean Herbert
4269cb7124 Extract majority of token retrieval code out of LoadComponentAsync for legibility 2021-03-25 13:48:41 +09:00
Dean Herbert
d55324585d Change RoomSubmittingPlayer's request implementation to return null on RoomID missing, rather than silently succeeding 2021-03-24 13:23:23 +09:00
Dean Herbert
84b2f9a848 Make token private 2021-03-24 13:20:44 +09:00
Dean Herbert
a0c6c4da35 Rename and refactor token request process to be easier to understand 2021-03-24 13:17:29 +09:00
Dean Herbert
e372e355ef Reorder overrides in SoloPlayer to better follow chronological request order 2021-03-24 13:12:51 +09:00
Dean Herbert
8bed7748d6 Rename token request method to avoid double Request terminology 2021-03-24 13:02:37 +09:00
Dean Herbert
a1c35677ef Add more xmldoc 2021-03-24 13:02:17 +09:00
Dean Herbert
e649a330a4 Implement SoloPlayer's request construction 2021-03-23 18:23:25 +09:00
Dean Herbert
242b847516 Add flow for allowing gameplay to continue even when an error occurs with token retrieval 2021-03-23 18:23:25 +09:00
Dean Herbert
3cd8bf2d7f Move token request construction to LoadAsyncComplete to better allow DI usage 2021-03-23 18:20:55 +09:00
Dean Herbert
571124669d Remove all references to "score submission" from Player 2021-03-23 18:20:55 +09:00
Dean Herbert
194b2d05d3 Update SoloPlayer to derive SubmittingPlayer 2021-03-23 18:20:55 +09:00