Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rmlui: Update assets after the update to master #146

Merged
merged 18 commits into from Aug 11, 2022
Merged

Conversation

illwieckz
Copy link
Member

@illwieckz illwieckz commented Aug 3, 2022

The branch is named ishq/rmlui despite not being mine because this way it's easier to find:

I spotted that:

Warn: Deprecation notice: Element '<progressbar>' renamed to '<progress>', please adjust RML tags accordingly. 
Warn: Deprecation notice: Element '<progressbar>' renamed to '<progress>', please adjust RML tags accordingly. 

But that breaks HUD progress bars.

@slipher
Copy link
Contributor

slipher commented Aug 3, 2022

This should target something other than master, shouldn't it?

@illwieckz
Copy link
Member Author

Ah those are not silenced

Warn: Syntax error parsing inline property declaration 'opacity: -nan;'. 
Warn: Breaking change: The 'fill-image' property now needs to be set on the <progress> element, instead of its inner <fill> element. Please update your RCSS source to fix progress bars in this document. 
Warn: Breaking change: The 'fill-image' property now needs to be set on the <progress> element, instead of its inner <fill> element. Please update your RCSS source to fix progress bars in this document. 
Warn: Syntax error parsing inline property declaration 'opacity: -nan;'. 

It looks like I fixed the fill-image issue but not the opacity: -nan.

@illwieckz
Copy link
Member Author

This should target something other than master, shouldn't it?

Yes maybe, we can change the target anyway once we create a better one.

@illwieckz
Copy link
Member Author

illwieckz commented Aug 4, 2022

This may be needed on Unvanquished side:

diff --git a/src/cgame/rocket/rocket.cpp b/src/cgame/rocket/rocket.cpp
index ace047a83..bff864a39 100644
--- a/src/cgame/rocket/rocket.cpp
+++ b/src/cgame/rocket/rocket.cpp
@@ -394,7 +394,7 @@ void Rocket_Init()
 
        // Add custom client elements
        RegisterElement<SelectableDataGrid>( "datagrid" );
-       RegisterElement<RocketProgressBar>( "progressbar" );
+       RegisterElement<RocketProgressBar>( "progress" );
        RegisterElement<RocketDataSelect>( "dataselect" );
        RegisterElement<RocketConsoleTextElement>( "console_text" );
        RegisterElement<RocketDataSourceSingle>( "datasource_single" );

But some progress bar are still full white, and they're always full.

Anyway this is low priority, I just wanted to try to know if that was easy or not.

@DolceTriade DolceTriade changed the title rmlui: replace progressbar with progress rmlui: Update assets after the update to master Aug 5, 2022
@DolceTriade DolceTriade marked this pull request as ready for review August 5, 2022 06:31
ui/alien_build.rml Outdated Show resolved Hide resolved
@illwieckz
Copy link
Member Author

I can't approve because:

Pull request authors can't approve their own pull requests.1

But it LGTM.

Footnotes

  1. That's something GitLab allows anyway.

@DolceTriade DolceTriade merged commit e5ed0ce into master Aug 11, 2022
@DolceTriade DolceTriade deleted the ishq/rmlui branch August 11, 2022 21:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants