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 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 |
|
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 |
|
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 |
|
Dan Balasescu
|
ce7c503e6e
|
Merge branch 'master' into playlist-unicode
|
2021-05-17 11:47:10 +09: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 |
|
Bartłomiej Dach
|
7665bdfbbb
|
Merge branch 'master' into null-assignment-warning-enable
|
2021-05-15 01:08:34 +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 |
|
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 |
|
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 |
|
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
|
b36c991ba1
|
Fix single case of incorrect usage
|
2021-05-14 12:04:38 +09:00 |
|
Salman Ahmed
|
9e8c0a7e70
|
Fix online play subscreens not pushing player loaders when starting gameplay
|
2021-05-14 04:25:29 +03: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
|
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
|
c8b7cfc753
|
Merge branch 'skin-serialisation' into remove-skinnable-hud-classes
|
2021-05-13 19:05:08 +09:00 |
|
Naxess
|
19800f5f7f
|
Move IBeatmap arg into context
|
2021-05-13 11:24:22 +02: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 |
|