h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 14:40:04 +08:00
Code Issues Releases Wiki Activity
39,925 Commits 3 Branches 653 Tags 368 MiB
bc1cad0963
Commit Graph

25230 Commits

Author SHA1 Message Date
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
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 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
smoogipoo
750a5c3ea9 Fix test compilation error 2021-05-20 17:20:30 +09:00
smoogipoo
df80531a0a Split online connectivity into OnlineSpectatorClient 2021-05-20 16:30:56 +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
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
Bartłomiej Dach
788f1fcf48
Merge branch 'master' into disable-skin-editor-border 2021-05-19 21:52:29 +02: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
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
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
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
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
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
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
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
Lucas A
8530b31e39 Use bitshifts for enum values instead of literal values. 2021-05-17 21:02:45 +02: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