Warzone2100 / WMIT

Warzone Model Import Tool - for use with Warzone 2100
GNU General Public License v3.0
16 stars 11 forks source link

Merge latest development work (update to Qt5, 3.2+ shaders) + CMake / build fixes + CI #6

Closed past-due closed 5 years ago

past-due commented 5 years ago

This extends #4, and merges the latest development work from @inodlite's fork (updating to Qt5, 3.2+ shaders, lots of bug fixes).

It also:

past-due commented 5 years ago

@inodlite: The rebase and merge has updated all the commit hashes. This includes all of the changes from your fork's master branch through https://github.com/inodlite/WMIT/commit/3337bc04b71661b614a12806f45ce44c60b64b00, and then my additional fixes.

(So you may want to rebase your fork, for ease of future PRs / merging. At the moment, this repo's master branch is a superset of your master branch.)