Navigation Menu

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

Show factory queue on rollover #3597

Merged
merged 22 commits into from Dec 11, 2021

Conversation

4z0t
Copy link
Contributor

@4z0t 4z0t commented Dec 10, 2021

Shows factory queue on top of unit info on rollover
fac queue4

Edit by Jip:

  • Add game option to disable

@Garanas Garanas added this to the Dev 3726 milestone Dec 10, 2021
@Garanas
Copy link
Member

Garanas commented Dec 10, 2021

Initial tests appear to work fine: as a player I can not see the queue of anyone else (allied or enemy), I can see my own. As an observer I can see all the queues by hovering.

@Garanas
Copy link
Member

Garanas commented Dec 10, 2021

I'll test again tomorrow and review the code.

@4z0t
Copy link
Contributor Author

4z0t commented Dec 10, 2021

@Garanas also, mb need to change the way we check if unit is a factory, it looks ugly rn 😐

@Garanas
Copy link
Member

Garanas commented Dec 10, 2021

I'll switch that up 😄

--TODO: unit category better check!!!!!!!!!
if not table.empty(EntityCategoryFilterDown((categories.SHOWQUEUE * categories.STRUCTURE) + categories.FACTORY,
{info.userUnit})) and
selectedUnit~= info.userUnit then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this particular check? I think for consistency reasons it doesn't hurt

@Garanas
Copy link
Member

Garanas commented Dec 10, 2021

How about this check? It is different: now it also shows the queue of the selected factory

@Garanas
Copy link
Member

Garanas commented Dec 10, 2021

It also works fine when dragging the queue / changing the queue in some fashion

@@ -476,6 +522,15 @@ function UpdateWindow(info)
if info.userUnit then
unitQueue = info.userUnit:GetCommandQueue()
end
CreateQueueGrid(controls.bg)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be inside the if statement too?

@Marc-Spector
Copy link

It would be nice to add the ability to disable this feature in the settings. Not everyone has large screens.

@Garanas
Copy link
Member

Garanas commented Dec 10, 2021

Good suggestion - I'll add that in.

@@ -8595,6 +8595,7 @@ OPTIONS_0242="Всегда показывать имена"
OPTIONS_0243="Показывать вражеские индикаторы жизни"
OPTIONS_0244="Показывать вооружение в строит-ом меню"
OPTIONS_0245="Улучшенный сброс выбранных юнитов"
OPTIONS_0246 = "Show Factory Queue on Hover"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@4z0t can you make this a proper russian translation?

@Garanas
Copy link
Member

Garanas commented Dec 10, 2021

@Marc-Spector done!

@speed2CZ
Copy link
Member

While the idea of showing the preview of the queue is good, these wild icons slapped above the window look bad.

@Eternal-ll
Copy link
Contributor

Grid ui can be visible on first hover

  • game launched
  • no factory under mouse
    image
  • on first hover on factory it being created and you can notice it
    image
  • now it is gone
    image

@Eternal-ll
Copy link
Contributor

Eternal-ll commented Dec 11, 2021

Why queue of unfinished factory which builds ACU passed to ACU when pointing him?

test

@Garanas
Copy link
Member

Garanas commented Dec 11, 2021

Perhaps we should hide it when we have the factory selected then 😄 .

@Garanas
Copy link
Member

Garanas commented Dec 11, 2021

image

Final state of the UI

@Garanas Garanas merged commit df4bfea into FAForever:deploy/fafdevelop Dec 11, 2021
@Garanas
Copy link
Member

Garanas commented Dec 11, 2021

Tested with scaling the UI, turning on / off various settings. All appears to be good.

Garanas added a commit that referenced this pull request Dec 11, 2021
@4z0t
Copy link
Contributor Author

4z0t commented Dec 12, 2021

add always show in obs option

@Garanas
Copy link
Member

Garanas commented Dec 13, 2021

I'll add that to #3604 .

Garanas added a commit that referenced this pull request Dec 20, 2021
* Update changelog

* Update changelog

* Update changelog

* Update changelog

* Update changelog

* Update changelog

* Update changelog

* Update changelog

* Update changelog

* Update changelog

* Add more info for 3316

* Update changelog for #3417

* Added #3522 to changelog

* Add #3523 to changelog

* Add #3349 to the changelog

* Add #3440 and #3512

* Add #3461 to the changelog

* Update #3461 in changelog

* Add #3419 to the changelog

* Add #3525 to the changelog

* Add #3526 to the changelog

* Add #3490 to the changelog

* Add #3527 to the changelog

* Add description for #3527 to changelog

* Improve description of #3490 to changelog

* Add #3528 to the changelog

* Add #3531 to the changelog

* Add #3535 to the changelog

* Add #3543 to the changelog

* Add #3533 to the changelog

* Add #3411 to the changelog

* Add #3552 to the changelog

* Add #3550 to the changelog

* Update wording of #3447 in the changelog

* Update wording of #3484 in the changelog

* Add #3554 to the changelog

* Add #3557 and #3558 to the changelog

* Add #3582 to the changelog

* Add #3581 to the changelog

* Add #3587 and #3589 to the changelog

* Add #3600 and #3601 to the changelog

* Add #3599 and #3598 to the changelog

* Add #3596 to the changelog

* Add #3590, #3588 and #3586 to the changelog

* Add #3567 to the changelog

* Add #3597 to the changelog

* Add suggestions of Rowey

* Add #3606 to the changelog

* Add #3605 to the changelog

* Add #3604 to the changelog

* Refactor changelog

* Refactor changelog

* Fix version of changelog

* Refactor description: only applies to t2 artillery

* Add #3607 to the changelog

* Add translator

* Add #3480 to the changelog

* Add #3610 to the changelog

* Add #3609 to the changelog

* Add #3612, #3616, #3618, #3614 and #3613 to the changelog

* Add #3602 to the changelog

* Update changelog, add it to the game

* Remove temp changelog

* Add message from game team
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

5 participants