h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 19:27:52 +08:00
Code Issues Releases Wiki Activity
40,206 Commits 3 Branches 654 Tags 363 MiB
deaa381440
Commit Graph

25436 Commits

Author SHA1 Message Date
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
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
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
Dean Herbert
42d2711dc6 Use ShouldBeConsideredForInput instead of ReceivePositionalInputAtSubTree 2021-05-17 19:29:59 +09:00
Dean Herbert
83b4515d5c
Merge pull request #12841 from smoogipoo/skin-editor-exclude-interfaces 
Exclude interfaces from skinnable types
 2021-05-17 19:11:58 +09:00
Dean Herbert
60f3e628bc Fix song progress being interactable inside toolbox button 2021-05-17 19:05:22 +09:00
Dean Herbert
ecf70c1707 Remove unnecessary container 2021-05-17 18:55:18 +09:00
Dean Herbert
b80768b44a Hook up seeking flow 2021-05-17 18:52:56 +09:00
Dean Herbert
0c433cda86 Update HUDOverlay logic to add automatic layout for bottom-aligned components 2021-05-17 18:52:56 +09:00
Dean Herbert
da0913ca2d Make SongProgress a skinnable component 2021-05-17 18:52:56 +09:00
Dan Balasescu
4151f18f74
Merge pull request #12804 from peppy/fix-autoplay-load-fail-nullref 
Fix a potential nullref when starting `Player` with autoplay disabled and beatmap fails to load
 2021-05-17 18:40:05 +09:00
Dean Herbert
1f3ae901ce Expose DrawableRuleset for consupmtion by HUD components 2021-05-17 18:23:01 +09:00
smoogipoo
0d7a349500 Exclude interfaces from skinnable types 2021-05-17 18:16:09 +09:00
Andrei Zavatski
555e3e2db3
Delete NewsSideBar.cs 2021-05-17 12:02:33 +03:00
Andrei Zavatski
01090de1fd Fix filenames does not match contained type 2021-05-17 11:55:55 +03:00
Andrei Zavatski
586c5c7365 Emulate year changes in the test scene 2021-05-17 11:36:53 +03:00
Andrei Zavatski
ab16c32bb1 Merge remote-tracking branch 'refs/remotes/ppy/master' into news-sidebar-new 2021-05-17 11:36:41 +03:00
Dan Balasescu
d75ef160e8
Merge branch 'master' into directory-select-screen 2021-05-17 17:22:03 +09:00
Andrei Zavatski
c0cfbd11dd Add tooltip and action for PostButton in MonthSection 2021-05-17 11:20:31 +03:00
Andrei Zavatski
5059bfaef9 Use FillFlowContainer in YearsPanel 2021-05-17 11:17:02 +03:00
smoogipoo
e3b8d8ee18 Add support for overlay-coloured links 2021-05-17 16:58:54 +09:00
Andrei Zavatski
e754d2e590 Simplify YearButton 2021-05-17 10:54:45 +03:00
Andrei Zavatski
6db291fe84 Merge remote-tracking branch 'refs/remotes/ppy/master' into news-sidebar-new 2021-05-17 10:51:56 +03:00
Dean Herbert
baa4089364 Expose method to adjust header text, not whole drawable 2021-05-17 16:41:46 +09:00
Dean Herbert
abeeda5d04 Rewrite YearsPanel to not be insanely long 2021-05-17 16:24:56 +09:00
Dean Herbert
032f60819d Rename content container 2021-05-17 16:11:46 +09:00
Dean Herbert
22561cda19 MonthDropdown -> MonthSection 2021-05-17 16:02:21 +09:00
Dean Herbert
50e2b5a327 SideBar -> Sidebar 2021-05-17 16:00:36 +09:00
Dan Balasescu
ce7c503e6e
Merge branch 'master' into playlist-unicode 2021-05-17 11:47:10 +09:00
Gagah Pangeran Rosfatiputra
f2de28814a
add and handle OpenWiki link action 2021-05-17 00:43:59 +07:00
Gagah Pangeran Rosfatiputra
463774d4f2
add ShowPage method in WikiOverlay 2021-05-19 19:12:16 +07:00
Dean Herbert
a32f1ef35a
Merge pull request #12811 from PercyDan54/hidden-code-cleanup 
Remove obsolete methods in `ModHidden` and apply few touches
 2021-05-16 22:07:45 +09:00
