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

Implement parts of InGameUI #1056

Merged
merged 1 commit into from
Jan 27, 2024
Merged

Conversation

jonwil
Copy link
Contributor

@jonwil jonwil commented Jan 24, 2024

No description provided.

@jonwil jonwil requested a review from xezon January 24, 2024 14:26
@xezon xezon changed the title Impement parts of InGameUI Implement parts of InGameUI Jan 24, 2024
Copy link
Contributor

@xezon xezon left a comment

Choose a reason for hiding this comment

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

First batch.

src/game/client/ingameui.cpp Outdated Show resolved Hide resolved
src/game/client/ingameui.cpp Outdated Show resolved Hide resolved
src/game/client/ingameui.cpp Show resolved Hide resolved
src/game/client/ingameui.cpp Outdated Show resolved Hide resolved
src/game/client/ingameui.cpp Outdated Show resolved Hide resolved
src/game/client/ingameui.cpp Outdated Show resolved Hide resolved
src/game/client/ingameui.cpp Outdated Show resolved Hide resolved
src/game/client/ingameui.cpp Outdated Show resolved Hide resolved
src/game/client/ingameui.cpp Show resolved Hide resolved
src/game/client/ingameui.cpp Outdated Show resolved Hide resolved
src/game/client/ingameui.cpp Outdated Show resolved Hide resolved
src/game/client/ingameui.cpp Outdated Show resolved Hide resolved
src/game/client/ingameui.cpp Outdated Show resolved Hide resolved
src/game/client/ingameui.cpp Outdated Show resolved Hide resolved
src/game/client/ingameui.cpp Outdated Show resolved Hide resolved
src/game/client/ingameui.cpp Outdated Show resolved Hide resolved
src/game/client/ingameui.cpp Outdated Show resolved Hide resolved
src/game/client/ingameui.cpp Outdated Show resolved Hide resolved
src/game/client/ingameui.cpp Show resolved Hide resolved
src/game/client/ingameui.cpp Show resolved Hide resolved
src/game/client/ingameui.cpp Show resolved Hide resolved
src/game/client/ingameui.cpp Show resolved Hide resolved
src/game/client/ingameui.cpp Show resolved Hide resolved
src/game/client/ingameui.cpp Show resolved Hide resolved
src/game/client/ingameui.cpp Outdated Show resolved Hide resolved
src/game/client/ingameui.cpp Show resolved Hide resolved
xezon

This comment was marked as off-topic.

Copy link
Contributor

@xezon xezon left a comment

Choose a reason for hiding this comment

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

Cursor Decals do not draw when hovering cursor over Radar in Thyme. Tested against Original. To reproduce, select a ready China Nuke Missile attack, and hover the mouse over the camera position on the Radar. The decal will not be drawn on Terrain.

shot_20240126_202849_1
Decal should draw on Terrain like this when hovering mouse on Radar

@xezon
Copy link
Contributor

xezon commented Jan 26, 2024

Super Weapon timers work
Special Powers Cursor decals work
Object changing team looks normal (USA05)
Ghost build object works
Unit interaction through window works normal
Various mouse cursors work

@jonwil
Copy link
Contributor Author

jonwil commented Jan 26, 2024

Observer bar issue is from a previous commit.
Fixed the radius decal radar issue.

@codecov-commenter
Copy link

codecov-commenter commented Jan 26, 2024

Codecov Report

Attention: 897 lines in your changes are missing coverage. Please review.

Comparison is base (937f58e) 2.65% compared to head (b9cf7af) 2.63%.

Files Patch % Lines
src/game/client/ingameui.cpp 0.00% 885 Missing ⚠️
src/game/client/globallanguage.h 0.00% 8 Missing ⚠️
src/game/client/radiusdecal.cpp 0.00% 2 Missing ⚠️
src/game/client/ingameui.h 0.00% 1 Missing ⚠️
src/game/common/rts/specialpower.h 0.00% 1 Missing ⚠️

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #1056      +/-   ##
===========================================
- Coverage     2.65%    2.63%   -0.03%     
===========================================
  Files          928      929       +1     
  Lines       105321   106224     +903     
  Branches     17877    18062     +185     
===========================================
  Hits          2799     2799              
- Misses      102118   103021     +903     
  Partials       404      404              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Contributor

@xezon xezon left a comment

Choose a reason for hiding this comment

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

Capturing an enemy Superweapon does not update the timer list correctly.

(Ignore the building color: that is another issue)

Original

Before Capture

shot_20240127_091215_1

After Capture

shot_20240127_091243_4

Thyme

Before Capture

shot_20240127_091538_5

After Capture

shot_20240127_091627_13

@xezon
Copy link
Contributor

xezon commented Jan 27, 2024

Saveload works.

@jonwil
Copy link
Contributor Author

jonwil commented Jan 27, 2024

Superweapon timer list issue fixed.

xezon

This comment was marked as off-topic.

@jonwil
Copy link
Contributor Author

jonwil commented Jan 27, 2024

Left_HUD_Input issue is unrelated to this PR, it's not part of InGameUI code.

Copy link
Contributor

@xezon xezon left a comment

Choose a reason for hiding this comment

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

Works in principle. No crashes encountered.

@jonwil jonwil merged commit f4caad2 into TheAssemblyArmada:develop Jan 27, 2024
7 checks passed
@jonwil jonwil deleted the ingameui2 branch January 27, 2024 09:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants