Dean Herbert
41733af0ed
Revert "Revert "Make BeatmapSetInfo.Files
non-nullable""
...
This reverts commit 9c4f39e968
.
2021-05-28 14:33:05 +09:00
Dean Herbert
b349ff8693
Revert "Add temporary accounting for tests with null files"
...
This reverts commit e52c0a34f8
.
2021-05-28 14:33:04 +09:00
Dean Herbert
f1b5aced6f
Merge branch 'master' into editor-exit-stability
2021-05-28 14:32:32 +09:00
Dean Herbert
e52c0a34f8
Add temporary accounting for tests with null files
2021-05-28 14:31:26 +09:00
Dean Herbert
9c4f39e968
Revert "Make BeatmapSetInfo.Files
non-nullable"
...
This reverts commit c24712642c
.
2021-05-28 14:15:28 +09:00
Dean Herbert
1af684c4b2
Revert "Fix editor tests failing due to empty files being specified"
...
This reverts commit fdbd421040
.
2021-05-28 14:15:28 +09:00
Dean Herbert
5e8893b203
Update framework
2021-05-28 10:42:13 +09:00
Gagah Pangeran Rosfatiputra
854ef0abfd
add simple bound check
2021-05-28 00:55:14 +07:00
Gagah Pangeran Rosfatiputra
ead0e92d7d
use select single node for blurb
2021-05-28 00:50:59 +07:00
Dean Herbert
ce96c58230
Move public members up
2021-05-28 02:46:26 +09:00
Dean Herbert
fe6b1936cb
Move OsuUserInputManager
out from nested class
2021-05-28 02:46:03 +09:00
Dean Herbert
b4c13d837d
Move import logic out to partial class
2021-05-28 02:44:44 +09:00
Dean Herbert
b8edca59eb
General function reorganisation
2021-05-28 02:37:14 +09:00
Dean Herbert
4e49fbf7fb
Switch protected properties to private
where feasible
2021-05-28 02:30:31 +09:00
Dean Herbert
d24a712dd4
Move protected properties to one location and mark setters private
where feasible
2021-05-28 02:27:06 +09:00
Dan Balasescu
7e0a4562c9
Merge branch 'master' into fix-bad-make-current-call
2021-05-28 00:32:51 +09:00
Dan Balasescu
fd7a6db774
Merge pull request #12728 from SleepySwords/single-bind-reset-button
...
Add a reset button to individual keybinds
2021-05-28 00:31:26 +09:00
Dan Balasescu
08c8cd7a66
Merge pull request #12946 from peppy/fix-storyboard-video-widescreen-no-elements
...
Fix storyboard videos not correctly filling the screen
2021-05-28 00:11:04 +09:00
Dan Balasescu
1ffafdd854
Merge branch 'master' into single-bind-reset-button
2021-05-27 23:55:28 +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
Dan Balasescu
cb850e07f7
Merge pull request #12963 from peppy/fix-settings-panel-hide-animation
...
Fix settings panel hide animation looking wrong when a sub-panel is visible when hidden
2021-05-27 23:55:00 +09:00
Dan Balasescu
0a3d3bc006
Merge pull request #12958 from peppy/fix-invalid-ssdq-access
...
Fix `BeatmapCarousel` accessing `ScreenSpaceDrawQuad` of non-loaded children
2021-05-27 23:15:06 +09:00
Dan Balasescu
6ddb2062cf
Merge pull request #13214 from peppy/fix-multiplayer-leaderboard-test-failure
...
Fix test failure in `TestSceneMultiplayerGameplayLeaderboard`
2021-05-27 22:44:05 +09:00
Dean Herbert
121dd175e6
Fix test failure in TestSceneMultiplayerGameplayLeaderboard
...
The transfer of users was not accounting for the fact that the
`StartPlay` calls are now scheduled and not necessarily run in time.
2021-05-27 19:57:21 +09:00
Gagah Pangeran Rosfatiputra
e1836cd1b2
add debug assert
2021-05-27 17:12:15 +07:00
Dean Herbert
37ef368738
Move async call out of using
to better define the flow of data
2021-05-27 19:03:59 +09:00
Dean Herbert
046087a367
Fix access to AliveChildren
before IsLoaded
2021-05-27 16:58:01 +09:00
Dean Herbert
aa23c4a4b9
Merge branch 'master' into keyboard_shortcuts
2021-05-27 16:30:34 +09:00
Gagah Pangeran Rosfatiputra
c72e258bfb
change for to while in create panels
2021-05-27 14:12:49 +07:00
Gagah Pangeran Rosfatiputra
4fbd43fcae
add inline comment for width 2
2021-05-27 13:24:06 +07:00
Dean Herbert
122bb05aa8
Add a mention that OnApply/OnFree
is performed after ApplyDefaults
2021-05-27 15:20:35 +09:00
Dean Herbert
b13b732e02
Remove incorrect DefaultSkin
usage
2021-05-27 14:50:56 +09:00
Dean Herbert
70a844ac10
Remove allowFallback
parameters completely
2021-05-27 14:50:42 +09:00
Dean Herbert
4fd89faaa4
Fix default skin not having resources or providing samples
2021-05-27 14:09:01 +09:00
Dean Herbert
d66f07fccb
Move text and isFullWidth
parameters to constructor
2021-05-27 14:04:50 +09:00
Salman Ahmed
0c2d3ae0e7
Revert "Move beatmap skin info creation to static method at IBeatmapSkin
"
...
This reverts commit 9806d94b74
.
2021-05-27 05:08:49 +03:00
Gagah Pangeran Rosfatiputra
a7865d3f22
move colour provider to BDL
2021-05-27 08:46:24 +07:00
Gagah Pangeran Rosfatiputra
649163e13b
Merge branch 'master' into main-page-wiki
2021-05-26 23:51:49 +07:00
Dean Herbert
f6dee13991
Merge pull request #12948 from gagahpangeran/markdown-wiki
...
Add wiki markdown container
2021-05-27 01:49:32 +09:00
Dean Herbert
735e7b9c74
Pass fetch more action in via ctor to avoid potential nullref
2021-05-26 22:49:39 +09:00
Dean Herbert
9947867e84
Remove unnecessary bindable flow
2021-05-26 22:46:43 +09:00
Dean Herbert
71de541245
Minor spacing / reformatting
2021-05-26 22:35:11 +09:00
Andrei Zavatski
1bde11a07e
Refactor ArticleListing
2021-05-26 15:35:38 +03:00
Gagah Pangeran Rosfatiputra
905364b5fe
add url as argument for link action external
2021-05-26 19:34:34 +07:00
Gagah Pangeran Rosfatiputra
7546611c14
remove unused cached
2021-05-26 19:32:49 +07:00
Gagah Pangeran Rosfatiputra
2344a1a411
use image block in markdown container
2021-05-26 19:22:33 +07:00
Gagah Pangeran Rosfatiputra
62fb09774a
create WikiMarkdownImageBlock
2021-05-26 19:22:21 +07:00
Andrei Zavatski
82d977f80a
Merge remote-tracking branch 'refs/remotes/ppy/master' into news-request
2021-05-26 14:52:42 +03:00
Dean Herbert
7ed4cbf7bf
Fix settings panel hide animation looking wrong when a sub-panel is visible when hidden
2021-05-26 19:25:05 +09:00
Dean Herbert
14a4095140
Merge branch 'master' into beatmap-skin
2021-05-26 18:39:47 +09:00
Dean Herbert
c05dfee220
Simplify default handling flow
2021-05-26 18:28:00 +09:00
Dean Herbert
7c9383b586
Combine RestorableKeyBindingRow
back into KeyBindingRow
2021-05-26 18:17:28 +09:00
Gagah Pangeran Rosfatiputra
db8ccad0b8
Merge branch 'master' into markdown-wiki
2021-05-26 15:25:46 +07:00
Dean Herbert
02806fedb0
Add missing newline
2021-05-26 17:17:02 +09:00
Dean Herbert
17334fd2e6
Inline KeyBindingRow
construction
2021-05-26 17:12:12 +09:00
Gagah Pangeran Rosfatiputra
9c31b8856d
change image url replace implementation
2021-05-26 15:10:09 +07:00
Dean Herbert
49b4a6ea67
Replace local namespace qualifiers with using
2021-05-26 17:07:24 +09:00
Dean Herbert
f8a3a37797
Remove outdated comment
2021-05-26 17:01:47 +09:00
Gagah Pangeran Rosfatiputra
47cbbee4d1
remove CreateNotice method and move implementation to local
2021-05-26 15:01:16 +07:00
Dean Herbert
98fa5b67d6
Merge branch 'master' into single-bind-reset-button
2021-05-26 17:01:16 +09:00
Gagah Pangeran Rosfatiputra
eeb6647bc5
remove schedule in set current path
2021-05-26 14:59:36 +07:00
Dean Herbert
1e77a87fab
Merge pull request #12947 from gagahpangeran/markdown-link
...
Handle link action in `OsuMarkdownLinkText`
2021-05-26 16:56:24 +09:00
Gagah Pangeran Rosfatiputra
02f0e2f212
Merge branch 'markdown-link' into markdown-wiki
2021-05-26 14:55:32 +07:00
Dan Balasescu
34d1d5198f
Merge pull request #12943 from nbvdkamp/fix-zero-area-skin-element-scale-crash
...
Prevent skin editor crash when scaling 0 area drawables
2021-05-26 16:37:58 +09:00
Gagah Pangeran Rosfatiputra
e02739a136
remove unused colour provider
2021-05-26 13:57:35 +07:00
Gagah Pangeran Rosfatiputra
04f16c0783
Set DocumentUrl
inside CreateChildDependencies
...
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-05-26 13:55:16 +07: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
b36b40cb34
Remove unnecessary double specification
2021-05-26 15:20:47 +09:00
Dean Herbert
ba8544f614
Update resources
2021-05-26 14:55:44 +09:00
Dean Herbert
e4780abdfd
Split out base
call from switch
statement
2021-05-26 14:43:59 +09:00
Dean Herbert
d165a75823
Inline request flow to make it easier to understand
2021-05-26 14:37:52 +09:00
Dean Herbert
0f21510b8b
Move code around
2021-05-26 14:29:46 +09:00
Dean Herbert
8ffa7f4a5a
Tidy up code
2021-05-26 14:28:20 +09:00
Dean Herbert
7b09955d59
Remove redundant default bindable value
2021-05-26 14:17:40 +09:00
Dean Herbert
200592114f
Make protected variables private
2021-05-26 14:13:02 +09:00
Swords
07a24d2747
Fixing errors
2021-05-25 23:54:13 +10:00
Swords
9c2dca8229
Removing redundant argument list
2021-05-25 21:53:00 +10:00
Swords
d5feb8353d
Formatting, renaming
2021-05-25 21:37:08 +10:00
Swords
d9f5b578bf
Restore class names
2021-05-25 21:08:40 +10:00
Swords
ce845a9f8d
Apply the rest of requested changes
2021-05-25 21:00:38 +10:00
Dean Herbert
268230c8c4
Merge branch 'master' into fix-taiko-editor-sample-mutations
2021-05-25 19:01:47 +09:00
Dean Herbert
342acadae2
Change LINQ query for better readability
2021-05-25 18:51:51 +09:00
Dean Herbert
871ca8054f
Rename classes as per review feedback
2021-05-25 18:50:33 +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
Dean Herbert
a3c78674a1
Add new interface for autoplay mods
2021-05-25 18:09:24 +09:00
Gagah Pangeran Rosfatiputra
4c8f19af69
load empty page when fail
2021-05-25 14:47:39 +07:00
Dean Herbert
5ea948aabe
Bypass 640x480 coordinate space for video storyboard elements
...
This allows the `FillMode.Fill` to take up the full space of the
storyboard container.
2021-05-25 16:17:29 +09:00
Dean Herbert
0c55bba220
Allow storyboards to be widescreen if only a video element exists
...
This matches stable behaviour, which will allow videos to display
filling the screen if they are the only thing contained within the
"storyboard".
2021-05-25 16:07:19 +09:00
Dean Herbert
e3507d5453
Move DrawableStoryboard
's aspect application to inside its own class
2021-05-25 16:06:39 +09:00
Dan Balasescu
774611f142
Merge pull request #12933 from peppy/fix-scroll-wheel-gameplay-bindings
...
Disallow using scroll wheel for gameplay bindings
2021-05-25 16:04:18 +09:00
Gagah Pangeran Rosfatiputra
9de07de467
move text flow container inside markdown container
2021-05-25 12:14:07 +07:00
kamp
65649e5a62
Prevent skin editor crash when scaling 0 area drawables
...
Some skinnable drawables can have 0 width or height in certain
cases, leading to division by 0 and a crash when the position is
updated.
2021-05-24 21:36:42 +02:00
Gagah Pangeran Rosfatiputra
728258d93a
add website root url as document url
2021-05-25 00:29:59 +07: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
Dean Herbert
37f6ceef79
Add test coverage
2021-05-24 21:57:04 +09:00
Dean Herbert
62b6cadb64
Ensure settings rows cannot set an invalid value in the first place
2021-05-24 21:56:41 +09:00
Swords
518999ffab
Renaming files
2021-05-24 22:49:40 +10:00
smoogipoo
fe9abd5b80
Upgrade packages and fix ResX files
2021-05-24 21:37:05 +09:00
Gagah Pangeran Rosfatiputra
02cdd0b2de
use drawable link compiler in markdown link
2021-05-24 19:10:37 +07:00
Swords
441e4e7d56
Formatting
2021-05-24 22:08:34 +10:00
Swords
ca1d1c58ab
RestoreDefaultValueButton implements OsuButton
2021-05-24 21:34:47 +10: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
Dean Herbert
a00f226ab3
Add assert on storing to database
2021-05-24 18:41:39 +09:00
Dean Herbert
deabce7140
Disallow updating the database to an invalid value
2021-05-24 18:40:56 +09:00
Dean Herbert
57640810b5
Ignore certain banned InputKey
s for gameplay purposes
2021-05-24 18:40:40 +09:00
Salman Ahmed
3585e2900e
Replace unnecessary empty skin implementation with null
2021-05-24 12:28:52 +03:00
Salman Ahmed
7792efb154
Remove no longer used BeatmapSkin
2021-05-24 12:28:06 +03: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
Dan Balasescu
91acf16e52
Merge pull request #12912 from peppy/fix-legacy-combo-counter-positioning
...
Fix legacy combo counter not accounting for song progress bar
2021-05-24 17:26:25 +09:00
Dan Balasescu
7a343c1576
Merge pull request #12915 from peppy/regenerate-replay-less
...
Ensure `RegenerateAutoplay` is only run once per frame
2021-05-24 17:25:42 +09:00
Dan Balasescu
28f91f8d65
Merge pull request #12921 from peppy/fix-hud-offsets-out-of-bounds
...
Limit automatically calculated HUD offsets to keep menu items on screen
2021-05-24 17:25:03 +09:00
Dean Herbert
7961dba1d3
Reorder OrderBy
for legibility
2021-05-24 17:22:55 +09:00
Dean Herbert
f8c6150493
Update framework
2021-05-24 17:11:01 +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
Dean Herbert
68364081f2
Merge pull request #11582 from frenzibyte/mbd-beatmap-set-cover
...
Refactor beatmap set covers into using `ModelBackedDrawable<T>`
2021-05-24 16:30:14 +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
29e1737f0d
Merge branch 'master' into mbd-beatmap-set-cover
2021-05-24 15:51:03 +09:00
Dean Herbert
100e2d14a5
Move call inside conditional
2021-05-24 15:14:55 +09:00
Andrei Zavatski
06fe0563d3
Move GetNewsRequest from ArticleListing to NewsOverlay
2021-05-24 08:26:44 +03:00
smoogipoo
7494ddeef4
Fix DHOs not receiving initial skin changed events
2021-05-24 14:07:40 +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
Gagah Pangeran Rosfatiputra
222c34c0a1
fix heading font weight to light
2021-05-23 21:46:41 +07:00
Gagah Pangeran Rosfatiputra
bd1454bdd1
update height to max of its parent height
2021-05-23 21:42:58 +07:00
Gagah Pangeran Rosfatiputra
24960c4fb8
move panel spacing to ctor
2021-05-23 21:31:49 +07: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
Dean Herbert
bbfd7ea23f
Ensure RegenerateAutoplay
is only run once per frame
2021-05-23 21:20:08 +09:00
Gagah Pangeran Rosfatiputra
10c4ba3a74
add panels to grid content
2021-05-23 19:07:22 +07:00
Gagah Pangeran Rosfatiputra
24fef221e3
change createPanels method to create grid content
2021-05-23 19:07:10 +07:00
Gagah Pangeran Rosfatiputra
8389d90f7e
add GridContainer in wiki main page
2021-05-23 18:52:20 +07:00
Gagah Pangeran Rosfatiputra
4068881096
add bottom margin for paragraph
2021-05-23 18:11:54 +07:00
Gagah Pangeran Rosfatiputra
cd211de729
make panel text bold
2021-05-23 18:10:56 +07:00
Gagah Pangeran Rosfatiputra
512d6d2f7f
centering link inside panel
2021-05-23 18:09:09 +07:00
Gagah Pangeran Rosfatiputra
1e5f34567a
add panel heading main page
2021-05-23 18:07:27 +07:00
Gagah Pangeran Rosfatiputra
365a0b25f2
add IsFullWidth
2021-05-23 18:03:38 +07:00
Gagah Pangeran Rosfatiputra
4d222467cc
initial WikiPanelMarkdownContainer
2021-05-23 18:00:54 +07:00
Gagah Pangeran Rosfatiputra
d9e898a2ee
extract WikiPanelContainer
2021-05-23 17:56:27 +07:00
Gagah Pangeran Rosfatiputra
4a543c2557
add simple panels
2021-05-23 17:49:26 +07:00
Dean Herbert
caa2c5638e
Fix legacy combo counter not accounting for song progress bar
2021-05-23 16:46:57 +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
45c6a9ca91
Merge branch 'refactor-selection-rotate-logic' into fix-flip-logic-discrepancy
2021-05-22 21:17:58 +09:00
Dean Herbert
7d88a19d7f
Remove unnecessary field storage of origin reference
2021-05-22 21:03:40 +09: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
Dean Herbert
b6db9ef334
Fill out Japanese localisation via resx
2021-05-22 13:54:52 +09:00
Dean Herbert
2fc53017fc
Generate initial resx files
2021-05-22 13:46:09 +09:00
Dean Herbert
cd3f543394
Add LocalisationAnalyser package and tools
2021-05-22 02:32:55 +09:00
Salman Ahmed
4f6de6fdc6
Implement GetSkin()
for other working beatmaps
2021-05-21 20:21:29 +03:00
Salman Ahmed
04e75d8f2b
Return empty skin for GetSkin()
in TestWorkingBeatmap
2021-05-21 20:21:13 +03:00
Salman Ahmed
318e5fc60b
Mark WorkingBeatmap.GetSkin()
as abstract
2021-05-21 20:14:26 +03:00
Dean Herbert
bb2fae55ce
Merge branch 'master' into refactor-selection-rotate-logic
2021-05-21 19:19:54 +09:00
Dan Balasescu
5ad41ded94
Merge branch 'master' into fix-dho-lmc
2021-05-21 19:11:57 +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
bf4db60ef4
Remove placeholder translations
2021-05-21 18:48:42 +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
41c4afb3d5
Restore path specification to "."
for consistency
2021-05-21 17:46:27 +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
0c504c3b7d
Update framework
2021-05-21 17:24:22 +09:00
Dean Herbert
20f890cfd0
Merge branch 'master' into fix-spectator-playing-state-5
2021-05-21 16:49:22 +09:00
Dean Herbert
1c560a9490
Merge pull request #12869 from EVAST9919/sidebar
...
Add sidebar to news overlay
2021-05-21 16:21:18 +09:00
smoogipoo
7c59fb37f1
Move check into callback
2021-05-21 16:00:58 +09:00
smoogipoo
36aa186c6e
Merge branch 'thread-safe-spectator-client'
2021-05-21 16:00:24 +09:00
smoogipoo
7f712a4d04
Fix EndPlaying potentially doing cross-thread mutation
2021-05-21 15:57:39 +09:00
smoogipoo
2fdf8aa1aa
Add update thread assertions
2021-05-21 15:57:31 +09:00
Dean Herbert
fbe4d7e03c
Improve code quality around cursor and upwards passing of response data
2021-05-21 15:41:31 +09:00
Dean Herbert
0d575f5728
Remove incorrect (and unintended) modulus logic
2021-05-21 15:06:53 +09:00
Dean Herbert
f9d51656b6
Fix scaling of rotated items not behaving in an understandable way
2021-05-21 15:02:36 +09:00
smoogipoo
895eb14c5a
Forcefully end playing to fix test failures
2021-05-21 14:09:30 +09:00
Gagah Pangeran Rosfatiputra
216b87691c
add blurb
2021-05-21 10:04:45 +07:00
Gagah Pangeran Rosfatiputra
5964ee23cb
add HtmlAgilityPack dependency
2021-05-21 09:54:54 +07:00
Gagah Pangeran Rosfatiputra
49aa0f3a18
initial main page
2021-05-21 10:04:45 +07:00
Dean Herbert
7ad6a1d5ff
Merge branch 'master' into thread-safe-spectator-client
2021-05-21 11:47:58 +09:00
Gagah Pangeran Rosfatiputra
236124496d
add missing accent colour in control tab item
2021-05-21 01:21:32 +07:00
Andrei Zavatski
40ca94cd7b
Fix incorrect year being passed on first load
2021-05-20 16:04:51 +03:00
Andrei Zavatski
c48b5eebdd
Don't reload the context when clicking selected year button
2021-05-20 15:45:39 +03:00
Andrei Zavatski
bd80cf656a
Merge remote-tracking branch 'refs/remotes/ppy/master' into sidebar
2021-05-20 15:41:08 +03:00
Dan Balasescu
7845d07dd5
Merge pull request #12886 from peppy/fix-skin-editor-context-menu-sticking
...
Fix skin editor context menus not dismissing when clicking away
2021-05-20 21:03:35 +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
Dean Herbert
0f4b502fdf
Add missing xmldoc
2021-05-20 20:09:22 +09:00
Dean Herbert
1848bd902d
Fix skin editor context menus not dismissing when clicking away
2021-05-20 19:51:07 +09:00
Gagah Pangeran Rosfatiputra
6257504bb6
add padding spacing
2021-05-25 14:37:14 +07:00
Gagah Pangeran Rosfatiputra
ae0949fc14
add main page in wiki overlay
2021-05-25 14:20:04 +07:00
smoogipoo
e3284b976d
Merge branch 'thread-safe-spectator-client' into fix-spectator-playing-state-5
2021-05-20 19:46:26 +09:00
smoogipoo
06c99e8c7c
Fix race due to StopWatchingUser() being called asynchronously
2021-05-20 19:45:31 +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 TernaryStateMenuItem
s
2021-05-20 19:34:53 +09:00
smoogipoo
7ee81669f7
Remove bind helpers from SpectatorClient
2021-05-20 19:27:43 +09:00
smoogipoo
b515fe3cb1
Fix playing user state not removed on stop watching
2021-05-20 19:20:09 +09:00
smoogipoo
89b4f69588
Expose playing user states as bindable dictionary
2021-05-20 19:19:39 +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
smoogipoo
10597f7e6a
Remove locking from SpectatorClient
2021-05-20 18:37:27 +09:00
Dean Herbert
20f1ef4318
Extract common implementation of updating drawable position from screen space pos
2021-05-20 18:35:13 +09:00
Dean Herbert
6f75c59760
Fix flip logic not using the full selection quad
2021-05-20 18:31:51 +09:00
Dean Herbert
95c78b9185
Split out common selection quad logic
2021-05-20 18:24:25 +09:00
Dean Herbert
27e81d6504
Implement proper rotation algorithm for skin editor
2021-05-20 18:21:16 +09:00
smoogipoo
6eff8d513e
Annotate nullables
2021-05-20 17:51:09 +09:00
smoogipoo
9d07749959
Improve implementation of TestSpectatorClient
...
There was a lot of weirdness here, such as storing the playing users,
clearing the playing users from test scenes (!!), and storing the users
being wathed.
This was all a thing because the previous implementation overrode the
base method implementations, which is no longer a thing.
2021-05-20 17:41:46 +09:00
Dean Herbert
c24712642c
Make BeatmapSetInfo.Files
non-nullable
2021-05-20 17:39:52 +09:00
smoogipoo
750a5c3ea9
Fix test compilation error
2021-05-20 17:20:30 +09:00
Dean Herbert
fdbd421040
Fix editor tests failing due to empty files being specified
2021-05-20 17:09:55 +09:00
smoogipoo
df80531a0a
Split online connectivity into OnlineSpectatorClient
2021-05-20 16:30:56 +09:00
Gagah Pangeran Rosfatiputra
9c824ece1b
handle page change when clicking breadcrumb
2021-05-20 14:00:22 +07:00
Gagah Pangeran Rosfatiputra
1578b0462d
add showParentPage method
2021-05-20 13:58:17 +07:00
smoogipoo
6beeb7f7c4
Rename SpectatorStreamingClient -> SpectatorClient
2021-05-20 15:55:07 +09:00
Dean Herbert
7980bdd384
Revert incorrectly changed requery code
2021-05-20 15:41:58 +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
Dean Herbert
958d51141d
Rename FrontPageDisplay
to ArticleListing
2021-05-20 15:24:01 +09:00
Dean Herbert
9267d23dc2
Make year nullable rather than defaulting to zero
2021-05-20 15:23:49 +09:00
Dean Herbert
d4530313aa
Tidy event parameter naming
2021-05-20 15:15:46 +09:00
Dean Herbert
489caebf59
Move bind LoadComplete
code out of constructor
2021-05-20 15:15:19 +09:00
ekrctb
0489ae719d
Don't couple PoolableDrawableWithLifetime
lifetime with its entry
...
It turns out the incompatibility with `LifetimeManagementContainer` causes more issues than anticipated.
2021-05-20 14:56:15 +09:00
Dean Herbert
673ca4c2a1
Tidy up content container specification
2021-05-20 14:30:40 +09:00
Dean Herbert
ac8efdeabd
Move private methods down
2021-05-20 14:12:34 +09:00
Dean Herbert
713f69ea55
Tidy up load process
2021-05-20 14:11:42 +09:00
Dean Herbert
80a714a9c4
Merge pull request #12857 from Joehuu/dev-register-no-warning
...
Don't show warning screen when registering on dev server
2021-05-20 14:05:53 +09:00
Dean Herbert
8f5b28d264
Fix "folder missing" message showing incorrectly for beatmaps folder
2021-05-20 13:56:18 +09:00
Dean Herbert
3c201fb8e7
Standardise canBeNull
specification
2021-05-20 13:20:35 +09:00
Joseph Madamba
3da2cdfd05
Fix nullref in test
2021-05-19 14:06:21 -07:00
Salman Ahmed
3d99b89633
Add back actually needed change
...
*no comment*
2021-05-20 00:03:11 +03:00
Salman Ahmed
d8efcc0793
Remove drive-by change
2021-05-19 23:44:53 +03:00
Salman Ahmed
43094425e2
Merge branch 'legacy-beatmap-skin-hud-fallback' into catch-hide-combo-workaround
2021-05-19 23:18:27 +03:00
Salman Ahmed
9f3ea150f5
Fix legacy beatmap skins not falling back properly on HUD components
2021-05-19 23:01:29 +03:00
Bartłomiej Dach
788f1fcf48
Merge branch 'master' into disable-skin-editor-border
2021-05-19 21:52:29 +02:00
Salman Ahmed
21ca9c8431
Merge branch 'master' into beatmap-skin
2021-05-19 22:39:32 +03:00
Bartłomiej Dach
5df7d3bfd0
Merge branch 'master' into fix-editor-blueprint-wrong-beatmap
2021-05-19 20:48:10 +02:00
Bartłomiej Dach
e9cab29134
Cache editor beatmap in placement blueprint test scene
2021-05-19 20:48:06 +02:00
Gagah Pangeran Rosfatiputra
bc1cad0963
change header breadcrumb when page change
2021-05-20 00:28:26 +07:00
Dean Herbert
eb5db8ff03
Disable border display on skin editor to avoid crashes
...
This wasn't being displayed correctly anyway, so rather than fixing
let's just remove it for now.
Closes #12868 .
2021-05-20 02:01:46 +09:00
Dean Herbert
22337e0fc7
Add comment explaining why origin is flipped
2021-05-20 01:59:30 +09: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
a55879e511
Fix oversights in scale algorithm
2021-05-20 01:47:31 +09:00
Dean Herbert
14af86d6c5
Use the same code path for all scaling
2021-05-19 21:46:41 +09:00
Andrei Zavatski
d60478851f
Add proper action to YearButton
2021-05-19 15:38:53 +03:00
Andrei Zavatski
e3ed9b8135
Implement sidebar metadata handling in NewsOverlay
2021-05-19 15:36:05 +03:00
Andrei Zavatski
6cc4ffadab
Implement sticky container for sidebar in NewsOverlay
2021-05-19 15:28:12 +03:00
Andrei Zavatski
150ed01c62
Make NewsSidebar scrollable
2021-05-19 15:22:55 +03:00
Andrei Zavatski
16ffedde8a
Add year parameter to GetNewsRequest
2021-05-19 15:17:57 +03:00
Dean Herbert
6a3c58b9ad
Implement proper scaling algorithms
2021-05-19 19:58:55 +09:00
Dean Herbert
6c4709e7b4
Fix PlacementBlueprint
using the wrong beatmap when applying defaults
...
Closes #12855 .
2021-05-19 18:34:07 +09:00
Dean Herbert
b2c736b42a
Combine and move const
closer to usage
2021-05-19 18:09:46 +09:00
Salman Ahmed
825d61e22c
Separate default beatmap skins from DefaultSkin
2021-05-19 12:06:10 +03:00
Dean Herbert
a639132825
Avoid doing any re-fetch on beatmap from test scenes
2021-05-19 17:58:28 +09:00
Salman Ahmed
9806d94b74
Move beatmap skin info creation to static method at IBeatmapSkin
2021-05-19 11:58:00 +03:00
Dean Herbert
a0f67ef3bc
Move scaling logic out of OsuSelectionHandler
for reuse
2021-05-19 17:37:28 +09:00
Dean Herbert
fc5987bf69
Refactor DialogOverlay
logic to avoid dismissal potentially being unhandled
2021-05-19 16:52:34 +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
Dean Herbert
124ac689b8
Add method to PopupDialog
to press the first OK button
2021-05-19 16:51:54 +09:00
Dean Herbert
87833bfb61
Merge pull request #12736 from EVAST9919/news-sidebar-new
...
Implement NewsSideBar component
2021-05-19 16:29:52 +09:00
Dean Herbert
19a07b0107
IsOpen -> Expanded
2021-05-19 15:49:22 +09:00
Dean Herbert
539e5179fe
Tidy up content and bind event code
2021-05-19 15:49:22 +09:00
Salman Ahmed
013fe4928f
Unrevert irrelevant changes
2021-05-19 08:48:21 +03:00
Dan Balasescu
6717355fbe
Merge pull request #12627 from ekrctb/always-use-lifetime-entry
...
Always use lifetime entry to manage hit objects in HitObjectContainer
2021-05-19 13:12:01 +09:00
Joseph Madamba
4cc573690e
Move OsuGame out of load method
2021-05-18 14:32:56 -07:00
Joseph Madamba
bde7f88eb3
Don't show warning screen when registering on dev server
2021-05-18 14:23:22 -07:00
timiimit
1fd00d1313
Change from fullscreen to 0.7
2021-05-18 21:52:28 +02:00
Andrei Zavatski
d70d37b7f4
Remove convoluted autosize logic in MonthSection
2021-05-18 22:30:36 +03:00
Andrei Zavatski
24af86689f
Merge remote-tracking branch 'refs/remotes/ppy/master' into news-sidebar-new
2021-05-18 22:18:52 +03: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 380d004683
, reversing
changes made to ff419af512
.
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
Dean Herbert
70b36cdc0d
Merge pull request #12850 from smoogipoo/fix-score-duplication
...
Only ignore online score id for database import
2021-05-18 22:18:42 +09:00
smoogipoo
c6160d5304
Only ignore online score id for database import
2021-05-18 21:17:41 +09:00
smoogipoo
5f94b3bdac
Remove legacy playlist item ID handling
2021-05-18 21:03:59 +09:00
Dan Balasescu
ef81bdf63f
Merge branch 'master' into always-use-lifetime-entry
2021-05-18 20:10:12 +09:00
ekrctb
84a1a86c63
Revert "Use entry to calculate lifetime in ScrollingHOC"
...
This reverts commit 632bb70e
2021-05-18 19:55:31 +09:00
ekrctb
2c65b8fa93
Revert "Fix uninitialized scrollLength value is used"
...
This reverts commit 73dfb04d
2021-05-18 19:55:25 +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
smoogipoo
a31a6947bb
Add test
2021-05-18 18:49:05 +09:00
Salman Ahmed
08ee1e4853
Remove HUD skin component lookup in favour of MainHUDComponents
target system
2021-05-18 12:37:23 +03:00
Dean Herbert
d661e98fa6
Move common functionality out of OsuSelectionHandler
and implement flip support
2021-05-18 18:34:06 +09:00
Dean Herbert
c80e736712
Change SkinBlueprint
to use the origin point as the selection point
...
Not sure how this feels, but it makes using the same point throughout
the editor possible, which I think is the correct way forward for now.
2021-05-18 18:33: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
Dean Herbert
5acb708939
Remove customisation of hit error via standard settings
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
265a89e5cc
Fix LegacySkinPlayerTestScene
overriden by default beatmap skin
2021-05-18 09:45:32 +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
Dean Herbert
0100b88a86
Move private methods down
2021-05-18 14:12:27 +09:00
Dean Herbert
3a5b21c0f5
Update "reset all bindings" button to better match new key binding row widths
2021-05-18 13:47:39 +09:00
Dean Herbert
c71d53a0f9
Fix text and button layout
2021-05-18 13:40:26 +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
Bartłomiej Dach
0e91a00a7e
Revert to previous width spec instead of size
2021-05-17 21:18:45 +02:00
Bartłomiej Dach
ef114f2407
Simplify bindable flow in KeyBindingRow
2021-05-17 21:10:05 +02:00
Lucas A
8530b31e39
Use bitshifts for enum values instead of literal values.
2021-05-17 21:02:45 +02:00
Bartłomiej Dach
30d7768971
Remove now-redundant null check
2021-05-17 20:47:56 +02:00
Bartłomiej Dach
33fe843ba9
Move value change bindings to LoadComplete()
...
Also removes a redundant one from the setter of `Current`. If the set to
current comes with an associated value change, the bind-unbind flow that
`BindableWithCurrent` implements will handle that change anyway.
2021-05-17 20:46:30 +02:00
Salman Ahmed
f667ea3fd0
Replace AllowDefaultHUDComponentsFallback
with a temporary override at LegacyBeatmapSkin
2021-05-17 21:34:53 +03:00
Bartłomiej Dach
2bf62b86ea
Merge branch 'master' into add-overlay-link-colours
2021-05-17 20:11:27 +02:00
Lucas A
e2018f81f3
Use equality check for nullable types.
2021-05-17 19:54:21 +02:00
Bartłomiej Dach
d614a47614
Rename variable to better explain purpose
2021-05-17 18:54:17 +02:00
Bartłomiej Dach
7befcf74ff
Split value change callbacks out to separate methods
2021-05-17 18:53:09 +02:00
Lucas A
97952bc3f0
Fix backwards stable install resolution logic.
2021-05-17 18:39:04 +02:00
Lucas A
6110a847aa
Simplify import ordering logic by making beatmapImportTask non-nullable.
2021-05-17 16:30:13 +02:00
Lucas A
5ca4fd5ab4
Block overlays to prevent getting into a bad state.
2021-05-17 13:28:59 +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
a38fc1a2e0
Override text header.
2021-05-17 13:04:49 +02:00
Lucas A
db255e6814
Mark StableImportManager as potentially null in tests.
...
(StableImportManager is added to the DI in OsuGame and not in the OsuGameBase)
2021-05-17 12:55:59 +02: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
41fafdf643
Remove now unreachable code paths.
2021-05-17 12:55:59 +02:00
Lucas A
bec06cfac7
Reword StableDirectoryLocationDialog
header
...
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
2021-05-17 12:55:58 +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
e15e8068d3
Reword StableDirectoryLocationDialog.
...
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-05-17 12:55:58 +02:00
Lucas A
dabe8bd4c7
Fix code inspections and remove now unused code.
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
8ba50b1854
Bring back injected dependency incorrectly marked as unused.
2021-05-17 12:55:58 +02:00
Lucas A
481b0a0125
Add StableDirectoryLocationDialog
2021-05-17 12:55:57 +02:00
Lucas A
325a689d65
Order imports depending on beatmap imports if any is running.
2021-05-17 12:55:57 +02:00
Lucas A
851e33fd15
Hook up StableImportManager.
2021-05-17 12:55:57 +02:00
Lucas A
5d5b1e1f0e
Add StableImportManager
2021-05-17 12:55:56 +02:00
Dean Herbert
7137315fa7
Remove HitErrorDisplay
container and hook up data
2021-05-17 19:46:50 +09:00