Swords
90f00a7663 Fixes ResotreDefaultValue to use the BindableWithCurrent correctly 2021-05-16 15:01:19 +10:00
Swords
264d8b9b86 Finishing requested changes, and tidy up 2021-05-16 14:48:00 +10:00
Andrei Zavatski
3e1b1c6c3e Improve statement readability 2021-05-15 19:14:58 +03:00
Andrei Zavatski
e479db9186 Clear transforms in PostsContainer for all children 2021-05-15 19:14:02 +03:00
Andrei Zavatski
881d82ccb6 Merge remote-tracking branch 'refs/remotes/ppy/master' into news-sidebar-new 2021-05-15 19:08:48 +03:00
Salman Ahmed
f00799cc64 Remove unused using directive 
...damn it
 2021-05-15 18:36:47 +03:00
Salman Ahmed
243c8aa585 Add test coverage 2021-05-15 18:02:38 +03:00
Salman Ahmed
4c25fe750f Disallow beatmap skin to fall back to default HUD components 
This should become a more generalized `AllowDefaultSkinFallback` when default legacy skin fallback is supported.
 2021-05-15 14:32:16 +03:00
Swords
b5e1f78c06
Merge branch 'master' into single-bind-reset-button 2021-05-15 20:29:56 +10:00
Salman Ahmed
34d1490754 Remove null conditional 
Shouldn't guard against that here.
 2021-05-15 10:00:05 +03:00
Dean Herbert
dc56250a3c
Merge branch 'master' into player-loader-star-rating 2021-05-15 15:39:57 +09:00
Dean Herbert
94b7e89ac0
Merge pull request #12747 from frenzibyte/current-star-rating 
Allow changing current star difficulty of a `StarRatingDisplay`
 2021-05-15 15:39:39 +09:00
Dean Herbert
bdcb1a624e
Merge pull request #12759 from Naxesss/beatmap-verifier-context 
Encapsulate check arguments in context object
 2021-05-15 15:39:12 +09:00
PercyDan54
166974506e
Duplicate implementions 2021-05-15 11:55:50 +08:00
PercyDan54
6e5c4ed7c6
Revert "Remove empty override" 
This reverts commit a86a4bab91.
 2021-05-15 11:45:14 +08:00
Swords
ecc260030a
Merge branch 'master' into single-bind-reset-button 2021-05-15 12:05:42 +10:00
Swords
50d5af9662 Removed unused method 2021-05-15 12:05:22 +10:00
Swords
d988194dd3 Formatting 2021-05-15 11:40:42 +10:00
Swords
d85f17159f Formatting 2021-05-15 11:25:56 +10:00
Swords
304caf8bdf Adding Requested changed 2021-05-15 11:24:08 +10:00
Dean Herbert
7632b8621e
Merge pull request #12805 from peppy/add-user-id-beatmap-metadata 
Add database tracking of beatmap creator `user_id`s
 2021-05-15 09:03:52 +09:00
Bartłomiej Dach
7665bdfbbb Merge branch 'master' into null-assignment-warning-enable 2021-05-15 01:08:34 +02:00
Bartłomiej Dach
69fc072429 Ignore skin component json data if deserialisation fails instead 
Crashing was not really the best thing to do there given the preceding
code that already allowed a few continues in case of a missing file.
 2021-05-15 01:08:11 +02:00
Bartłomiej Dach
b51d038088 Ignore possible path-related nulls 
They're all in test code anyway, so any issue there will cause a test to
fail.
 2021-05-15 00:09:34 +02:00
