Branch: refs/heads/master
Home: https://github.com/Warzone2100/warzone2100
Commit: 06ebcd8c902b43cb1ad4a18e86e275f858299579
https://github.com/Warzone2100/warzone2100/commit/06ebcd8c902b43cb1ad4a18e86e275f858299579
Author: past-due <[email protected]>
Date: 2021-05-11 (Tue, 11 May 2021)
Changed paths:
M src/stats.cpp
Log Message:
-----------
Fix debugging code in getCompStatsFromName()
Commit: 76139c11a5a73bf2cace5f729145a3155c1b6898
https://github.com/Warzone2100/warzone2100/commit/76139c11a5a73bf2cace5f729145a3155c1b6898
Author: past-due <[email protected]>
Date: 2021-05-11 (Tue, 11 May 2021)
Changed paths:
M lib/framework/file.h
M lib/framework/frame.cpp
Log Message:
-----------
Add loadFileToBufferVector()
Commit: 15366148d9f0733cb62d5444cf320f89d4a4dc58
https://github.com/Warzone2100/warzone2100/commit/15366148d9f0733cb62d5444cf320f89d4a4dc58
Author: past-due <[email protected]>
Date: 2021-05-11 (Tue, 11 May 2021)
Changed paths:
M lib/CMakeLists.txt
A lib/maplib/3rdparty/SDL_endian.h
A lib/maplib/3rdparty/gsl_finally.h
A lib/maplib/CMakeLists.txt
A lib/maplib/map.cpp
A lib/maplib/map.h
A lib/maplib/map_crc.cpp
A lib/maplib/map_crc.h
A lib/maplib/map_debug.cpp
A lib/maplib/map_debug.h
A lib/maplib/map_internal.cpp
A lib/maplib/map_internal.h
A lib/maplib/map_io.cpp
A lib/maplib/map_io.h
A lib/maplib/map_preview.cpp
A lib/maplib/map_preview.h
A lib/maplib/map_script.cpp
A lib/maplib/map_script.h
A lib/maplib/map_terrain_types.cpp
A lib/maplib/map_terrain_types.h
A lib/maplib/terrain_type.h
M src/CMakeLists.txt
M src/game.cpp
M src/game.h
M src/map.cpp
M src/map.h
M src/multiint.cpp
M src/qtscript.cpp
M src/qtscript.h
M src/quickjs_backend.cpp
Log Message:
-----------
maplib: Refactor map-loading into self-contained lib
Commit: a1186db0560a1886b712202f6ee3ef0dd4868876
https://github.com/Warzone2100/warzone2100/commit/a1186db0560a1886b712202f6ee3ef0dd4868876
Author: past-due <[email protected]>
Date: 2021-05-11 (Tue, 11 May 2021)
Changed paths:
M lib/maplib/map.h
M src/atmos.cpp
M src/edit3d.cpp
M src/edit3d.h
M src/map.h
M src/visibility.cpp
Log Message:
-----------
Replace many uses of ELEVATION_SCALE with TILE_MAX_HEIGHT
Commit: b4909385e878644256c0fd7889dd4b928a9f4714
https://github.com/Warzone2100/warzone2100/commit/b4909385e878644256c0fd7889dd4b928a9f4714
Author: past-due <[email protected]>
Date: 2021-05-11 (Tue, 11 May 2021)
Changed paths:
M lib/maplib/map.cpp
M lib/maplib/map_preview.cpp
M src/map.cpp
Log Message:
-----------
maplib: Move handling of old map heights (and ELEVATION_SCALE) to loadMapData
Commit: 5e7f057251c85e3dac55cf9b044984e734a52350
https://github.com/Warzone2100/warzone2100/commit/5e7f057251c85e3dac55cf9b044984e734a52350
Author: past-due <[email protected]>
Date: 2021-05-11 (Tue, 11 May 2021)
Changed paths:
M lib/maplib/map.cpp
M lib/maplib/map.h
M src/game.cpp
M src/map.cpp
M src/map.h
Log Message:
-----------
maplib: Add writeMapData, support new game.map format
Version 40 game.map format supports full-range tile height
Commit: 20c34d268aff759d600fcd6451eb7987e28c5c83
https://github.com/Warzone2100/warzone2100/commit/20c34d268aff759d600fcd6451eb7987e28c5c83
Author: past-due <[email protected]>
Date: 2021-05-11 (Tue, 11 May 2021)
Changed paths:
M lib/maplib/map.cpp
M src/gateway.cpp
M src/gateway.h
M src/map.cpp
Log Message:
-----------
Additional checks for valid tile height range
Commit: 74ff5d0b99289cfc8d286348af1c249ae991c811
https://github.com/Warzone2100/warzone2100/commit/74ff5d0b99289cfc8d286348af1c249ae991c811
Author: past-due <[email protected]>
Date: 2021-05-11 (Tue, 11 May 2021)
Changed paths:
M 3rdparty/CMakeLists.txt
A 3rdparty/quickjs/CMakeLists.txt
Log Message:
-----------
[CMake] Refactor QuickJS CMake build config
Commit: 2cb6b79bc2233c1d38da532249eb3bcda54a7422
https://github.com/Warzone2100/warzone2100/commit/2cb6b79bc2233c1d38da532249eb3bcda54a7422
Author: past-due <[email protected]>
Date: 2021-05-11 (Tue, 11 May 2021)
Changed paths:
M lib/maplib/CMakeLists.txt
Log Message:
-----------
[CMake] maplib: Explicitly specify include dirs + QuickJS
Commit: d40da64591872131c369ec8cba6314c9158df5c1
https://github.com/Warzone2100/warzone2100/commit/d40da64591872131c369ec8cba6314c9158df5c1
Author: past-due <[email protected]>
Date: 2021-05-11 (Tue, 11 May 2021)
Changed paths:
M lib/maplib/map_io.cpp
M lib/maplib/map_io.h
M src/map.cpp
M src/map.h
Log Message:
-----------
maplib: Tweak BinaryIOStream::writeBytes()
Commit: cff973c372542d4f1a1ac011a603c51d47124ef0
https://github.com/Warzone2100/warzone2100/commit/cff973c372542d4f1a1ac011a603c51d47124ef0
Author: past-due <[email protected]>
Date: 2021-05-11 (Tue, 11 May 2021)
Changed paths:
M lib/maplib/map.h
M lib/maplib/map_terrain_types.h
A lib/maplib/map_types.h
Log Message:
-----------
maplib: Move key types to map_types.h
Commit: 578d81abe52b7b2354c2582613725d39021e84f8
https://github.com/Warzone2100/warzone2100/commit/578d81abe52b7b2354c2582613725d39021e84f8
Author: past-due <[email protected]>
Date: 2021-05-11 (Tue, 11 May 2021)
Changed paths:
M lib/maplib/map_terrain_types.cpp
M lib/maplib/map_terrain_types.h
M src/game.cpp
Log Message:
-----------
maplib: Add writeTerrainTypes
Commit: a40216e452ebf3a9623f92e535c4929bd117e3c7
https://github.com/Warzone2100/warzone2100/commit/a40216e452ebf3a9623f92e535c4929bd117e3c7
Author: past-due <[email protected]>
Date: 2021-05-11 (Tue, 11 May 2021)
Changed paths:
M lib/maplib/map.cpp
M lib/maplib/map.h
Log Message:
-----------
maplib: Add exportMapToPath
Commit: fa8cebe569e4bd8aff8a47ee682ba7f4a40a0847
https://github.com/Warzone2100/warzone2100/commit/fa8cebe569e4bd8aff8a47ee682ba7f4a40a0847
Author: past-due <[email protected]>
Date: 2021-05-11 (Tue, 11 May 2021)
Changed paths:
M lib/maplib/map_internal.h
Log Message:
-----------
maplib: Type-check format string arguments
Commit: 9a00a24e4fac707332388b7ff7142dff9efdfa18
https://github.com/Warzone2100/warzone2100/commit/9a00a24e4fac707332388b7ff7142dff9efdfa18
Author: past-due <[email protected]>
Date: 2021-05-11 (Tue, 11 May 2021)
Changed paths:
R tools/map/.gitignore
R tools/map/CMakeLists.txt
R tools/map/Makefile.am
R tools/map/MapUtilities.xcodeproj/.gitignore
R tools/map/MapUtilities.xcodeproj/Do not hand edit these files under any
circumstances, always use xcode
R tools/map/MapUtilities.xcodeproj/project.pbxproj
R tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/All Tools.xcscheme
R tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/map2lnd.xcscheme
R tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/map2png.xcscheme
R
tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/map2preview.xcscheme
R tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/mapconv.xcscheme
R tools/map/MapUtilities.xcodeproj/xcshareddata/xcschemes/mapinfo.xcscheme
R
tools/map/MapUtilities.xcodeproj/xcuserdata/ivasilov.xcuserdatad/xcschemes/xcschememanagement.plist
R tools/map/configs/Base-Tools.xcconfig
R tools/map/configs/Project-All.xcconfig
R tools/map/configs/map2lnd-All.xcconfig
R tools/map/configs/map2lnd-Debug.xcconfig
R tools/map/configs/map2lnd-Release.xcconfig
R tools/map/configs/map2lnd-StaticAnalyzer.xcconfig
R tools/map/configs/map2png-All.xcconfig
R tools/map/configs/map2png-Debug.xcconfig
R tools/map/configs/map2png-Release.xcconfig
R tools/map/configs/map2png-StaticAnalyzer.xcconfig
R tools/map/configs/map2preview-All.xcconfig
R tools/map/configs/map2preview-Debug.xcconfig
R tools/map/configs/map2preview-Release.xcconfig
R tools/map/configs/map2preview-StaticAnalyzer.xcconfig
R tools/map/configs/mapconv-All.xcconfig
R tools/map/configs/mapconv-Debug.xcconfig
R tools/map/configs/mapconv-Release.xcconfig
R tools/map/configs/mapconv-StaticAnalyzer.xcconfig
R tools/map/configs/mapinfo-All.xcconfig
R tools/map/configs/mapinfo-Debug.xcconfig
R tools/map/configs/mapinfo-Release.xcconfig
R tools/map/configs/mapinfo-StaticAnalyzer.xcconfig
R tools/map/make.sh
R tools/map/make_win32.sh
R tools/map/map2lnd.cpp
R tools/map/map2png.cpp
R tools/map/map2preview.cpp
R tools/map/mapconv.cpp
R tools/map/mapinfo.cpp
R tools/map/maplib.cpp
R tools/map/maplib.h
R tools/map/mapload.cpp
R tools/map/mapload.h
A tools/map/old/.gitignore
A tools/map/old/CMakeLists.txt
A tools/map/old/Makefile.am
A tools/map/old/MapUtilities.xcodeproj/.gitignore
A tools/map/old/MapUtilities.xcodeproj/Do not hand edit these files under
any circumstances, always use xcode
A tools/map/old/MapUtilities.xcodeproj/project.pbxproj
A tools/map/old/MapUtilities.xcodeproj/xcshareddata/xcschemes/All
Tools.xcscheme
A
tools/map/old/MapUtilities.xcodeproj/xcshareddata/xcschemes/map2lnd.xcscheme
A
tools/map/old/MapUtilities.xcodeproj/xcshareddata/xcschemes/map2png.xcscheme
A
tools/map/old/MapUtilities.xcodeproj/xcshareddata/xcschemes/map2preview.xcscheme
A
tools/map/old/MapUtilities.xcodeproj/xcshareddata/xcschemes/mapconv.xcscheme
A
tools/map/old/MapUtilities.xcodeproj/xcshareddata/xcschemes/mapinfo.xcscheme
A
tools/map/old/MapUtilities.xcodeproj/xcuserdata/ivasilov.xcuserdatad/xcschemes/xcschememanagement.plist
A tools/map/old/configs/Base-Tools.xcconfig
A tools/map/old/configs/Project-All.xcconfig
A tools/map/old/configs/map2lnd-All.xcconfig
A tools/map/old/configs/map2lnd-Debug.xcconfig
A tools/map/old/configs/map2lnd-Release.xcconfig
A tools/map/old/configs/map2lnd-StaticAnalyzer.xcconfig
A tools/map/old/configs/map2png-All.xcconfig
A tools/map/old/configs/map2png-Debug.xcconfig
A tools/map/old/configs/map2png-Release.xcconfig
A tools/map/old/configs/map2png-StaticAnalyzer.xcconfig
A tools/map/old/configs/map2preview-All.xcconfig
A tools/map/old/configs/map2preview-Debug.xcconfig
A tools/map/old/configs/map2preview-Release.xcconfig
A tools/map/old/configs/map2preview-StaticAnalyzer.xcconfig
A tools/map/old/configs/mapconv-All.xcconfig
A tools/map/old/configs/mapconv-Debug.xcconfig
A tools/map/old/configs/mapconv-Release.xcconfig
A tools/map/old/configs/mapconv-StaticAnalyzer.xcconfig
A tools/map/old/configs/mapinfo-All.xcconfig
A tools/map/old/configs/mapinfo-Debug.xcconfig
A tools/map/old/configs/mapinfo-Release.xcconfig
A tools/map/old/configs/mapinfo-StaticAnalyzer.xcconfig
A tools/map/old/make.sh
A tools/map/old/make_win32.sh
A tools/map/old/map2lnd.cpp
A tools/map/old/map2png.cpp
A tools/map/old/map2preview.cpp
A tools/map/old/mapconv.cpp
A tools/map/old/mapinfo.cpp
A tools/map/old/maplib.cpp
A tools/map/old/maplib.h
A tools/map/old/mapload.cpp
A tools/map/old/mapload.h
A tools/map/old/pngsave.cpp
A tools/map/old/pngsave.h
A tools/map/old/vector.h
R tools/map/pngsave.cpp
R tools/map/pngsave.h
R tools/map/vector.h
Log Message:
-----------
Move old map tools
Commit: 440a1ccd52b8dcbe89d30b4724d71ff92bbcf6de
https://github.com/Warzone2100/warzone2100/commit/440a1ccd52b8dcbe89d30b4724d71ff92bbcf6de
Author: past-due <[email protected]>
Date: 2021-05-11 (Tue, 11 May 2021)
Changed paths:
M lib/maplib/map.cpp
Log Message:
-----------
maplib: jsonGetListOfType - verify value is an array
Commit: f68016fa44dfb4ad6025729575b36995d6900458
https://github.com/Warzone2100/warzone2100/commit/f68016fa44dfb4ad6025729575b36995d6900458
Author: past-due <[email protected]>
Date: 2021-05-11 (Tue, 11 May 2021)
Changed paths:
M lib/maplib/map.cpp
M lib/maplib/map_types.h
Log Message:
-----------
maplib: Support JSONv2 map format
- Object of map objects becomes an object with an array of map objects (and a
root "version" key):
```json
{
"version": 2,
"droids": [
{<droid>},
...
]
}
```
- Map object "position" value now only requires 2 components:
- [x, y, z (ignored)] -> [x, y]
- Map object "rotation" value may now be a single literal number:
- [direction, pitch (ignored), roll (ignored)] -> direction
Commit: 817226a0ea6316140b1719fb173d5a470755db5c
https://github.com/Warzone2100/warzone2100/commit/817226a0ea6316140b1719fb173d5a470755db5c
Author: past-due <[email protected]>
Date: 2021-05-11 (Tue, 11 May 2021)
Changed paths:
M lib/maplib/map.cpp
M lib/maplib/map.h
Log Message:
-----------
maplib: Retrieve the loaded map format
Commit: dbfe5b26388f9363c1deb1821036817e84ea50d7
https://github.com/Warzone2100/warzone2100/commit/dbfe5b26388f9363c1deb1821036817e84ea50d7
Author: past-due <[email protected]>
Date: 2021-05-11 (Tue, 11 May 2021)
Changed paths:
M CMakeLists.txt
A tools/map/CLI11.hpp
A tools/map/CMakeLists.txt
A tools/map/README.md
A tools/map/maptools.cpp
A tools/map/pngsave.cpp
A tools/map/pngsave.h
Log Message:
-----------
New "maptools" command-line tool that uses maplib
Commit: f643ec4bc28a66d4b88ff7b03b32d4bfe55e2bf3
https://github.com/Warzone2100/warzone2100/commit/f643ec4bc28a66d4b88ff7b03b32d4bfe55e2bf3
Author: past-due <[email protected]>
Date: 2021-05-11 (Tue, 11 May 2021)
Changed paths:
M lib/maplib/map.cpp
M lib/maplib/map.h
Log Message:
-----------
Fix minor typo
Compare:
https://github.com/Warzone2100/warzone2100/compare/18b04b8501a6...f643ec4bc28a
_______________________________________________
Warzone2100-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
