Bring the latest features to the UE5 branch. Use UE5.0 instead of 5.0EA.

npruehs / ue4-rts

Real-time strategy plugin and showcase for Unreal Engine 4.

MIT License

747 stars 151 forks source link

Bring the latest features to the UE5 branch. Use UE5.0 instead of 5.0EA. #183

Closed kimsch closed 2 years ago

kimsch commented 2 years ago

There had been some updates to the develop branch since the last feature/ue5 commit. This commit just brings the feature/ue5 branch up to date. And since UE5 has left Early Access, it also updates the .uproject to use the new 5.0 version.

This is my first pull request, so I hope I did things right!

npruehs commented 2 years ago

Hey @kimsch! Thanks for your PR! :) GitHub says there's merge conflicts between your branch and the upstream branch feature/ue5 - are you sure you've been working on an up-to-date version?

kimsch commented 2 years ago

Ah, yes sorry, I think that might have happened because I checked out the dev branch and then applied the ue5 changes onto that, then pushed it onto the feature/ue5 branch. Didn't realize I could resolve conflicts here, but did so now. :) Should be no problem any more, and is definitely the latest version! Pulled it today!

npruehs commented 2 years ago

Thanks for everything! :)