Bartłomiej Dach
fa6b5515b7 Ignore possible null from JsonConvert.DeserializeObject() 
Nothing better can be done if a `null` is indeed returned.
 2021-05-15 00:09:34 +02:00
Bartłomiej Dach
5b2b701915 Ignore possible null in GetResponseString() 
A null there indicates a deserialisation error and therefore due to the
catch block immediately succeeding the changed line everything will
continue to work as intended.
 2021-05-15 00:09:34 +02:00
Bartłomiej Dach
628e7a71ed Ignore possible nulls in Type.GetType() calls 
They're mostly used in extensibility scenarios, so everything happens in
runtime. There is no better resolution than to crash with a null
reference exception.
 2021-05-15 00:09:34 +02:00
Bartłomiej Dach
43c73f9583 Mark access to exception if task faulted as safe 
There are seemingly no C#-side compile-time guarantees that it is safe,
but if the task's state is `Faulted` (as is checked right before), the
exception cannot be null as per the documentation.
 2021-05-15 00:09:34 +02:00
Bartłomiej Dach
c9facf70f9 Use conditional nullability attribute 
As it turns out, C# 8 provides an attribute that allows annotating that
an `out` parameter's nullability depends on the method's return value,
which is exactly what is desired here.
 2021-05-15 00:09:34 +02:00
Bartłomiej Dach
aaa7c7eb05 Handle null case explicitly in SpectatorState.Equals() 
Uses the usual pattern of two `ReferenceEquals` checks against `this`
and `null` before proceeding to inspect field values. Doing this causes
the compiler to infer that at the point that field values are checked,
`other` can no longer viably be `null`.
 2021-05-14 23:58:07 +02:00
Bartłomiej Dach
044770f1a2 Locally suppress warning in SerializationReader 
`SerializationReader` is not written in a form that would support
turning nullability checking on for the entire class. The biggest
problem there is the inner `DynamicDeserializer` static class, whose
members are initialised via an `initialize()` method, which the compiler
knows nothing about.

For this reason, just opt to suppress the single inspection about
returning a `null` from a method with a return type of `string` (rider
expects `string?`). It would have been also viable to enable nullability
checking for this one method, but that's pretty much the same thing and
adds no safety anyways, so just disable the warning to minimise
surprise.
 2021-05-14 23:29:34 +02:00
Bartłomiej Dach
94d80f091f Merge branch 'master' into fix-deleting-skin-elements 2021-05-14 22:33:41 +02:00
Bartłomiej Dach
3d3c5028e6 Trim unnecessary array copy 2021-05-14 22:33:26 +02:00
Bartłomiej Dach
743b4fbff1 Pass correct member name to ArgumentExceptions 2021-05-14 22:16:37 +02:00
Bartłomiej Dach
876f53bf3b Fix copy-paste oversights in xmldoc & exception messages 2021-05-14 22:15:43 +02:00
Bartłomiej Dach
8b4e6d2911 Remove no longer necessary FinishTransforms(true) call 
As the component no longer has any transition transforms applied.
 2021-05-14 22:03:35 +02:00
Swords
843da30f9d Reformatting 2021-05-15 01:52:16 +10:00
Swords
6a52622b3f Merge branch 'single-bind-reset-button' of https://github.com/holaswords/osu into single-bind-reset-button 2021-05-15 01:31:40 +10:00
Swords
1603b92211 Reformatting 2021-05-15 01:30:54 +10:00
Swords
85174793b1
Merge branch 'master' into single-bind-reset-button 2021-05-15 01:07:32 +10:00
Swords
753bdf2083 Fixed formatting 2021-05-15 01:04:15 +10:00
Swords
0725088fde Well it works, just pretty ugly looking. 2021-05-15 01:01:17 +10:00
PercyDan54
a86a4bab91
Remove empty override 2021-05-14 21:55:32 +08:00
PercyDan54
67dfeeb1b7
Cleanup code in ModHidden 2021-05-14 21:29:13 +08:00
Salman Ahmed
7c2fc9b412 Update usage due to nullability removal 2021-05-14 16:12:33 +03:00
Salman Ahmed
93007c1635 Merge branch 'current-star-rating' into player-loader-star-rating 2021-05-14 16:06:00 +03:00
Salman Ahmed
6cc678f497 Remove nullability and transition support from star rating display 2021-05-14 16:05:40 +03:00
Salman Ahmed
0dc3bfd0c1 Apply simple transforms to star rating display when ready if not 2021-05-14 15:55:26 +03:00
Salman Ahmed
e0728a6e19 Make BeatmapDifficultyCache.GetDifficultyAsync virtual 2021-05-14 15:52:36 +03:00
Dan Balasescu
a1d63243a4
Merge pull request #12800 from frenzibyte/online-play-oversight 
Fix online play subscreens not pushing player loaders when starting gameplay
 2021-05-14 20:44:44 +09:00
