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

Add ship name and class to intro screen. #4529

Merged
merged 1 commit into from Feb 8, 2019

Conversation

Projects
None yet
6 participants
@ecraven
Copy link
Contributor

ecraven commented Feb 7, 2019

screenshot

@nozmajner

This comment has been minimized.

Copy link
Contributor

nozmajner commented Feb 7, 2019

Nice idea!

@impaktor

This comment has been minimized.

Copy link
Member

impaktor commented Feb 7, 2019

Your code doesn't conform to clang thingy.

I've compiled and tested. Works as advertised.

@nozmajner

This comment has been minimized.

Copy link
Contributor

nozmajner commented Feb 7, 2019

Erm, on that screenshot, the ship and the text doesn't match.

@laarmen

This comment has been minimized.

Copy link
Contributor

laarmen commented Feb 7, 2019

@impaktor

This comment has been minimized.

Copy link
Member

impaktor commented Feb 7, 2019

Soooo... Not as advertised, then :)

I'm required to know the name of all the ships in game? What do you ask of me? It didn't crash and that was good enough for me.

@nozmajner

This comment has been minimized.

Copy link
Contributor

nozmajner commented Feb 7, 2019

I do know, but didn't spotted it at first.

@laarmen

This comment has been minimized.

Copy link
Contributor

laarmen commented Feb 7, 2019

@ecraven ecraven force-pushed the ecraven:ship-name-on-intro-screen branch from 9e71398 to ed112d0 Feb 7, 2019

@ecraven ecraven force-pushed the ecraven:ship-name-on-intro-screen branch from ed112d0 to 20d5965 Feb 7, 2019

@ecraven

This comment has been minimized.

Copy link
Contributor Author

ecraven commented Feb 7, 2019

Ah, sorry about that. Should both be fixed now, correct name, and clang-format-conformant.

@@ -14,6 +14,7 @@ class Intro : public Cutscene {
Intro(Graphics::Renderer *r, int width, int height);
~Intro();
virtual void Draw(float time);
SceneGraph::Model *getCurrentModel() const { return m_model; }

This comment has been minimized.

@mike-f1

mike-f1 Feb 7, 2019

Contributor

const ?

This comment has been minimized.

@ecraven

ecraven Feb 7, 2019

Author Contributor

does not modify the object, thus const. Note that const is on the function, not the return type.

@impaktor impaktor merged commit 20d5965 into pioneerspacesim:master Feb 8, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@Keeper1st

This comment has been minimized.

Copy link

Keeper1st commented Feb 11, 2019

I found the font size of 24 instead of 30 looked a little better. It would be really slick if the name could be displayed only when the ship is fully zoomed in. (Centering the name would be nice too...)

@ecraven

This comment has been minimized.

Copy link
Contributor Author

ecraven commented Feb 11, 2019

I found the font size of 24 instead of 30 looked a little better. It would be really slick if the name could be displayed only when the ship is fully zoomed in. (Centering the name would be nice too...)

Does #4534 work for you?

@ecraven ecraven deleted the ecraven:ship-name-on-intro-screen branch Feb 11, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment