Branch: refs/heads/master Home: https://github.com/Warzone2100/warzone2100 Commit: b3e8bc62647843cf1a62ebbab1de741be1233a99 https://github.com/Warzone2100/warzone2100/commit/b3e8bc62647843cf1a62ebbab1de741be1233a99 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022)
Changed paths: M src/game.cpp Log Message: ----------- Rename the JSON "gam" file as "gam.json" Support a fallback for loading older saves (which named it the same as the containing folder / save name) Commit: 98552f26a5eef61f860f8fc889568bb61e8b431b https://github.com/Warzone2100/warzone2100/commit/98552f26a5eef61f860f8fc889568bb61e8b431b Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/framework/physfs_ext.cpp M lib/framework/physfs_ext.h M src/loadsave.cpp Log Message: ----------- Change WZ_PHYSFS_enumerateFiles/Folders callback to const char Commit: f3b1dc01791b59809a17f6e5eaaea7695dafca04 https://github.com/Warzone2100/warzone2100/commit/f3b1dc01791b59809a17f6e5eaaea7695dafca04 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/src/map.cpp M lib/wzmaplib/src/map_internal.h Log Message: ----------- wzmaplib: Move loadJsonObjectFromFile definition Commit: 76a84ee1516c6f5e423d7a1261503c4fb97aba7b https://github.com/Warzone2100/warzone2100/commit/76a84ee1516c6f5e423d7a1261503c4fb97aba7b Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/include/wzmaplib/map_io.h M lib/wzmaplib/src/map_internal.cpp M lib/wzmaplib/src/map_internal.h M lib/wzmaplib/src/map_io.cpp M src/map.cpp M src/map.h Log Message: ----------- wzmaplib: Add enumeration functions to IOProvider Commit: 34b97c114da4f5302876eac3be254566743ad3ae https://github.com/Warzone2100/warzone2100/commit/34b97c114da4f5302876eac3be254566743ad3ae Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/src/map.cpp Log Message: ----------- wzmaplib: Fix Map::loadedMapFormat() Commit: e3d53ec7c51cbd3d5674313a18a93400b78a8901 https://github.com/Warzone2100/warzone2100/commit/e3d53ec7c51cbd3d5674313a18a93400b78a8901 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/include/wzmaplib/terrain_type.h M src/game.cpp M src/game.h M src/map.cpp M src/map.h M src/multiint.cpp Log Message: ----------- Convert some defines to enum class MAP_TILESET Commit: 627adf1d968ab80285f8788581affa12da103819 https://github.com/Warzone2100/warzone2100/commit/627adf1d968ab80285f8788581affa12da103819 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/include/wzmaplib/map_io.h M lib/wzmaplib/src/map_io.cpp M src/map.cpp Log Message: ----------- wzmaplib: Add close() function to IOProvider Commit: 5ad30e30da5477f12d5c6f9ce5f513d092a30baa https://github.com/Warzone2100/warzone2100/commit/5ad30e30da5477f12d5c6f9ce5f513d092a30baa Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/README.md M lib/wzmaplib/include/wzmaplib/map.h M lib/wzmaplib/src/map.cpp M src/game.cpp M src/multiint.cpp Log Message: ----------- wzmaplib: Tweak Map interface Commit: 1b4fcae1e0568854e0e4857e1abe81f8601b033a https://github.com/Warzone2100/warzone2100/commit/1b4fcae1e0568854e0e4857e1abe81f8601b033a Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/include/wzmaplib/map_io.h M lib/wzmaplib/src/map.cpp M lib/wzmaplib/src/map_internal.h M lib/wzmaplib/src/map_io.cpp Log Message: ----------- wzmaplib: Add pathJoin() function to IOProvider Commit: b3a32211fe723a95198f48bd1f3b3863a5735b5a https://github.com/Warzone2100/warzone2100/commit/b3a32211fe723a95198f48bd1f3b3863a5735b5a Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: A lib/wzmaplib/plugins/ZipIOProvider.cpp A lib/wzmaplib/plugins/ZipIOProvider.h Log Message: ----------- wzmaplib: Add ZipIOProvider plugin A WzMap::IOProvider implementation that uses libzip to support loading from zip archives. Commit: 0842f979f76ca9982ba79da3a6449ed6fde1ccce https://github.com/Warzone2100/warzone2100/commit/0842f979f76ca9982ba79da3a6449ed6fde1ccce Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/CMakeLists.txt Log Message: ----------- wzmaplib: Set JSON_USE_IMPLICIT_CONVERSIONS=0 Commit: a16b5c4d3efd94ec3c2eb1670bb14d1b588ebc15 https://github.com/Warzone2100/warzone2100/commit/a16b5c4d3efd94ec3c2eb1670bb14d1b588ebc15 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/README.md M lib/wzmaplib/include/wzmaplib/map.h M lib/wzmaplib/src/map.cpp M src/game.cpp M src/multiint.cpp M tools/map/maptools.cpp Log Message: ----------- wzmaplib: Tweak Map interface (LoggingProtocol) Commit: 64a882427280bcebc05933dfdb0c17ee36f34331 https://github.com/Warzone2100/warzone2100/commit/64a882427280bcebc05933dfdb0c17ee36f34331 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/README.md Log Message: ----------- wzmaplib: Update README Commit: a0c73cdaffb5be12cf32b39770db8ea0babad2cd https://github.com/Warzone2100/warzone2100/commit/a0c73cdaffb5be12cf32b39770db8ea0babad2cd Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/src/map.cpp Log Message: ----------- wzmaplib: Fix loading old object names Commit: 334324435c3674703c669f8a302059f41b551390 https://github.com/Warzone2100/warzone2100/commit/334324435c3674703c669f8a302059f41b551390 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/include/wzmaplib/map_io.h M lib/wzmaplib/plugins/ZipIOProvider.cpp M lib/wzmaplib/plugins/ZipIOProvider.h M lib/wzmaplib/src/map_io.cpp M src/map.cpp M src/map.h Log Message: ----------- wzmaplib: Enhance IOProvider Commit: 21ae8ff5ef94c27208f030b8e1591a8ddcee3f68 https://github.com/Warzone2100/warzone2100/commit/21ae8ff5ef94c27208f030b8e1591a8ddcee3f68 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/include/wzmaplib/map.h M lib/wzmaplib/src/map.cpp Log Message: ----------- wzmaplib: Add Map::expectedFileNames() Commit: efca1b87f41622c369aec398790ad81f2e147e48 https://github.com/Warzone2100/warzone2100/commit/efca1b87f41622c369aec398790ad81f2e147e48 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M src/game.cpp Log Message: ----------- gameLoadV7: Fix: Only call endian_udword for old binary data Commit: 99a5bf101da4f93cb4ead9318661649fdf4e5db4 https://github.com/Warzone2100/warzone2100/commit/99a5bf101da4f93cb4ead9318661649fdf4e5db4 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M src/map.cpp M src/map.h Log Message: ----------- WzMapPhysFSIO: Support custom mount path Commit: 5fefdfae157673bdabc78b8084c073bddbc3fb56 https://github.com/Warzone2100/warzone2100/commit/5fefdfae157673bdabc78b8084c073bddbc3fb56 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M src/init.cpp Log Message: ----------- listMapFiles: Also check number of map folders Commit: 308e4c22033d8ae1cfcb1bebc033416b95d13902 https://github.com/Warzone2100/warzone2100/commit/308e4c22033d8ae1cfcb1bebc033416b95d13902 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/include/wzmaplib/map.h M lib/wzmaplib/src/map.cpp Log Message: ----------- wzmaplib: Expose PLAYER_SCAVENGERS constant Commit: 83f8055401c8bf14fe232ab9dc9f06a05ba72b73 https://github.com/Warzone2100/warzone2100/commit/83f8055401c8bf14fe232ab9dc9f06a05ba72b73 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/include/wzmaplib/map.h A lib/wzmaplib/include/wzmaplib/map_stats.h A lib/wzmaplib/src/map_stats.cpp Log Message: ----------- wzmaplib: Add map_stats Commit: c7454e9671f08b746a209b830c42e2b40439cad9 https://github.com/Warzone2100/warzone2100/commit/c7454e9671f08b746a209b830c42e2b40439cad9 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/README.md M lib/wzmaplib/include/wzmaplib/map.h M lib/wzmaplib/src/map.cpp M lib/wzmaplib/src/map_script.cpp M lib/wzmaplib/src/map_script.h M src/game.cpp M src/multiint.cpp M tools/map/maptools.cpp Log Message: ----------- wzmaplib: Some API tweaks, plus functions for advanced handling of script maps Commit: b155074bad0bf058a408a4f7f85529281eee3957 https://github.com/Warzone2100/warzone2100/commit/b155074bad0bf058a408a4f7f85529281eee3957 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: A lib/wzmaplib/src/map_levparse.cpp A lib/wzmaplib/src/map_levparse.h Log Message: ----------- wzmaplib: Add basic .lev parsing (for old skirmish / mp maps) Commit: aac7b13dd14345daa7f98a12a012ca370ce9e775 https://github.com/Warzone2100/warzone2100/commit/aac7b13dd14345daa7f98a12a012ca370ce9e775 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/README.md A lib/wzmaplib/include/wzmaplib/map_package.h A lib/wzmaplib/include/wzmaplib/map_version.h A lib/wzmaplib/src/map_package.cpp Log Message: ----------- wzmaplib: Add MapPackage support Commit: f39052410a80d8a05d8f58558db5fb86a553b79c https://github.com/Warzone2100/warzone2100/commit/f39052410a80d8a05d8f58558db5fb86a553b79c Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M src/init.cpp M src/levels.cpp M src/levels.h Log Message: ----------- Support loading new "self-contained" maps (level.json) Commit: 66b1fd4c4a680d5dcea611e7a830ccd893afeb91 https://github.com/Warzone2100/warzone2100/commit/66b1fd4c4a680d5dcea611e7a830ccd893afeb91 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/plugins/ZipIOProvider.cpp M lib/wzmaplib/plugins/ZipIOProvider.h Log Message: ----------- wzmaplib: ZipIOProvider: Provide custom implementation of recursive enumeration functions Commit: 9f0f0a187193fcfbd1850832556d9d3f4bf69f6a https://github.com/Warzone2100/warzone2100/commit/9f0f0a187193fcfbd1850832556d9d3f4bf69f6a Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/include/wzmaplib/map_package.h M lib/wzmaplib/src/map_package.cpp Log Message: ----------- wzmaplib: Support new "flat" map packages Where the `level.json` file, and all map files (i.e. what would normally be in "multiplay/maps/<map name>") are in the **root** of the package. (This currently supports "plain" maps - not map mods, which must still follow the classic packaging structure.) Commit: 1ed93ab069a2fb83313503a8ccf3e2bb4d367b57 https://github.com/Warzone2100/warzone2100/commit/1ed93ab069a2fb83313503a8ccf3e2bb4d367b57 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M src/init.cpp M src/init.h M src/levels.cpp M src/levels.h M src/multiint.cpp Log Message: ----------- Support loading new "flat" map packages Where the `level.json` file, and all map files (i.e. what would normally be in "multiplay/maps/<map name>") are in the **root** of the package. (This currently supports "plain" maps - not map mods, which must still follow the classic packaging structure.) Commit: fd623a44ed36f6de7f8b6cdeccee7a2ce3a9500e https://github.com/Warzone2100/warzone2100/commit/fd623a44ed36f6de7f8b6cdeccee7a2ce3a9500e Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: R lib/wzmaplib/plugins/ZipIOProvider.cpp R lib/wzmaplib/plugins/ZipIOProvider.h A lib/wzmaplib/plugins/ZipIOProvider/include/ZipIOProvider.h A lib/wzmaplib/plugins/ZipIOProvider/src/ZipIOProvider.cpp Log Message: ----------- wzmaplib: Move ZipIOProvider plugin Commit: 34e1842036f5aee11e6005e86c4e697a89082116 https://github.com/Warzone2100/warzone2100/commit/34e1842036f5aee11e6005e86c4e697a89082116 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/plugins/ZipIOProvider/src/ZipIOProvider.cpp Log Message: ----------- wzmaplib: ZipIOProvider: Fix endOfStream() Commit: b85f0f81cc007704ec5ba322a88e60ffafe12356 https://github.com/Warzone2100/warzone2100/commit/b85f0f81cc007704ec5ba322a88e60ffafe12356 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/src/map_package.cpp Log Message: ----------- wzmaplib: Fix MapPackage::baseModificationTypes() Commit: bd0b0c2a6f023622645da03fc83ff1488eb075f6 https://github.com/Warzone2100/warzone2100/commit/bd0b0c2a6f023622645da03fc83ff1488eb075f6 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/include/wzmaplib/map_package.h M lib/wzmaplib/src/map_package.cpp Log Message: ----------- wzmaplib: Additional MapPackage properties / helper funcs Commit: 64cfed90e4aa2ecc07300b2e4f6c7f3321470414 https://github.com/Warzone2100/warzone2100/commit/64cfed90e4aa2ecc07300b2e4f6c7f3321470414 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/include/wzmaplib/map.h M lib/wzmaplib/include/wzmaplib/terrain_type.h Log Message: ----------- wzmaplib: Expose more to_string methods Commit: 1724e8fb35c62b97ec167002ac1efcbd809ee7e8 https://github.com/Warzone2100/warzone2100/commit/1724e8fb35c62b97ec167002ac1efcbd809ee7e8 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/README.md M lib/wzmaplib/include/wzmaplib/map_stats.h M lib/wzmaplib/src/map_stats.cpp Log Message: ----------- wzmaplib: stats: Rename factoriesPerPlayer Commit: 20ca35d20bf2711caee4cbdd5cca7b0bdacddadf https://github.com/Warzone2100/warzone2100/commit/20ca35d20bf2711caee4cbdd5cca7b0bdacddadf Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/CMakeLists.txt Log Message: ----------- wzmaplib: CMake: Provide ZipIOProvider plugin target (if libzip is available) Commit: 1e7c6c10d7787198b22ad936a058e34abd646037 https://github.com/Warzone2100/warzone2100/commit/1e7c6c10d7787198b22ad936a058e34abd646037 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/src/map.cpp Log Message: ----------- wzmaplib: Export most compact JSON representation Commit: e89349fbb85681802d65d986578723eb8da07246 https://github.com/Warzone2100/warzone2100/commit/e89349fbb85681802d65d986578723eb8da07246 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/include/wzmaplib/map_io.h M lib/wzmaplib/src/map_io.cpp Log Message: ----------- wzmaplib: Implement StdIOProvider::makeDirectory() Commit: d873407661b1c1c9060dd675c41be9cb077b7f51 https://github.com/Warzone2100/warzone2100/commit/d873407661b1c1c9060dd675c41be9cb077b7f51 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/src/map_package.cpp Log Message: ----------- wzmaplib: Fix MSVC warning Commit: b8eaba8c765dc39b70ab141626f71dde7407c866 https://github.com/Warzone2100/warzone2100/commit/b8eaba8c765dc39b70ab141626f71dde7407c866 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M tools/map/CMakeLists.txt M tools/map/README.md M tools/map/maptools.cpp Log Message: ----------- maptools: New commands for dealing with map packages Commit: f6b05ede0b8ab45fb2c82d069163f49ade5b2b10 https://github.com/Warzone2100/warzone2100/commit/f6b05ede0b8ab45fb2c82d069163f49ade5b2b10 Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/CMakeLists.txt Log Message: ----------- wzmaplib: Add link test for libzip Commit: a36673ca9b19a4edd69a5a4410a3839149ceb4ce https://github.com/Warzone2100/warzone2100/commit/a36673ca9b19a4edd69a5a4410a3839149ceb4ce Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/plugins/ZipIOProvider/src/ZipIOProvider.cpp Log Message: ----------- wzmaplib: ZipIOProvider: Additional sanity checks Commit: a17e2e8d50dba233a99d165ee5afed44f825628f https://github.com/Warzone2100/warzone2100/commit/a17e2e8d50dba233a99d165ee5afed44f825628f Author: past-due <30942300+past-...@users.noreply.github.com> Date: 2022-05-22 (Sun, 22 May 2022) Changed paths: M lib/wzmaplib/src/map_package.cpp Log Message: ----------- wzmaplib: Silence LGTM warning Compare: https://github.com/Warzone2100/warzone2100/compare/5d711172962b...a17e2e8d50db _______________________________________________ Warzone2100-commits mailing list Warzone2100-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/warzone2100-commits