Dean Herbert
f5dd18f266
Use existing LoadedBeatmapSuccessfully bool instead 
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
 2021-05-14 16:53:51 +09:00
Dean Herbert
67a99c83a3 Tidy bindable changed code up 2021-05-14 16:24:52 +09:00
Dean Herbert
fcb226bd20 Add local variable for regular access to HitObjects 2021-05-14 16:23:45 +09:00
Dean Herbert
d09da02673 Fix deleting skin elements not saving out to skin 
Closes https://github.com/ppy/osu/issues/12786.
 2021-05-14 16:03:22 +09:00
Dean Herbert
32ff406289 Add database tracking of beatmap creator user_ids 2021-05-14 15:40:29 +09:00
Salman Ahmed
8338f702c3 Remove not required null conditional 2021-05-14 09:32:56 +03:00
Dean Herbert
dc576c19b4 Fix a potential nullref when starting Player with autoplay enabled and beatmap fails to load 2021-05-14 15:10:02 +09:00
Dean Herbert
48672f8afd Add very basic test logic to ensure PlayerLoader is present for playlists 2021-05-14 15:02:36 +09:00
Dean Herbert
1d4bcbaa6e
Merge pull request #12796 from peppy/update-framework 
Update framework
 2021-05-14 14:43:54 +09:00
Dean Herbert
46e7d9e0ed Randomise the values displayed in the skinning toolbox 
To stop the spam of "WYSI" comments everywhere. I guess I underestimated
the negative effect this would have.
 2021-05-14 12:15:58 +09:00
Dean Herbert
b36c991ba1 Fix single case of incorrect usage 2021-05-14 12:04:38 +09:00
Naxess
a447f20095 Fix formatting of #nullable enable 2021-05-14 03:38:35 +02:00
Naxess
90e0b3374e
Add #nullable enable 
Co-authored-by: Dean Herbert <pe@ppy.sh>
 2021-05-14 03:34:50 +02:00
Salman Ahmed
9e8c0a7e70 Fix online play subscreens not pushing player loaders when starting gameplay 2021-05-14 04:25:29 +03:00
Dean Herbert
ddceafb1b0 Update framework 2021-05-14 09:38:25 +09:00
Lucas A
6f248db519 Merge conditional expression. 2021-05-13 19:31:10 +02:00
Lucas A
0caba57945 Make screen properties local to MigrationSelectScreen. 2021-05-13 19:28:23 +02:00
Bartłomiej Dach
6a64a705b8 Merge branch 'master' into skin-blueprint-aspect-lock 2021-05-13 17:53:00 +02:00
Bartłomiej Dach
25b1443c50 Remove dead branch and mark implementation as temporary 
The previous implementation was checking if the `x0` or `x2` anchors
were selected to decide on which way to transfer the drawable's scale,
but that check actually ends up being always true for corner anchors. To
visualise, this is how the corner anchors correspond to `Anchor` flags:

    x0  x1  x2
    |   |   |
y0 -O---O---O-
    |   |   |
y1 -O---+---O-
    |   |   |
y2 -O---O---O-
    |   |   |

