Dean Herbert
1fff9a93b9
Merge branch 'master' into skin-editor-closest-anchor
2021-06-22 16:41:51 +09:00
Dean Herbert
1b0aadcc6f
Merge branch 'master' into transformers-per-skin
2021-06-22 16:03:15 +09:00
Joseph Madamba
db86098062
Fix dialog not closing after spamming OS window close
2021-06-21 20:23:11 -07:00
Joseph Madamba
9bcd1e6922
Move confirm dialog logic to OnExiting
2021-06-21 20:22:18 -07:00
Joseph Madamba
00b4cf1829
Handle sub screen OnExiting logic on main screen
2021-06-21 20:20:43 -07:00
Dean Herbert
b1fd812805
Merge branch 'master' into more-ui-sfx
2021-06-18 23:24:19 +09:00
Jamie Taylor
6e4fc26e16
replace 'songselect' hover/click sounds with 'button' ones for now
2021-06-18 21:03:46 +09:00
Dean Herbert
c751e087ca
Merge branch 'master' into skin-editor-closest-anchor
2021-06-18 18:54:07 +09:00
Dean Herbert
0bc68a7018
Move xmldoc to method
2021-06-18 16:50:31 +09:00
Dean Herbert
19507e107e
Reorder methods to make more sense
2021-06-18 16:46:40 +09:00
Dean Herbert
a7f40dc6d4
Merge branch 'remove-synchronous-prepare-score-method' into storyboard-outro-logic-refactor
2021-06-18 16:45:01 +09:00
Dean Herbert
45122594e5
Remove the synchronous version of PrepareScoreForResults
...
Replaces all existing usages with the `async` version.
2021-06-18 16:24:08 +09:00
Dean Herbert
f3426e38b4
Add note about delay parameter
2021-06-18 16:18:20 +09:00
Dean Herbert
3819a1f03b
Remove exit override behaviour
...
I don't actually know under what scenario this could have been hit, and
actually caused expected behaviour. Consider that in the scenario I
describe in the comment (which I added yesterday), the user is
requesting a pause or exit which would be "cancelled showing the results
instead". But in such a scenario, `PerformExit` would first be run,
which cancels the `resultsDisplayDelegate` in the first place.
The only special case would be pressing the close button on the window
decoration? Which I don't think should be a special case in the first
place, so I'm just going to remove this for the time being to keep
things simple.
2021-06-18 16:12:35 +09:00
Dean Herbert
7ef8eac773
Remove unnecessary (and no longer correct) exception
2021-06-18 16:08:31 +09:00
Dean Herbert
2bf855fcca
Move all storyboard outro skip logic out of updateCompletionState
...
This method should only be called to trigger the score completion
portion of player progression. The storyboard skip/end logic is now
handled separately in `progressToResults`.
2021-06-18 15:50:43 +09:00
Bartłomiej Dach
f282326f9a
Move score preparations back below ShowResults check
2021-06-17 19:04:52 +02:00
Bartłomiej Dach
3a1444e75d
Fix malformed xmldoc tag
...
Oops. Made a typo in the PR suggestion.
2021-06-17 19:02:56 +02:00
Dean Herbert
9facfe8964
Apply suggestions from code review
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-06-18 01:07:54 +09:00
Dean Herbert
e0a3696145
Merge branch 'master' into player-completion-refactoring
2021-06-17 23:51:42 +09:00
Bartłomiej Dach
aae2923e14
Merge branch 'master' into player-pause-exit-results-flow-refactoring
2021-06-17 16:05:09 +02:00
Bartłomiej Dach
10b0d066be
Reword comments slightly
2021-06-17 16:04:58 +02:00
Bartłomiej Dach
561dbea9e1
Use xmldoc-specific syntax for nicer formatting
2021-06-17 15:26:50 +02:00
Dean Herbert
d03c6da60c
Refactor and redocument updateCompletionState() and surrounding methods
2021-06-17 19:13:53 +09:00
Dean Herbert
246ab41cc6
Remove special casing for user exit during storyboard outro
2021-06-17 18:11:15 +09:00
Dean Herbert
7cbebe6d11
Rewrite xmldoc and inline comments for PerformExit
2021-06-17 18:10:59 +09:00
Dean Herbert
808b2baa41
Consume new behaviour to fix UserTile discrepancy
...
Closes https://github.com/ppy/osu/issues/13522 .
2021-06-17 16:31:12 +09:00
Dean Herbert
4b45d8318e
Merge branch 'master' into transformers-per-skin
2021-06-16 16:37:28 +09:00
Dean Herbert
83402a70db
Fix potential null ref when no beatmap is selected
2021-06-14 15:06:24 +09:00
Dean Herbert
f8b09b7c81
Avoid refresh if score is not related to current display
2021-06-14 14:28:14 +09:00
Dean Herbert
fc442713bb
Debounce schedule at base class
2021-06-14 14:26:40 +09:00
Dean Herbert
8dd48d48f6
Add support for song select leaderboard to handle newly imported scores
2021-06-14 14:20:23 +09:00
smoogipoo
9f163f7f20
Use switch statement to be more explicit about state
2021-06-11 19:23:25 +09:00
smoogipoo
0a8daab4f7
Pause master clock when too far ahead
2021-06-11 19:15:53 +09:00
smoogipoo
59eda70c12
Seek to the least most-recent frame instead
2021-06-11 18:40:56 +09:00
smoogipoo
263b8ff097
Wait for full player load
2021-06-11 18:14:37 +09:00
smoogipoo
a99cb79738
Seek master clock on multi-spectator start
2021-06-11 16:25:45 +09:00
smoogipoo
75d825c85c
Dont control master clock from sync manager
2021-06-11 16:24:52 +09:00
smoogipoo
1c67ef7c91
Make catchup clock support seeking
2021-06-11 16:23:59 +09:00
Dean Herbert
04413f1634
Merge pull request #13444 from peppy/editor-timeline-taiko-hit-colouring
...
Show osu!taiko centre/rim colouring in editor timeline
2021-06-11 15:10:24 +09:00
Dan Balasescu
97375d9625
Merge pull request #13438 from bdach/more-metadata-fields
...
Add remaining metadata fields to editor setup screen
2021-06-11 14:17:34 +09:00
Dean Herbert
bc3b7233ab
Show osu!taiko centre/rim colouring in editor timeline
...
Closes #13443 .
2021-06-11 14:17:30 +09:00
Bartłomiej Dach
7fd26ff3b0
Merge branch 'master' into more-metadata-fields
2021-06-11 06:35:51 +02:00
Dean Herbert
38bf04d7ff
Give more space for time values to allow for negative offsets
2021-06-11 13:25:09 +09:00
Bartłomiej Dach
417aaacc53
Add test coverage for romanised data transfer
2021-06-10 22:18:39 +02:00
Bartłomiej Dach
e41a5a0fcd
Add romanised author & title fields
2021-06-10 22:17:45 +02:00
ilsubyeega-desu
f65f074131
Add star keyword to FilterQueryParser criteria
2021-06-11 02:46:29 +09:00
Salman Ahmed
ef2c4fd0d8
Make RulesetSkinProvidingContainer able to be overriden for testing purposes
2021-06-10 16:36:46 +03:00
smoogipoo
e18f4cd4ba
Combine methods
2021-06-10 22:01:39 +09:00
smoogipoo
5073ede115
Clear existing frames when starting gameplay
2021-06-10 21:38:46 +09:00
smoogipoo
9eecb23fef
Only seek to the end on first frame arrival
2021-06-10 21:35:52 +09:00
Bartłomiej Dach
252fe0a6cc
Add source and tags text boxes to metadata section
2021-06-10 14:13:59 +02:00
Bartłomiej Dach
5a2e710095
Split common method for metadata textbox creation
2021-06-10 13:55:34 +02:00
Dean Herbert
4a4a561ca4
Merge pull request #13330 from nekodex/results-screen-sfx
...
Add sound effects to the results screen
2021-06-10 18:27:17 +09:00
Salman Ahmed
dde84e5cbd
Merge branch 'master' into transformers-per-skin
2021-06-10 11:58:52 +03:00
Dean Herbert
0667354fbd
Remove unused resolved skin
2021-06-10 17:30:04 +09:00
Dean Herbert
4f8000a574
Combine cases which return the same value
2021-06-10 17:29:36 +09:00
Dean Herbert
5e80f454ce
Merge branch 'master' into results-screen-sfx
2021-06-10 17:25:35 +09:00
Dan Balasescu
a44fd887ee
Merge branch 'master' into no-unranked-display
2021-06-10 17:09:46 +09:00
Joseph Madamba
cc38556f61
Fix background being dimmed forever after toggling statistics in results screen
2021-06-09 23:26:57 -07:00
Dean Herbert
9a3ca09501
Merge pull request #13384 from bdach/fixed-label-width
...
Align label widths of editor setup screen controls
2021-06-10 14:55:49 +09:00
Dean Herbert
209d217024
Remove unused using statement
2021-06-10 12:37:56 +09:00
Dean Herbert
3d508f9266
Merge branch 'master' into results-screen-sfx
2021-06-10 11:28:35 +09:00
Joseph Madamba
e3f3c37953
Add ability to navigate score panels with left/right arrows
2021-06-09 17:03:46 -07:00
Salman Ahmed
1aaad7bfd4
Apply few adjustments to skinning overlays comment
2021-06-09 22:49:31 +03:00
Salman Ahmed
e30f6581b3
Wrap gameplay content within a RulesetSkinProvidingContainer
2021-06-09 22:49:31 +03:00
Bartłomiej Dach
89cdea8123
Merge branch 'master' into fix-results-exit-transition
2021-06-09 19:40:56 +02:00
Dean Herbert
b02b8ae2bc
Merge pull request #13381 from smoogipoo/improve-hit-error-judgements
...
Improve hit error judgement displays
2021-06-09 19:40:17 +09:00
Dean Herbert
31b46afa71
Fix wrong naming scheme for applause samples
2021-06-09 19:35:05 +09:00
Dean Herbert
7d86dafd4f
Simplify tick calculation/playback method
2021-06-09 19:31:53 +09:00
Dean Herbert
57bc34f224
Move consts closer to usage
2021-06-09 19:24:35 +09:00
Dean Herbert
cb4f366651
Move forgotten private function down more
2021-06-09 19:15:55 +09:00
Dean Herbert
81cecac90b
Move tick rate initialisation to earlier
2021-06-09 19:09:00 +09:00
Dean Herbert
499aba95c0
Simplify sample construction logic and move private functions down
2021-06-09 19:06:37 +09:00
Dean Herbert
21a63efd78
Rename variable back to withFlair to match parent class
2021-06-09 18:55:29 +09:00
Dean Herbert
330bb7cb45
Remove unnecessary skin lookup logic
2021-06-09 18:55:29 +09:00
Dean Herbert
8fda04c2d9
Merge branch 'master' into results-screen-sfx
2021-06-09 18:00:11 +09:00
Dean Herbert
a65b76bdbf
Add a simple fade to the results screen
...
Stops it from immediately disappearing.
2021-06-09 17:19:37 +09:00
Dean Herbert
7b0c5e9d32
Fix results screen changing applied colour to background on exit
...
The general rule is that screens should only apply colours and the likes
on enter / resume, and leave the outwards transition to whatever screen
is coming next.
2021-06-09 17:18:55 +09:00
Dean Herbert
258d05d1e0
Ensure PlayerLoader restores the background colour to its own value on resume
2021-06-09 17:17:39 +09:00
Dean Herbert
a7ef0173e9
Add safety to ensure background is correct tint when entering gameplay
2021-06-09 17:07:28 +09:00
Bartłomiej Dach
020c63017e
Fix inspectcode issues
2021-06-09 09:21:02 +02:00
Bartłomiej Dach
a801a9a14d
Ensure background rotation on default skins
2021-06-09 07:59:47 +02:00
Dean Herbert
b754c52392
Update ModAutoplay matching to use new UserPlayable flag instead
2021-06-09 14:32:48 +09:00
Dean Herbert
7774344f0e
Remove "Unranked" text from ModDisplay
2021-06-09 13:45:09 +09:00
Bartłomiej Dach
97204b6f27
Reduce unnecessary background changes via IEquatable implementation
2021-06-08 22:37:18 +02:00
Bartłomiej Dach
a98c302211
Bring back skin background source
2021-06-08 22:04:59 +02:00
Bartłomiej Dach
5bf4dd6358
Move skin background to separate file
2021-06-08 21:57:08 +02:00
Bartłomiej Dach
410cb16340
Apply fixed label width to setup screen items
2021-06-08 17:18:00 +02:00
smoogipoo
00efed2c39
Add colours for tick judgements
2021-06-08 23:10:21 +09:00
smoogipoo
c8e14d7710
Ignore non-scorable and bonus judgements
2021-06-08 23:09:23 +09:00
smoogipoo
c3ea1b26e1
Fix DT being doubled in multiplayer spectator
2021-06-08 22:51:42 +09:00
Robin Avery
dc50ae40b9
Rename OverridesClosestAnchor to UsesFixedAnchor
2021-06-08 08:28:42 -04:00
smoogipoo
ab9290772b
Fix a similar case with online play sub-screens
2021-06-08 17:54:54 +09:00
smoogipoo
860f1aebb3
Only call OnBackButton() if the screen has finished loading
2021-06-08 17:38:12 +09:00
smoogipoo
7fa0ac6ed7
Fix possible nullref when exiting song select too fast
2021-06-08 17:03:50 +09:00
Dean Herbert
95852ccdf8
Merge branch 'master' into results-screen-sfx
2021-06-08 15:14:31 +09:00
Bartłomiej Dach
0531c2dcd9
Move empty window check to bar error meter
...
It's not valid in the base `HitErrorMeter`, as the colour meter only
displays colour for a given judgement, so it is still valid to add new
items to it even if the hit window is 0, as misses are still possible.
2021-06-07 13:16:07 +02:00
Bartłomiej Dach
37d062c7cd
Add failing assertions to hit error meter test
2021-06-07 13:16:07 +02:00
Dean Herbert
59130be99c
Fix switching storyboard mode not triggering a reload
2021-06-07 17:32:04 +09:00
Dean Herbert
f677f9b5f4
Stop BackgroundScreenDefault from reloading beatmap background when already correct
2021-06-07 17:22:36 +09:00
Robin Avery
29fa4fdf57
Refactor unacceptable syntax
2021-06-07 01:08:39 -04:00
Robin Avery
133d72a8c0
Rename UsingClosestAnchor
...
It is now "OverridesClosestAnchor". The logic is inverted accordingly.
2021-06-07 00:14:36 -04:00
Robin Avery
f28916e30f
Remove all UsingClosestAnchor() extension logic
...
It is replaced with ISkinnableDrawable.UsingClosestAnchor.
2021-06-07 00:04:53 -04:00
Robin Avery
ce635af83e
Add UsingClosestAnchor to ISkinnableDrawable
...
Also implement it as an auto property in its inheritors.
The auto properties default to true.
2021-06-06 23:47:47 -04:00
Robin Avery
da1c38d5a9
Uninvert logic of SkinnableInfo.UsingClosestAnchor
...
Also rename "IsUsingClosestAnchor" to simply "UsingClosestAnchor".
2021-06-06 10:13:35 -04:00
Robin Avery
11b1b8c633
Add serialization support via SkinnableInfo
2021-06-06 07:18:08 -04:00
smoogipoo
009aa994d0
Fix potential race incorrectly pausing the source clock
2021-06-04 21:58:51 +09:00
Dan Balasescu
57a38374db
Merge branch 'master' into fix-spectator-frame-conversion
2021-06-04 21:17:40 +09:00
Dean Herbert
840f084dc4
Merge pull request #13303 from LeNitrous/mainmenu-storyboard-backgrounds
...
Add storyboards as a main menu background source
2021-06-04 19:50:40 +09:00
Dean Herbert
23096c58bb
Merge branch 'master' into fix-spectator-frame-conversion
2021-06-04 15:06:15 +09:00
Dean Herbert
d444fed46f
Detach gameplay score from replay recorder before importing
...
Closes #13320 .
2021-06-04 02:00:02 +09:00
Jamie Taylor
054de675ff
allow skinned 'applause' sample to override results screen sfx
2021-06-03 18:35:55 +09:00
Jamie Taylor
582360d0c8
only load the required impact/applause samples
2021-06-03 18:35:51 +09:00
Jamie Taylor
ed012a724b
refactor from using public variables
2021-06-03 18:35:46 +09:00
Jamie Taylor
8dc595d201
move result screen samples to DefaultSkin
2021-06-03 18:35:27 +09:00
Jamie Taylor
63e5bc4543
update sample names and timings
2021-06-03 18:34:33 +09:00
Jamie Taylor
30eff8cc2a
remove overlapping/legacy applause
2021-06-03 18:34:28 +09:00
Jamie Taylor
9ad87ee5dc
add sfx for results screen + sound design tool
2021-06-03 18:34:22 +09:00
smoogipoo
e887807ae7
Apply review fixes
2021-06-03 18:32:05 +09:00
smoogipoo
be03a2d7d2
Fix multiple calls to seek method potentially not working
2021-06-03 17:47:22 +09:00
smoogipoo
c3280083a2
Merge branch 'master' into fix-spectator-frame-conversion
2021-06-03 17:42:01 +09:00
smoogipoo
662bbed5d1
Fix seeking to gameplay too soon
2021-06-03 17:38:51 +09:00
smoogipoo
420df124b5
Add framestable-bypassing seek for spectator
2021-06-03 17:27:21 +09:00
Nathan Alo
d00fb21188
prevent scaling container from creating a storyboard background
2021-06-03 13:24:21 +08:00
Dan Balasescu
44b1102241
Merge branch 'master' into autoplay-pause-support
2021-06-03 13:26:00 +09:00
Dean Herbert
d6656047e3
Fix beatmap statistics with value of zero not displaying correctly at song select
...
Closes #13307 .
2021-06-03 01:58:51 +09:00
Dean Herbert
e0eb0adb0a
Remove unnecessary bind in ReplayPlayer
2021-06-02 18:32:14 +09:00
Nathan Alo
dde64adcb5
add new background type in BackgroundScreenDefault
2021-06-02 15:51:43 +08:00
Dean Herbert
a15cac6f53
Change the way Score is initialised in Player to better lend to population of metadata
2021-06-02 15:44:04 +09:00
Dean Herbert
289dc00f38
Merge branch 'master' into autoplay-pause-support
2021-06-01 16:50:44 +09:00
Dean Herbert
3ba0d29108
Fix incorrect beatmap being parsed down for autoplay generation
2021-06-01 15:44:24 +09:00
Dean Herbert
6ef9b346e1
Fix newly found inspections from 2021.1EAP1
2021-06-01 14:33:21 +09:00
Dean Herbert
cbf3ef5400
Create replay via the ICreateReplay interface instead of explicitly ModAutoplay
2021-06-01 14:22:16 +09:00
Dean Herbert
9221213fe5
Fix potential nullref is beatmap load failed
2021-06-01 14:19:23 +09:00
Dean Herbert
14570b6fb1
Merge branch 'master' into autoplay-pause-support
2021-06-01 14:19:21 +09:00
smoogipoo
7f24518004
Fix spectator crashing when converting mania replay frames
2021-05-31 19:24:22 +09:00
smoogipoo
d2d0896298
Expose GameplayBeatmap and GameplayRuleset from Player
2021-05-31 19:22:20 +09:00
Dan Balasescu
46b6f49a92
Merge pull request #13230 from peppy/non-nullable-beatmapset-files
...
Make `BeatmapSet.Files` non-nullable
2021-05-31 19:10:03 +09:00
Dean Herbert
d1ef5483bc
Merge pull request #12826 from frenzibyte/catch-hide-combo-workaround
...
Hide legacy HUD combo counters on osu!catch ruleset
2021-05-31 19:04:25 +09:00
Salman Ahmed
4e186b0cf5
ContentVisible -> HiddenByRulesetImplementation
2021-05-31 09:24:26 +03:00
Dean Herbert
06bd696cc2
Remove previous consumption logic in GetWorkingBeatmap
...
This should not be required since the introduction of `workingCache`,
which does the same thing in a more global way.
2021-05-31 14:11:58 +09:00
Salman Ahmed
fb111e23d8
Remove "temporarily"
2021-05-31 07:24:59 +03:00
Salman Ahmed
3fbd4e276d
Add simple xmldoc
2021-05-31 00:07:29 +03:00
Bartłomiej Dach
78213e09d4
Merge branch 'master' into editor-exit-stability
2021-05-30 23:03:50 +02:00
Salman Ahmed
fb81e5133f
Merge branch 'master' into catch-hide-combo-workaround
2021-05-30 14:16:46 +03:00
Dean Herbert
9b239e308b
Merge branch 'master' into beatmap-skin
2021-05-29 15:36:43 +09:00
Dean Herbert
f1b5aced6f
Merge branch 'master' into editor-exit-stability
2021-05-28 14:32:32 +09:00
Dan Balasescu
7e0a4562c9
Merge branch 'master' into fix-bad-make-current-call
2021-05-28 00:32:51 +09:00
Dan Balasescu
bc4ccb8a21
Merge pull request #12916 from peppy/fix-taiko-editor-sample-mutations
...
Fix osu!taiko editor operations not always updating the menu/visual state correctly
2021-05-27 23:55:16 +09:00
Dean Herbert
046087a367
Fix access to AliveChildren before IsLoaded
2021-05-27 16:58:01 +09:00
Dean Herbert
14a4095140
Merge branch 'master' into beatmap-skin
2021-05-26 18:39:47 +09:00
Dean Herbert
b3b39c4c13
Fix BeatmapCarousel accessing ScreenSpaceDrawQuad of non-loaded children
...
Fixes failure seen at
https://ci.appveyor.com/project/peppy/osu/builds/39302762/tests .
2021-05-26 15:42:27 +09:00
Dean Herbert
268230c8c4
Merge branch 'master' into fix-taiko-editor-sample-mutations
2021-05-25 19:01:47 +09:00
Dean Herbert
7c89dbcd35
Externalise autoplay generation
2021-05-25 18:37:04 +09:00
Dean Herbert
7f9318d976
Expose GameplayBeatmap to derived Player classes
2021-05-25 18:36:47 +09:00
Dean Herbert
c2b938a29f
Remove autoplay consideration from Player
2021-05-25 18:09:37 +09:00
Dan Balasescu
6263ebf9da
Merge pull request #12495 from peppy/localisation-proof-of-concept
...
Add language selection and general structure for localisation support
2021-05-24 23:33:49 +09:00
Dan Balasescu
3b4fbe22f0
Merge pull request #12928 from Firmatorenio/fix-colour-hitmeter-not-registering-taiko-misses
...
Fix colour hit error meter incorrectly assuming taiko hits were of correct colour
2021-05-24 23:31:54 +09:00
Dan Balasescu
eeda33a453
Merge branch 'master' into localisation-proof-of-concept
2021-05-24 22:56:18 +09:00
Firmatorenio
471f17547a
switch determining the hit result by offset to getting it from the judgement directly
2021-05-24 16:49:58 +06:00
Dan Balasescu
af2a831c83
Merge pull request #12926 from peppy/fix-placement-blueprint-disappearing
...
Fix editor placement ending early if a blueprint becomes alive from a pool
2021-05-24 17:42:18 +09:00
Dean Herbert
65c3c0d53f
Merge branch 'master' into localisation-proof-of-concept
2021-05-24 17:10:56 +09:00
Dean Herbert
4fc6ba50b7
Fix editor placement ending early if a blueprint becomes alive from a pool
...
Closes https://github.com/ppy/osu/issues/12630 .
2021-05-24 17:04:02 +09:00
Firmatorenio
e5f586f2a6
fix colour hit error meter not pushing misses when wrong colour note is hit in taiko
2021-05-24 13:29:12 +06:00
Dean Herbert
100e2d14a5
Move call inside conditional
2021-05-24 15:14:55 +09:00
Dean Herbert
a69a1b5211
Fix Player potentially running MakeCurrent when already removed from the screen stack
...
Closes #12919 .
2021-05-24 13:53:53 +09:00
Dean Herbert
83981b692e
Also handle items exiting bounds on the opposite side
2021-05-24 13:44:13 +09:00
Dean Herbert
593fea0d5f
Limit automatically calculated HUD offsets to keep menu items on screen
2021-05-24 13:14:18 +09:00
Salman Ahmed
d605b6bb8d
Fix HUD overlay components bottom positioning logic accounting for combo
2021-05-23 16:22:51 +03:00
Salman Ahmed
6751d79ce8
Fix oversight in HUD overlay components top positioning logic
2021-05-23 16:22:22 +03:00
Dean Herbert
4c9d72e62a
Ensure EditorBeatmap.Update is called inside PerformOnSelection calls
2021-05-23 21:22:35 +09:00
Joseph Madamba
2fd0038154
Fix checkmark being hidden after clicking current waveform opacity setting
2021-05-22 16:42:20 -07:00
Dean Herbert
34a5b22b79
Merge branch 'master' into refactor-selection-rotate-logic
2021-05-22 20:52:28 +09:00
Dean Herbert
485728ca4e
Merge pull request #12866 from peppy/refactor-selection-scale-logic
...
Add proper scaling support to skin editor
2021-05-22 20:07:03 +09:00
Dean Herbert
b13a68592f
Merge branch 'master' into localisation-proof-of-concept
2021-05-22 17:07:23 +09:00
Dean Herbert
fb5672814d
Add remaining strings for ButtonSystem
2021-05-22 13:56:59 +09:00
Salman Ahmed
4f6de6fdc6
Implement GetSkin() for other working beatmaps
2021-05-21 20:21:29 +03:00
Dean Herbert
bb2fae55ce
Merge branch 'master' into refactor-selection-rotate-logic
2021-05-21 19:19:54 +09:00
Dean Herbert
f335337e5d
Merge pull request #12851 from vininew921/applause-stops-on-score-switch
...
Fix applause sound stopping after switching scores
2021-05-21 18:49:59 +09:00
Dean Herbert
0acf4cf85c
Translate remaining ButtonSystem strings and rename to match class name
2021-05-21 18:48:11 +09:00
Dean Herbert
df426b9334
Merge pull request #12852 from timiimit/multi-larger-freemod-overlay
...
Make freemod selection overlay taller in multiplayer room
2021-05-21 18:45:15 +09:00
Dean Herbert
a8acbbe69c
Merge pull request #12779 from Game4all/import-from-stable-select-location
...
Add ability to manually locate a stable location when importing from stable
2021-05-21 18:17:30 +09:00
Dean Herbert
b0a113a36b
Merge branch 'master' into localisation-proof-of-concept
2021-05-21 17:57:54 +09:00
Dean Herbert
abc96057b2
Remove relative height specification and use constant height
2021-05-21 17:55:46 +09:00
Dean Herbert
2958b9adf4
Merge branch 'master' into import-from-stable-select-location
2021-05-21 17:37:34 +09:00
Dean Herbert
1ca563e831
Merge branch 'master' into applause-stops-on-score-switch
2021-05-21 17:28:28 +09:00
Dean Herbert
20f890cfd0
Merge branch 'master' into fix-spectator-playing-state-5
2021-05-21 16:49:22 +09:00
smoogipoo
36aa186c6e
Merge branch 'thread-safe-spectator-client'
2021-05-21 16:00:24 +09:00
smoogipoo
895eb14c5a
Forcefully end playing to fix test failures
2021-05-21 14:09:30 +09:00
Dean Herbert
7ad6a1d5ff
Merge branch 'master' into thread-safe-spectator-client
2021-05-21 11:47:58 +09:00
Dan Balasescu
527847596e
Merge pull request #12884 from peppy/ternary-menu-item-refactor
...
Create base implementations of the two most common `TernaryStateMenuItem`s
2021-05-20 21:02:15 +09:00
smoogipoo
e3284b976d
Merge branch 'thread-safe-spectator-client' into fix-spectator-playing-state-5
2021-05-20 19:46:26 +09:00
smoogipoo
5a8b8782d3
Fix WatchUser being called asynchronously in BDL
2021-05-20 19:44:43 +09:00
smoogipoo
ee4bca9ed1
Handle collection changed event
2021-05-20 19:37:43 +09:00
Dean Herbert
df5970fab4
Create base implementations of the two most common TernaryStateMenuItems
2021-05-20 19:34:53 +09:00
smoogipoo
7ee81669f7
Remove bind helpers from SpectatorClient
2021-05-20 19:27:43 +09:00
smoogipoo
2896da499d
Merge branch 'restructure-spectator-client' into thread-safe-spectator-client
2021-05-20 18:53:54 +09:00
smoogipoo
a74405d0ed
Merge branch 'master' into restructure-spectator-client
2021-05-20 18:53:42 +09:00
smoogipoo
f74dbb9e1f
Remove locking from SpectatorScreen
2021-05-20 18:52:20 +09:00
Dean Herbert
27e81d6504
Implement proper rotation algorithm for skin editor
2021-05-20 18:21:16 +09:00
smoogipoo
6beeb7f7c4
Rename SpectatorStreamingClient -> SpectatorClient
2021-05-20 15:55:07 +09:00
smoogipoo
d197a7f6f5
Rename multiplayer client classes
2021-05-20 15:39:45 +09:00
Dean Herbert
dbfaaecd9c
Reword comment to not mention tests driectly
2021-05-20 15:39:29 +09:00
Salman Ahmed
43094425e2
Merge branch 'legacy-beatmap-skin-hud-fallback' into catch-hide-combo-workaround
2021-05-19 23:18:27 +03:00
Dean Herbert
00ed699340
Fix origin specifications using incorrect flags
2021-05-20 01:53:24 +09:00
Dean Herbert
363aec8179
Merge branch 'master' into hit-error-skinnable
2021-05-20 01:51:45 +09:00
Dean Herbert
b2c736b42a
Combine and move const closer to usage
2021-05-19 18:09:46 +09:00
Dean Herbert
a639132825
Avoid doing any re-fetch on beatmap from test scenes
2021-05-19 17:58:28 +09:00
Dean Herbert
a0f67ef3bc
Move scaling logic out of OsuSelectionHandler for reuse
2021-05-19 17:37:28 +09:00
Vinicius Barbosa
4f397ae7f5
Merge branch 'master' into applause-stops-on-score-switch
2021-05-19 09:52:31 +02:00
Dean Herbert
44e22b31a9
Refactor editor exit sequence to avoid any scenario where a dialog could go stray
2021-05-19 16:51:54 +09:00
Dean Herbert
b83322281e
Consume updated logic at MainMenu
2021-05-19 16:51:54 +09:00
Salman Ahmed
013fe4928f
Unrevert irrelevant changes
2021-05-19 08:48:21 +03:00
timiimit
1fd00d1313
Change from fullscreen to 0.7
2021-05-18 21:52:28 +02:00
Vinicius Barbosa
d05ffdf120
Added constants for delay value
2021-05-18 20:19:18 +02:00
timiimit
ac5fe0c18c
Change larger freemod selection overlay
2021-05-18 18:50:42 +02:00
Vinicius Barbosa
06fffc499b
Removed unused variables and directives
2021-05-18 16:56:07 +02:00
Salman Ahmed
c98d036b48
Merge branch 'master' into catch-hide-combo-workaround
2021-05-18 17:47:20 +03:00
Salman Ahmed
e7d2f42149
Revert "Merge branch 'fix-legacy-skin-test' into catch-hide-combo-workaround"
...
This reverts commit 380d004683ff419af512
2021-05-18 17:46:15 +03:00
Vinicius Barbosa
76a377f3e0
Fixed applause sound stopping after switching scores
2021-05-18 15:30:45 +02:00
Lucas A
775e0fbde5
Mark StableImportManager as nullable.
2021-05-18 15:27:20 +02:00
Dean Herbert
41d8bc291c
Merge pull request #12783 from smoogipoo/hoc-event-queue
...
Add a HitObjectUsageEventBuffer to handle HOC events appropriately
2021-05-18 22:22:53 +09:00
smoogipoo
c6160d5304
Only ignore online score id for database import
2021-05-18 21:17:41 +09:00
smoogipoo
d93ac7ac98
Change class xmldoc a bit
2021-05-18 19:15:46 +09:00
smoogipoo
ab6a79f84c
Simplify
2021-05-18 19:15:46 +09:00
smoogipoo
97f4f7bbd1
Remove Component inheritance
2021-05-18 18:59:45 +09:00
smoogipoo
633f841a0f
Rename to HitObjectUsageEventBuffer
2021-05-18 18:57:02 +09:00
smoogipoo
bfc0205e9b
Fix (began, finished) event
2021-05-18 18:49:11 +09:00
Dean Herbert
d661e98fa6
Move common functionality out of OsuSelectionHandler and implement flip support
2021-05-18 18:34:06 +09:00
smoogipoo
61a41d97a4
Add some xmldocs + comments
2021-05-18 17:39:45 +09:00
Dean Herbert
ed957df162
Add simple xmldoc to TransferBlueprintFor method
2021-05-18 16:40:56 +09:00
Dean Herbert
55cc533a37
Merge branch 'master' into hoc-event-queue
2021-05-18 16:31:20 +09:00
Dean Herbert
a96603f025
Merge pull request #12782 from smoogipoo/rework-hitobject-blueprints
...
Rename hitobject blueprints and tie them to HitObjects
2021-05-18 16:30:58 +09:00
Dean Herbert
10c730b37d
Add new default locations for hit bar error displays
2021-05-18 15:50:50 +09:00
Salman Ahmed
380d004683
Merge branch 'fix-legacy-skin-test' into catch-hide-combo-workaround
2021-05-18 09:45:43 +03:00
Salman Ahmed
ff419af512
Hide the combo counter content rather than full death
2021-05-18 09:10:15 +03:00
Dean Herbert
829d326e36
Remove alignment logic completely for the time being
...
This was overly complex and does not play well with the new layout
customisation system. We can add it back as required.
2021-05-18 14:55:34 +09:00
smoogipoo
75c0d4d972
Merge branch 'rework-hitobject-blueprints' into hoc-event-queue
2021-05-18 14:33:52 +09:00
smoogipoo
882d54a8f8
Remove now unnecessary Apply() method
2021-05-18 14:26:26 +09:00
smoogipoo
e621cfc4ea
Add Apply() method for applying new DHOs
2021-05-18 14:14:10 +09:00
smoogipoo
f1f3606fd0
Fix unresolved xmldocs
2021-05-18 13:11:58 +09:00
Dan Balasescu
9d423245d8
Fix up xmldocs
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-05-18 13:02:23 +09:00
Lucas A
79740dd2d8
Merge conditionnal expression.
2021-05-17 22:01:05 +02:00
Dan Balasescu
ea4dfd3374
Merge pull request #12842 from peppy/song-progress-skinnable
...
Add layout customisation support for `SongProgress`
2021-05-17 20:15:01 +09:00
Lucas A
fe11426238
Disable appearance of the stable import prompt waiting for user interaction in tests, which caused them to fail.
2021-05-17 12:55:59 +02:00
Lucas A
f60dbbfbbd
Reword import dialogs.
...
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-05-17 12:55:58 +02:00
Lucas A
a7b740fd1d
Reword ImportFromStablePopup and display the popup regardless of whether a stable install is detected.
2021-05-17 12:55:58 +02:00
Lucas A
851e33fd15
Hook up StableImportManager.
2021-05-17 12:55:57 +02:00
Dean Herbert
7137315fa7
Remove HitErrorDisplay container and hook up data
2021-05-17 19:46:50 +09:00
