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

Add highways to trident and hex2t tilesets #61

Closed

Conversation

petervdmeer
Copy link
Contributor

The highways are added at a 3 to 4 pixels offset to railroads, this allows both to be visible on the same tile, while still allowing them to connect as well. (Depending on if the ruleset wants those roads to connect or be separate.)

@cazfi
Copy link
Member

cazfi commented Jan 10, 2024

The new files need to be added to tarball distribution and get installed too. This need to be done for both legacy autotools and new meson based build system. Former requires changes to relevant Makefile.am, and latter to meson.build.

The highways are added at a 3 to 4 pixels offset to railroads,
this allows both to be visible on the same tile, while still
allowing them to connect as well. (Depending on if the ruleset
wants those roads to connect or be separate.)
@petervdmeer
Copy link
Contributor Author

Files are added to the meson.build and Makefile.am files.

I've tested 'ninja' and 'ninja install' and the new files ended up in the (custom) install directory for Meson. I've also tested 'make' and 'make install'. The new files also ended up in the (other custom) install directory.

@cazfi
Copy link
Member

cazfi commented Feb 11, 2024

Ticket to handle this: https://redmine.freeciv.org/issues/255

@cazfi
Copy link
Member

cazfi commented Mar 7, 2024

Merged outside github UI.

@cazfi cazfi closed this Mar 7, 2024
alien-valkyrie pushed a commit to alien-valkyrie/freeciv that referenced this pull request Apr 11, 2024
See RM freeciv#61

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
alien-valkyrie pushed a commit to alien-valkyrie/freeciv that referenced this pull request Apr 11, 2024
See RM freeciv#61

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
alien-valkyrie pushed a commit to alien-valkyrie/freeciv that referenced this pull request Apr 15, 2024
See RM freeciv#61

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
2 participants