The Os indicate where the reference anchors are on a selection box.
The first conditional eliminates the middle ones, which makes sense.
But after excluding them from further deliberations (marking via X):

    x0  x1  x2
    |   |   |
y0 -O---X---O-
    |   |   |
y1 -X---+---X-
    |   |   |
y2 -O---X---O-
    |   |   |

The remaining anchors always have `x0` or `x2` set. So to avoid
confusion, just always transfer one way for now. At some point this
should be torn out in favour of an actual implementation of the desired
behaviour.
 2021-05-13 17:50:12 +02:00
Dean Herbert
0fa90a80d4
Merge branch 'master' into skin-blueprint-aspect-lock 2021-05-13 23:38:53 +09:00
Dean Herbert
3ecbb9ec4b
Merge branch 'master' into skin-blueprint-anchor-origin 2021-05-13 23:38:04 +09:00
Dean Herbert
98830dadda
Merge pull request #12762 from peppy/skin-blueprint-visual-improvements 
Improve the visual appearance of skin editor blueprints
 2021-05-13 23:37:21 +09:00
Dean Herbert
cef39eb4fa
Merge pull request #12766 from peppy/stable-anchor-origin 
Keep component positions stable when changing anchor/origin
 2021-05-13 23:36:40 +09:00
Dean Herbert
caa3e1dca5
Merge pull request #12767 from peppy/save-on-forced-exit 
Save skin editor changes on forced exit
 2021-05-13 23:35:52 +09:00
Lucas A
09a5b9c872 Add XMLDoc to protected members. 2021-05-13 16:28:03 +02:00
Dean Herbert
4183a1c556
Merge pull request #12769 from peppy/remove-skinnable-hud-classes 
Remove remaining test usage of SkinnableXXX HUD components
 2021-05-13 22:56:18 +09:00
Dean Herbert
6c12cae105 Remove unnecessary property 2021-05-13 22:25:11 +09:00
Dean Herbert
c57a2f43fa Merge branch 'master' into skin-blueprint-visual-improvements 2021-05-13 22:22:42 +09:00
Andrei Zavatski
38c0ba2d10 Implement current year highlight in YearsPanel 2021-05-13 16:16:19 +03:00
Dan Balasescu
63fbbc848e
Merge pull request #12778 from peppy/skin-editor-shortcut-fix 
Change default skin editor shortcut to Ctrl+Shift+S
 2021-05-13 22:14:03 +09:00
smoogipoo
4cf4817ad2 Remove redundant parens 2021-05-13 22:11:58 +09:00
Dan Balasescu
d2fdd1e521
Merge branch 'master' into stable-anchor-origin 2021-05-13 22:06:21 +09:00
Andrei Zavatski
94543bf000 Merge remote-tracking branch 'refs/remotes/ppy/master' into news-sidebar-new 2021-05-13 16:00:46 +03:00
Dan Balasescu
67f795cfa6
Merge branch 'master' into save-on-forced-exit 2021-05-13 22:00:38 +09:00
smoogipoo
1e23c53507 Fix inspection 2021-05-13 21:59:38 +09:00
smoogipoo
362a09ca73 Fix up + reduce complexity of HOCEventQueue 2021-05-13 21:41:49 +09:00
smoogipoo
aaf31af326 Add blueprint transferral 2021-05-13 21:16:19 +09:00
smoogipoo
86042e1763 Implement HitObjectContainerEventQueue 2021-05-13 21:15:47 +09:00
Dan Balasescu
d5b14b6b99
Merge branch 'master' into remove-skinnable-hud-classes 2021-05-13 21:06:48 +09:00
Dan Balasescu
1b62947469
Merge branch 'master' into skin-editor-default-placement-location 2021-05-13 20:58:31 +09:00
Dan Balasescu
746862dcb1
Merge pull request #12750 from peppy/skin-serialisation 
Add skin editor saving / loading support
 2021-05-13 20:58:03 +09:00
