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

Update uid generation to include map.png and update map format #19891

Merged
merged 5 commits into from Aug 30, 2022

Conversation

PunkPun
Copy link
Member

@PunkPun PunkPun commented Jan 20, 2022

closes #19888

To not break compatibility with resource centre I update map format to 12. However since format doesn't actually change I'm keeping compatibility with format 11

@PunkPun PunkPun force-pushed the Update-UID branch 2 times, most recently from 7044791 to 2cadf76 Compare January 21, 2022 11:05
@PunkPun
Copy link
Member Author

PunkPun commented Jan 21, 2022

When I updated maps, some of the map previews were also updated. I excluded them from this pr except for TS. Their generation was changed in #19572 but the maps themselves weren't updated. I think this is a good opportunity to fix that mistake

OpenRA.Game/Map/Map.cs Outdated Show resolved Hide resolved
OpenRA.Game/Map/Map.cs Outdated Show resolved Hide resolved
@penev92 penev92 changed the title Update uid generation to include map.yaml and update map format Update uid generation to include map.png and update map format Jan 22, 2022
@PunkPun PunkPun force-pushed the Update-UID branch 3 times, most recently from d3e8490 to ef09881 Compare January 22, 2022 12:41
OpenRA.Game/Map/Map.cs Outdated Show resolved Hide resolved
OpenRA.Game/Map/Map.cs Outdated Show resolved Hide resolved
OpenRA.Game/Map/Map.cs Outdated Show resolved Hide resolved
OpenRA.Game/Map/Map.cs Outdated Show resolved Hide resolved
OpenRA.Game/Map/Map.cs Show resolved Hide resolved
@pchote
Copy link
Member

pchote commented Jan 22, 2022

Can you please reorder the commits so that the parsing logic commit is first? Trying to build and run on any but the last commit currently crashes on startup. Otherwise LGTM.

@PunkPun
Copy link
Member Author

PunkPun commented Jan 22, 2022

reordered

@PunkPun PunkPun mentioned this pull request Jan 31, 2022
@PunkPun PunkPun added this to the Next release milestone Jul 8, 2022
@Mailaender
Copy link
Member

Needs a rebase.

@PunkPun
Copy link
Member Author

PunkPun commented Aug 6, 2022

rebased

@Mailaender Mailaender merged commit fc1d8d2 into OpenRA:bleed Aug 30, 2022
@Mailaender
Copy link
Member

Changelog

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.

Non-essential map files are ignored in uid generation
3 participants