Commit Graph

5746 Commits

Author SHA1 Message Date
titiger e60cbb4dec Merge pull request #152 from andy5995/validate_tileset_opt
change "scenario" to "tileset"
2017-02-28 22:53:52 +01:00
andy5995 b158d0cbbb change "scenario" to "tileset"
Geany auto-removed some whitespace. The only code change
here is on L326.

The mention of "scenario" was already used for the
--validate-scenario option. It's duplicated under
the --validate-tileset option. This patch corrects that.
2017-02-25 00:59:37 -06:00
titiger 6fb95fff9e set version to 3.13-dev as ist for sure no longer compatible with 3.12.0 2017-02-22 01:09:30 +01:00
titiger da48cfe9ce fix for #148 2. 2017-02-20 01:02:51 +01:00
titiger 9acb64b1b3 fix for Micrsoft compiler 2017-02-20 00:39:09 +01:00
titiger 5135d0fba3 Merge pull request #151 from andy5995/divider_grammar
fix spelling of "Divider" that shows in map editor
2017-02-19 23:38:41 +01:00
titiger c6bf84cf1b Merge branch 'develop' of github.com:MegaGlest/megaglest-source into develop 2017-02-19 20:46:08 +01:00
titiger a6469fec4b Fix for Randomize Heights in Map Editor #147 2017-02-19 20:45:30 +01:00
filux 753fc6bc55 stick to 7 characters even for modern 'git' version 2017-02-18 13:13:00 +01:00
andy5995 56616e8ef3 I missed this file in the first PR 2017-02-15 13:53:18 -06:00
andy5995 9534943a9c fix spelling of "Divider" that shows in map editor
also changed the corresponding variable names
2017-02-15 13:47:53 -06:00
SoftCoder 4818612404 Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop 2017-02-12 16:36:18 -08:00
SoftCoder b1d6c73774 - attempt to fix Issue #150 2017-02-12 16:35:29 -08:00
filux bc74eebb22 updated dependencies for debian testing 2017-02-11 14:38:14 +01:00
SoftCoder b4a13ae903 Fixed registry issue discovered by Carl the Great related to file associations to g3d 2017-02-10 17:15:03 -08:00
SoftCoder edd9ae1fca Merge branch 'develop' of https://github.com/MegaGlest/megaglest-source into develop 2017-02-10 17:12:08 -08:00
SoftCoder 867b50d93f Fixed registry issue discovered by Carl the Great related to file associations to g3d 2017-02-10 17:11:48 -08:00
SoftCoder 25ba2b9eb1 Merge branch 'develop' of github-softcoder-megaglest:MegaGlest/megaglest-source into develop 2017-02-05 16:51:47 -08:00
SoftCoder 85b4e4eda7 - Implement solution for Issue #119 2017-02-05 16:51:15 -08:00
SoftCoder 8195121fca - Check for packaged streflop and use it before using embedded copy 2017-02-05 16:48:50 -08:00
titiger a5d5283731 different render order and no more teamcolor effect for dead units
fixes issue #145
2017-02-06 01:04:20 +01:00
SoftCoder b9a0a31127 - fixed Issue #146 2017-02-05 14:03:35 -08:00
Mark Vejvoda 15c3edae4f Merge pull request #141 from devnexen/openbsd_build
better openbsd support
2017-02-05 13:32:59 -08:00
SoftCoder 385d099a8b - added some network debug output when network debug enabled for NIC's examined on network hosting (for Issue #137) 2017-02-04 19:03:13 -08:00
SoftCoder 644c76e0c1 - attempt to fix issue #142 2017-02-04 18:43:58 -08:00
SoftCoder c9063fea56 - fixed issue #116 (all options menus auto register their controls for font change callbacks 2017-02-04 12:33:18 -08:00
titiger f3c436b67f force playing important sounds
see issue #144
2017-02-02 02:54:29 +01:00
titiger 9cc5a7566a revert some changes which were meant for debugging only 2017-02-01 23:58:00 +01:00
titiger d038a376ae fixing a bug with spawn attack 2017-02-01 23:44:28 +01:00
titiger ad4852ba44 relative paths 2017-02-01 23:44:03 +01:00
Tom Reynolds 2c2e213439 Compatibility with current cppcheck version
Multi-threading is now disabled since it cannot be used with the
"unusedFunction" check - which we had enabled so far (and probably want to
keep enabled). Add -j and change the checks in --enable to re-enable multi
threading.

Current cppcheck also depends on a 'library' configuration file. Its location,
and that of cppcheck itself, are now configurable in this script.

skipci
2017-01-31 00:03:48 +01:00
SoftCoder 48fb05b1a4 - more mac warnigns cleanup 2017-01-30 11:53:32 -08:00
SoftCoder 0873493377 - cleanup warnings on mac 2017-01-30 11:51:08 -08:00
SoftCoder c86d87c19f - fix picky C++ compiler issue 2017-01-30 11:33:00 -08:00
SoftCoder e261e5860e Merge branch 'develop' of https://github.com/MegaGlest/megaglest-source into develop 2017-01-30 11:21:06 -08:00
SoftCoder 6f350d6319 Fix issue #116 - when fonts deleted and reloaded signal back immediately to all registered controls to refresh their font 2017-01-30 11:20:01 -08:00
Tom Reynolds a3c930b2da Moderate changes to cppcheck script
skipci
2017-01-30 14:57:38 +01:00
Tom Reynolds 7a5351f8b5 Updating reference for masterserver submodule 2017-01-30 14:35:42 +01:00
filux b2aa5e1991 travis' configuration test 3 2017-01-21 10:44:47 +01:00
filux bfe2bc0d57 travis' configuration test 2 2017-01-21 02:56:07 +01:00
filux a2f21f3a28 reverted steam related structure to the previous state, travis' configuration test 2017-01-21 02:40:15 +01:00
filux e8e58b6988 removed cached file 2017-01-21 00:13:44 +01:00
filux 11a72820b0 let's test checking libs in parallel process 2017-01-21 00:06:57 +01:00
filux d2da186001 new script, helpful for 'steam' releases 2017-01-20 23:57:35 +01:00
SoftCoder ffc725b1cb - added win x64 for steam 2017-01-20 09:36:53 -08:00
SoftCoder 3170e0af31 Added windows steam config files 2017-01-19 23:21:56 -08:00
SoftCoder 660a0f85a6 - add lib folder for linux steam build 2017-01-19 22:57:50 -08:00
SoftCoder 76dd1b7f0d - added new lib and bin folder for linux steam build 2017-01-19 22:56:23 -08:00
SoftCoder 77b7718867 - adding fodlers 2017-01-19 17:50:37 -08:00
SoftCoder ad131cbba1 - initially adding steamworks sdk config files for linux builds 2017-01-19 17:38:45 -08:00