smoogipoo
ffb6135a1b Rework hitobject blueprints to take in hitobject models 2021-05-13 19:53:32 +09:00
Dan Balasescu
3c471837f8
Merge branch 'master' into skin-serialisation 2021-05-13 19:49:55 +09:00
Dan Balasescu
a3869c02f4
Merge branch 'master' into fix-two-hovered-handles 2021-05-13 19:24:42 +09:00
Dean Herbert
b939318922 Merge branch 'skin-serialisation' into skin-editor-default-placement-location 2021-05-13 19:09:34 +09:00
Dean Herbert
e5f765d1a8 Fix broken exception message 2021-05-13 19:06:58 +09:00
Dean Herbert
bda0ea463a Merge branch 'skin-serialisation' into save-on-forced-exit 2021-05-13 19:05:47 +09:00
Dean Herbert
c8b7cfc753 Merge branch 'skin-serialisation' into remove-skinnable-hud-classes 2021-05-13 19:05:08 +09:00
Dean Herbert
07e475cd13 Fix skin blueprint box drawing incorrectly when both scale and rotation are applied 2021-05-13 18:54:40 +09:00
smoogipoo
2f025f1967 SkinnableTargetWrapper -> SkinnableTargetComponentsContainer 2021-05-13 18:54:30 +09:00
Dean Herbert
01bc71acd2
Improve ability to parse xmldoc of SkinnableTargetWrapper 
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
 2021-05-13 18:40:28 +09:00
Dean Herbert
df77b28b48 Add a flimsy guard against null parent to avoid crashes on exit sequence 2021-05-13 18:39:21 +09:00
Naxess
19800f5f7f Move IBeatmap arg into context 2021-05-13 11:24:22 +02:00
Lucas A
eee3cd7c57 Disallow selecting storage root as a valid directory. 2021-05-13 11:14:05 +02:00
Lucas A
d3cc418961 Privatize DirectorySelector. 2021-05-13 11:08:04 +02:00
Lucas A
4bb0e6b7d5 Create InitialPath property. 2021-05-13 11:07:52 +02:00
Lucas A
9a061ad80b Extract directory selection logic of migration screen to DirectorySelectScreen. 2021-05-13 11:07:26 +02:00
Dean Herbert
9f8e6979dd Fix display of skin blueprints when flipped 2021-05-13 18:00:25 +09:00
Dean Herbert
1cda55393e Add aspect ratio locking and flip support to skin editor 2021-05-13 17:51:57 +09:00
Dean Herbert
ebce3fd3c7 Use ScheduleAfterChildren to better match comment 2021-05-13 17:29:11 +09:00
Dean Herbert
3ea469813c Use interface in place of SkinnableTargetContainer 2021-05-13 17:25:51 +09:00
Dean Herbert
0959e7156a Remove outdated TODO 2021-05-13 17:22:05 +09:00
Dean Herbert
106fa97a11 Rename SkinnableElementTargetContainer to SkinnableTargetContainer 2021-05-13 17:07:38 +09:00
Dean Herbert
7921dc7ece Rename ISkinnableComponent to ISkinnableDrawable 2021-05-13 17:06:00 +09:00
Dean Herbert
cdcd31b546 Replace ISkinSerialisable with IsEditable property 2021-05-13 17:03:17 +09:00
Dean Herbert
dd6a06a302 Reword xmldoc to read better 2021-05-13 16:43:42 +09:00
Dean Herbert
9dfa48b22e Fix incorrect exception text 2021-05-13 16:42:43 +09:00
Dean Herbert
19223ba013 Remove left-over debug logging 2021-05-13 16:42:13 +09:00
Dean Herbert
5818ed4c8c Remove unused DI resolution 2021-05-13 16:41:36 +09:00
Naxess
b37cb3bdbe Change interpreted difficulty from bindable to regular value 
There's no reason for why checks would need this to be bindable. A 1-directional binding is more appropriate.
 2021-05-13 09:00:30 +02:00
Naxess
4eeeaf6a1a Keep track of local bound copy 2021-05-13 07:57:32 +02:00