Commit Graph

6487 Commits

Author SHA1 Message Date
MathuSum Mut
dddf69bc3d Merge pull request #286 from BennettDixon/develop
Added documentation for AiRuleRepair::getMinUnitsToRepairCastle() and AiRuleAddTasks::execute()
2018-10-17 07:05:35 +02:00
BennettDixon
845f1e7011 Added documentation for a couple functions 2018-10-17 02:08:56 +00:00
MathuSum Mut
91c49bec25 Merge pull request #285 from ZetaGlest/remove_coverity
README.md:remove coverity badge
2018-10-15 10:11:18 +02:00
andy5995
03b023477c README.md:remove coverity badge
Coverity's broken, unable to access "defects" page or dashboard, support
non-responsive, documentation out of date, doesn't provide an option to
remove project

https://stackoverflow.com/questions/34520441/how-to-remove-a-project-from-coverity-scan

[skip ci]
2018-10-15 02:52:29 -05:00
mathusummut
ebcdcbb033 Removed xerces-c from Windows build 2018-10-14 12:08:36 +02:00
mathusummut
357939ec0e Removed xerces-c from Windows build 2018-10-14 12:07:33 +02:00
Andy Alt
d3f7fe78ef have cmake find OpenSSL (#284)
* set openssl root dir

apparently a common problem
https://github.com/alexcrichton/ssh2-rs/issues/28

https://stackoverflow.com/questions/29792009/cmake-osx-mac-openssl-brew

related to #263
2018-10-14 00:18:48 -05:00
MathuSum Mut
c52279233e Merge pull request #283 from jasperdanan/icons-fix
Icons fix: New icons for ZetaGlest (issue #250)
2018-10-13 21:42:41 +02:00
Jasper Danan
472b945e34 Added self to AUTHORS.md 2018-10-13 13:14:08 +10:00
Jasper Danan
8381f4e1e9 New icons for ZetaGlest (Issue #250)
Signed-off-by: Jasper Danan <jasper.jfkhs@gmail.com>
2018-10-13 12:57:12 +10:00
MathuSum Mut
93e498e0b6 Merge pull request #282 from ZetaGlest/revert-280-move_miniz
Revert "remove miniz and zlib from libzetaglest"
2018-10-10 13:22:33 +02:00
MathuSum Mut
720870ce53 Revert "remove miniz and zlib from libzetaglest" 2018-10-10 13:22:08 +02:00
MathuSum Mut
12109249ca Merge pull request #280 from andy5995/move_miniz
remove miniz and zlib from libzetaglest
2018-10-10 13:16:54 +02:00
andy5995
769d4dab10 remove miniz and zlib from libzetaglest 2018-10-08 12:43:05 -05:00
mathusummut
90c0a36152 Moved on Windows as well 2018-10-08 12:03:56 +02:00
MathuSum Mut
86e16cd8cb Merge pull request #279 from ZetaGlest/move_libircclient
move libircclient out of libzetaglest
2018-10-08 11:57:30 +02:00
andy5995
44515f5aa0 move ircclient.h 2018-10-07 23:53:08 -05:00
andy5995
bda3154a69 remove libircclient from shared library
* removes libircclient from libzetaglest shared library because the
editor and g3d_viewer also link against libzetaglest. Those 2 binaries
don't need libircclient support

* libircclient is now built directly into only the zetaglest binary

* moved libircclient from source/shared_lib because it's no longer part
of the shared library

* libircclient put in dir "external/" because it is an "external" or
"3rd" party library. The @Supertux project does something similar
2018-10-07 23:50:59 -05:00
Andy Alt
57c6cc1cdd .travis.yml:have one test (gcc 6) use only embedded libs (#278)
* .travis:add test for option FORCE_EMBEDDED_LIBS

the gcc version 6 build will use embedded libs
2018-10-07 23:46:12 -05:00
MathuSum Mut
8dc3ead522 Merge pull request #277 from ZetaGlest/rename_library
rename output library (drop "liblib")
2018-10-07 14:45:13 +02:00
mathusummut
e3a3092ab8 Test remove version dependency in CMakeLists 2018-10-07 14:22:43 +02:00
andy5995
ff26f9f3bf remove whitespace 2018-10-06 23:48:38 -05:00
andy5995
d1f86e52a7 rename output library (drop "liblib")
closes #266

Best to wait until the build is fixed to merge this.
2018-10-06 23:40:18 -05:00
mathusummut
47809c5f9c Test regex fix for CMakeLists.txt 2018-10-07 01:00:23 +02:00
mathusummut
391546536c Merged versioning 2018-10-07 00:30:32 +02:00
mathusummut
d54e226fcb Removed unused private field 2018-10-06 23:53:01 +02:00
mathusummut
530417c797 Fixed G3DViewerVersionString printf string bug 2018-10-06 23:44:59 +02:00
mathusummut
7530f5dbf8 Fixed GameVersionString printf string bug 2018-10-06 23:30:44 +02:00
mathusummut
035da70093 Test fix for gcc to find versions.h 2018-10-06 23:17:56 +02:00
mathusummut
3620094a76 Test fix for gcc to find versions.h 2018-10-06 23:13:05 +02:00
mathusummut
2de5026e82 Test fix for gcc to find versions.h 2018-10-06 23:06:25 +02:00
mathusummut
f8a51d3f01 Moved shared_definitions.h 2018-10-06 22:32:29 +02:00
mathusummut
da9b378bde Removed unneccessary newline 2018-10-06 17:51:49 +02:00
mathusummut
e12f168a01 Added const strings for versions 2018-10-06 17:20:22 +02:00
mathusummut
481fbbe534 Merge branch 'develop' of https://github.com/ZetaGlest/zetaglest-source into develop 2018-10-05 23:25:24 +02:00
mathusummut
d9a37ed6e7 Removed unused library version number 2018-10-05 23:22:54 +02:00
MathuSum Mut
e18f93e496 Merge pull request #273 from ZetaGlest/add_Wall
cmake sharedlib:add -Wall flag
2018-10-05 22:16:18 +02:00
mathusummut
643809b178 Merge branch 'develop' of https://github.com/ZetaGlest/zetaglest-source into develop 2018-10-05 22:12:58 +02:00
mathusummut
ee16663f4b Placed constants in versions.h 2018-10-05 22:12:39 +02:00
andy5995
47daca66d3 packaging NOTES:update
[skip ci]
2018-10-05 13:08:48 -05:00
andy5995
4fe94a9d71 NOTES:add info about stripping
[skip ci]
2018-10-05 00:11:04 -05:00
andy5995
a5127acd1e NOTES:add install notes
cc: @linux-player9

[skip ci]
2018-10-04 23:40:25 -05:00
andy5995
6818b21625 cmake: touch up 2018-10-04 23:34:57 -05:00
Andy Alt
1f72cc791b Merge pull request #269 from Pranav1999/issue_265
Removed unneeded refrences to libxml

closes #265 

Thank you @Pranav1999
2018-10-04 16:13:40 -05:00
andy5995
3f896ce2ed Revert "consistency with version strings"
This reverts commit 87b0ed0095.

Needs review by Mathu so the Windows build doesn't break.
2018-10-04 16:10:33 -05:00
andy5995
87b0ed0095 consistency with version strings
Mathu, are you able to read in the version string from
source/version.txt for the Windows build?
2018-10-04 16:04:17 -05:00
andy5995
e936e95abc cmake:narrow scope of DATADIR
This will be moved to the data repo cmake
2018-10-04 14:15:04 -05:00
Pranav1999
d44e6acb96 Removed unneeded refrences to libxml 2018-10-05 00:19:27 +05:30
andy5995
c67286636f map editor and g3d viewer default to on 2018-10-04 12:56:36 -05:00
mathusummut
171415cc11 Fixed libstreflop warnings 2018-10-04 17:58:42 +02:00