[Warzone2100-commits] [Warzone2100/warzone2100] deefbb: Update changelog for 3.1.3 release

2015-12-31 Thread automerge
2016-01-01 (Fri, 01 Jan 2016) Changed paths: M ChangeLog Log Message: --- Update changelog for 3.1.3 release Commit: e2cdc407a46c4cbfa2eb61184f974116b5d0174e https://github.com/Warzone2100/warzone2100/commit/e2cdc407a46c4cbfa2eb61184f974116b5d0174e Author: autome

[Warzone2100-commits] [Warzone2100/warzone2100] deefbb: Update changelog for 3.1.3 release

2015-12-31 Thread automerge
016-01-01 (Fri, 01 Jan 2016) Changed paths: M ChangeLog Log Message: --- Update changelog for 3.1.3 release Commit: 61746d98d284dc14cf6f3e1dfb0f55e9f51c9eda https://github.com/Warzone2100/warzone2100/commit/61746d98d284dc14cf6f3e1dfb0f55e9f51c9eda Author: autome

[Warzone2100-commits] [Warzone2100/warzone2100] cdadf8: Fix some uses of undefined values and integer over...

2014-10-13 Thread automerge
://github.com/Warzone2100/warzone2100/commit/f97fdd852030c93e8869afe5fef500640110f076 Author: automerge c...@wz2100.net Date: 2014-10-13 (Mon, 13 Oct 2014) Changed paths: M ChangeLog M src/basedef.h M src/component.cpp M src/droid.cpp M src/geometry.cpp Log Message

[Warzone2100-commits] [Warzone2100/warzone2100] cdadf8: Fix some uses of undefined values and integer over...

2014-10-13 Thread automerge
://github.com/Warzone2100/warzone2100/commit/7364a77ef2120cf711b6458a80f5d3bb6661a5b6 Author: automerge c...@wz2100.net Date: 2014-10-13 (Mon, 13 Oct 2014) Changed paths: M ChangeLog M src/basedef.h M src/component.cpp M src/droid.cpp M src/geometry.cpp Log Message

[Warzone2100-commits] [Warzone2100/warzone2100] 9236ba: No longer need to enforce a 255 max limit on numbe...

2014-09-29 Thread automerge
Author: automerge c...@wz2100.net Date: 2014-09-29 (Mon, 29 Sep 2014) Changed paths: M src/multilimit.cpp Log Message: --- Merge branch 'bugfixes' Compare: https://github.com/Warzone2100/warzone2100/compare/50aedc06f449...30b0ba246f22

[Warzone2100-commits] [Warzone2100/warzone2100] 9236ba: No longer need to enforce a 255 max limit on numbe...

2014-09-29 Thread automerge
Author: automerge c...@wz2100.net Date: 2014-09-29 (Mon, 29 Sep 2014) Changed paths: M src/multilimit.cpp Log Message: --- Merge branch 'bugfixes' into 3.1 Compare: https://github.com/Warzone2100/warzone2100/compare/b7ee6376c4b7...ec43ce88be68

[Warzone2100-commits] [Warzone2100/warzone2100] 9827d7: Fix throttling of danger function. It was only sup...

2014-09-26 Thread automerge
by Kreuvf. Closes ticket:4205. Commit: 50aedc06f4497abbaf22048c619f09ae00261986 https://github.com/Warzone2100/warzone2100/commit/50aedc06f4497abbaf22048c619f09ae00261986 Author: automerge c...@wz2100.net Date: 2014-09-26 (Fri, 26 Sep 2014) Changed paths: M src/map.cpp M src

[Warzone2100-commits] [Warzone2100/warzone2100] 9827d7: Fix throttling of danger function. It was only sup...

2014-09-26 Thread automerge
by Kreuvf. Closes ticket:4205. Commit: c356b596087cc52bdcf6e485be04965eb0d3b964 https://github.com/Warzone2100/warzone2100/commit/c356b596087cc52bdcf6e485be04965eb0d3b964 Author: automerge c...@wz2100.net Date: 2014-09-26 (Fri, 26 Sep 2014) Changed paths: M src/map.cpp M src

[Warzone2100-commits] [Warzone2100/warzone2100] 19c16e: Place newly produced droids correctly when buildin...

2014-02-09 Thread automerge
Author: automerge c...@wz2100.net Date: 2014-02-09 (Sun, 09 Feb 2014) Changed paths: M src/structure.cpp Log Message: --- Merge branch 'bugfixes' Compare: https://github.com/Warzone2100/warzone2100/compare/add2e1177c0b...df1b02a32adf

[Warzone2100-commits] [Warzone2100/warzone2100] 19c16e: Place newly produced droids correctly when buildin...

2014-02-09 Thread automerge
Author: automerge c...@wz2100.net Date: 2014-02-09 (Sun, 09 Feb 2014) Changed paths: M src/structure.cpp Log Message: --- Merge branch 'bugfixes' into 3.1 Compare: https://github.com/Warzone2100/warzone2100/compare/ea1b7daa398e...b2e3b0e069ec

[Warzone2100-commits] [Warzone2100/warzone2100] 90f9ef: Updated textures and models by Christian Scholz (c...

2014-01-30 Thread automerge
/80d43e08e6bad1152a8574e28438d74986888fd3 Author: automerge c...@wz2100.net Date: 2014-01-30 (Thu, 30 Jan 2014) Changed paths: M data/base/structs/blhq.pie M data/base/structs/blvtolpd.pie M data/base/texpages/page-11-player-buildings.png M data/base/texpages/page-12-player-buildings.png M data/base

[Warzone2100-commits] [Warzone2100/warzone2100] 90f9ef: Updated textures and models by Christian Scholz (c...

2014-01-30 Thread automerge
/ea1b7daa398e09cac040cf4ef781d43ac2c7c640 Author: automerge c...@wz2100.net Date: 2014-01-30 (Thu, 30 Jan 2014) Changed paths: M data/base/structs/blhq.pie M data/base/structs/blvtolpd.pie M data/base/texpages/page-11-player-buildings.png M data/base/texpages/page-12-player-buildings.png M data/base

[Warzone2100-commits] [Warzone2100/warzone2100] 016b71: Fix path concatenation bug in CheckInMap, don't fo...

2014-01-19 Thread automerge
/55bf05d0852345dffa42a0713d94a03f87fcad75 Author: automerge c...@wz2100.net Date: 2014-01-19 (Sun, 19 Jan 2014) Changed paths: M src/init.cpp Log Message: --- Merge branch 'newbugfixes' Compare: https://github.com/Warzone2100/warzone2100/compare/46e8b9768059...55bf05d08523

[Warzone2100-commits] [Warzone2100/warzone2100] 016b71: Fix path concatenation bug in CheckInMap, don't fo...

2014-01-19 Thread automerge
/af2a6b30f2b228d32201d6d63fa228662a4f7d2a Author: automerge c...@wz2100.net Date: 2014-01-19 (Sun, 19 Jan 2014) Changed paths: M src/init.cpp Log Message: --- Merge branch 'newbugfixes' into 3.1 Compare: https://github.com/Warzone2100/warzone2100/compare/643bab9c6f9c...af2a6b30f2b2

[Warzone2100-commits] [Warzone2100/warzone2100] 7e8660: Hungarian translation update by mtomi78.

2013-12-01 Thread automerge
: --- Updated textures by Christian Scholz (cnceo) Commit: b513f163aa0dbc0bb3cdf99b10a6695f7617a934 https://github.com/Warzone2100/warzone2100/commit/b513f163aa0dbc0bb3cdf99b10a6695f7617a934 Author: automerge c...@wz2100.net Date: 2013-12-01 (Sun, 01 Dec 2013) Changed

[Warzone2100-commits] [Warzone2100/warzone2100] 7e8660: Hungarian translation update by mtomi78.

2013-12-01 Thread automerge
: --- Updated textures by Christian Scholz (cnceo) Commit: f3b4d7050ee018343ac0feb3023ae703a3e0c491 https://github.com/Warzone2100/warzone2100/commit/f3b4d7050ee018343ac0feb3023ae703a3e0c491 Author: automerge c...@wz2100.net Date: 2013-12-01 (Sun, 01 Dec 2013) Changed

[Warzone2100-commits] [Warzone2100/warzone2100] d4dda2: Update Readme by removing out of date information ...

2013-11-17 Thread automerge
https://github.com/Warzone2100/warzone2100/commit/05f9f3e42a0c6be763cc98c24c4ec6e5327edae7 Author: automerge c...@wz2100.net Date: 2013-11-17 (Sun, 17 Nov 2013) Changed paths: M doc/Readme.en M lib/framework/trig.cpp M lib/netplay/netplay.cpp M lib/qtgame/wzapp_qt.cpp

[Warzone2100-commits] [Warzone2100/warzone2100] dd9a75: French translation update by machintruc/cpasmoi.

2013-11-07 Thread automerge
://github.com/Warzone2100/warzone2100/commit/8b058539e70d5ce47a2c6b21b3e0acd187ab8b2b Author: automerge c...@wz2100.net Date: 2013-11-07 (Thu, 07 Nov 2013) Changed paths: M icons/warzone2100.desktop M po/POTFILES.in M po/ca_ES.po M po/cs.po M po/custom/mac-infoplist.txt M

[Warzone2100-commits] [Warzone2100/warzone2100] dd9a75: French translation update by machintruc/cpasmoi.

2013-11-07 Thread automerge
://github.com/Warzone2100/warzone2100/commit/4be4b01140efd9367a6ad7726b8e1447e909d602 Author: automerge c...@wz2100.net Date: 2013-11-07 (Thu, 07 Nov 2013) Changed paths: M icons/warzone2100.desktop M po/POTFILES.in M po/ca_ES.po M po/cs.po M po/custom/mac-infoplist.txt M po

[Warzone2100-commits] [Warzone2100/warzone2100] 992113: Fix the mac build for 8f4adda2.

2013-10-28 Thread automerge
/8789fc1e954399617e68fcc4b1cc7493bfdbf79a Author: automerge c...@wz2100.net Date: 2013-10-28 (Mon, 28 Oct 2013) Changed paths: M macosx/Warzone.xcodeproj/project.pbxproj Log Message: --- Merge branch 'bugfixes' into 3.1 Compare: https://github.com/Warzone2100/warzone2100/compare/cc08a48058ba

[Warzone2100-commits] [Warzone2100/warzone2100] b8bdf4: Add new maps: Gamma (3p) and Melting (6p)

2013-10-25 Thread automerge
/maps/6c-Melting/ttypes.ttp Log Message: --- Add new maps: Gamma (3p) and Melting (6p) Commit: ff28f2123560dd3bbd276eaa969b0e237197157f https://github.com/Warzone2100/warzone2100/commit/ff28f2123560dd3bbd276eaa969b0e237197157f Author: automerge c...@wz2100.net Date: 2013

[Warzone2100-commits] [Warzone2100/warzone2100] 8c5d8d: Only check for OpenGL errors in debug builds.

2013-10-21 Thread automerge
/0428d5d14a562ac8f668aa98b2f051341cff7a10 Author: automerge c...@wz2100.net Date: 2013-10-20 (Sun, 20 Oct 2013) Changed paths: M lib/ivis_opengl/piestate.h Log Message: --- Merge branch 'bugfixes' Compare: https://github.com/Warzone2100/warzone2100/compare/60006e06ef0c...0428d5d14a56

[Warzone2100-commits] [Warzone2100/warzone2100] 8c5d8d: Only check for OpenGL errors in debug builds.

2013-10-21 Thread automerge
/08690bd2098b6d49c3fcea5a85515dfc03fb5d99 Author: automerge c...@wz2100.net Date: 2013-10-20 (Sun, 20 Oct 2013) Changed paths: M lib/ivis_opengl/piestate.h Log Message: --- Merge branch 'bugfixes' into 3.1 Compare: https://github.com/Warzone2100/warzone2100/compare/7f183c376962

[Warzone2100-commits] [Warzone2100/warzone2100] 5986ef: Turkish translation update by Ayhan Görgülü.

2013-10-07 Thread automerge
: 0c75c0a0bbeed31a0228f9831496f0810d4e9dda https://github.com/Warzone2100/warzone2100/commit/0c75c0a0bbeed31a0228f9831496f0810d4e9dda Author: automerge c...@wz2100.net Date: 2013-10-06 (Sun, 06 Oct 2013) Changed paths: M .gitignore M po/pt_BR.po M po/tr.po M src/lighting.cpp Log Message

[Warzone2100-commits] [Warzone2100/warzone2100] 5986ef: Turkish translation update by Ayhan Görgülü.

2013-10-07 Thread automerge
: 7f183c3769627293fb6bfd696bb4a9672e9306ee https://github.com/Warzone2100/warzone2100/commit/7f183c3769627293fb6bfd696bb4a9672e9306ee Author: automerge c...@wz2100.net Date: 2013-10-06 (Sun, 06 Oct 2013) Changed paths: M .gitignore M po/pt_BR.po M po/tr.po M src/lighting.cpp Log Message

[Warzone2100-commits] [Warzone2100/warzone2100] dd85da: French translation update by cpasmoi/machintruc.

2013-09-27 Thread automerge
. Commit: feb2ae5af8b280b863eef61fe25fd001897fe2d3 https://github.com/Warzone2100/warzone2100/commit/feb2ae5af8b280b863eef61fe25fd001897fe2d3 Author: automerge c...@wz2100.net Date: 2013-09-26 (Thu, 26 Sep 2013) Changed paths: M po/fr.po M po/hu.po M po/it.po M po

[Warzone2100-commits] [Warzone2100/warzone2100] dd85da: French translation update by cpasmoi/machintruc.

2013-09-27 Thread automerge
. Commit: 2841ea1ab545b353ea305e03f939d8de20fbb165 https://github.com/Warzone2100/warzone2100/commit/2841ea1ab545b353ea305e03f939d8de20fbb165 Author: automerge c...@wz2100.net Date: 2013-09-26 (Thu, 26 Sep 2013) Changed paths: M po/fr.po M po/hu.po M po/it.po M po

[Warzone2100-commits] [Warzone2100/warzone2100] ca3ea2: qtscript: fix description of getStructureLimit()

2013-09-26 Thread automerge
: automerge c...@wz2100.net Date: 2013-09-26 (Thu, 26 Sep 2013) Changed paths: M src/qtscriptfuncs.cpp Log Message: --- Merge branch 'bugfixes' into 3.1 Compare: https://github.com/Warzone2100/warzone2100/compare/989b3e7fb59e...f77ea0ccdb18

[Warzone2100-commits] [Warzone2100/warzone2100] ca3ea2: qtscript: fix description of getStructureLimit()

2013-09-26 Thread automerge
: automerge c...@wz2100.net Date: 2013-09-26 (Thu, 26 Sep 2013) Changed paths: M src/qtscriptfuncs.cpp Log Message: --- Merge branch 'bugfixes' Compare: https://github.com/Warzone2100/warzone2100/compare/4f16a617d5bd...7ca11b808f12

[Warzone2100-commits] [Warzone2100/warzone2100] 6092fe: Remove lop-sided oil barrels from 4c-pyramidal.

2013-03-18 Thread automerge
/63498bad50d918a4c892dd5959332a2dd2a0e107 Author: automerge c...@wz2100.net Date: 2013-03-18 (Mon, 18 Mar 2013) Changed paths: M data/mp/multiplay/maps/4c-pyramidal/feature.ini Log Message: --- Merge branch 'bugfixes' into 3.1 Compare: https://github.com/Warzone2100/warzone2100/compare/1eee3b003f39

[Warzone2100-commits] [Warzone2100/warzone2100] 2faeb8: Make sure that template designs contain only desig...

2013-03-03 Thread automerge
/6e25b8965342ed3902fe9e5ff64cf57bbcc78316 Author: automerge c...@wz2100.net Date: 2013-03-03 (Sun, 03 Mar 2013) Changed paths: M src/template.cpp Log Message: --- Merge branch 'bugfixes' Compare: https://github.com/Warzone2100/warzone2100/compare/a5e137adceac...6e25b8965342

[Warzone2100-commits] [Warzone2100/warzone2100] 2faeb8: Make sure that template designs contain only desig...

2013-03-03 Thread automerge
/9e0da18c360fd453d37f1622cfbd8379237489d2 Author: automerge c...@wz2100.net Date: 2013-03-03 (Sun, 03 Mar 2013) Changed paths: M src/template.cpp Log Message: --- Merge branch 'bugfixes' into 3.1 Compare: https://github.com/Warzone2100/warzone2100/compare/6f7196b847d3...9e0da18c360f

[Warzone2100-commits] [Warzone2100/warzone2100] 9aad6b: Hungarian translation update by mtomi78.

2013-02-24 Thread automerge
: --- Update translations. Commit: 6bb8745c70d61e4741010454800c7b5f2bcace8a https://github.com/Warzone2100/warzone2100/commit/6bb8745c70d61e4741010454800c7b5f2bcace8a Author: automerge c...@wz2100.net Date: 2013-02-24 (Sun, 24 Feb 2013) Changed paths: M po/ca_ES.po M

[Warzone2100-commits] [Warzone2100/warzone2100] 121588: Don't keep trying to query server if we get a erro...

2013-02-17 Thread automerge
/05af47c4bc7592d3862f17fa5431c8774adb50aa Author: automerge c...@wz2100.net Date: 2013-02-17 (Sun, 17 Feb 2013) Changed paths: M lib/netplay/netplay.cpp M lib/netplay/netplay.h M src/multiint.cpp M src/multiint.h Log Message: --- Merge branch 'bugfixes' into 3.1 Compare: https

[Warzone2100-commits] [Warzone2100/warzone2100] 5c7788: Change gridStartIterate interface to safely allow ...

2013-02-10 Thread automerge
Author: automerge c...@wz2100.net Date: 2013-02-10 (Sun, 10 Feb 2013) Changed paths: M src/action.cpp M src/ai.cpp M src/combat.cpp M src/mapgrid.cpp M src/mapgrid.h M src/move.cpp M src/projectile.cpp M src/qtscriptfuncs.cpp M src/scriptfuncs.cpp M src

[Warzone2100-commits] [Warzone2100/warzone2100] 259e07: Allocate joining players in topmost available slot...

2013-02-07 Thread automerge
be compiled as C++ already is. Commit: 17226ad172d9d636a843db4fc33c53e0de26f667 https://github.com/Warzone2100/warzone2100/commit/17226ad172d9d636a843db4fc33c53e0de26f667 Author: automerge c...@wz2100.net Date: 2013-02-07 (Thu, 07 Feb 2013) Changed paths: R fixcppbuild M

[Warzone2100-commits] [Warzone2100/warzone2100] 259e07: Allocate joining players in topmost available slot...

2013-02-07 Thread automerge
be compiled as C++ already is. Commit: 3a4d1b26c280bf3bb969a5f490df818d2df6e2e2 https://github.com/Warzone2100/warzone2100/commit/3a4d1b26c280bf3bb969a5f490df818d2df6e2e2 Author: automerge c...@wz2100.net Date: 2013-02-07 (Thu, 07 Feb 2013) Changed paths: R fixcppbuild M

[Warzone2100-commits] [Warzone2100/warzone2100] 4ec641: Get rid of an unnecessary addition from f910611e.

2013-02-03 Thread automerge
/986a8036810f0eeb21140e5d58e94b4f7ea970f1 Author: automerge c...@wz2100.net Date: 2013-02-03 (Sun, 03 Feb 2013) Changed paths: M macosx/configs/fetchscripts/SetupPrebuiltComponents-Docs.sh Log Message: --- Merge branch 'bugfixes' Compare: https://github.com/Warzone2100

[Warzone2100-commits] [Warzone2100/warzone2100] 8149dc: Fix bug that made droids produced by scripts get h...

2013-01-24 Thread automerge
/Warzone2100/warzone2100/commit/2dd788c38c2e0a23e4b724f63d5fe2678dca2350 Author: automerge c...@wz2100.net Date: 2013-01-24 (Thu, 24 Jan 2013) Changed paths: M build_tools/autorevision M configure.ac M macosx/configs/fetchscripts/Png-FetchSource.sh M src/design.cpp M src/design.h

[Warzone2100-commits] [Warzone2100/warzone2100] 5afffc: Remove old autogenerated notice, add notice that t...

2013-01-20 Thread automerge
https://github.com/Warzone2100/warzone2100/commit/f9ad00be241e7cb0ae7dbe5cc2e68c55135cac82 Author: automerge c...@wz2100.net Date: 2013-01-20 (Sun, 20 Jan 2013) Changed paths: M src/display3d.cpp M src/frend.h M src/intfac.h M tools/image/image.cpp Log Message

[Warzone2100-commits] [Warzone2100/warzone2100] 5afffc: Remove old autogenerated notice, add notice that t...

2013-01-20 Thread automerge
https://github.com/Warzone2100/warzone2100/commit/f91cdbc1d9f1259c2f251bfa6c8a5cf563879083 Author: automerge c...@wz2100.net Date: 2013-01-20 (Sun, 20 Jan 2013) Changed paths: M src/display3d.cpp M src/frend.h M src/intfac.h M tools/image/image.cpp Log Message

[Warzone2100-commits] [Warzone2100/warzone2100] 71500c: Fix Super Cyborg transports sizes in intel displ...

2013-01-17 Thread automerge
tests/qtscripttest.cpp Log Message: --- Squelch warnings. Fixes ticket:3880 and ticket:3882. Commit: 170f3a9931ddce9724987663ba37b8a2a11d1d51 https://github.com/Warzone2100/warzone2100/commit/170f3a9931ddce9724987663ba37b8a2a11d1d51 Author: automerge c...@wz2100.net

[Warzone2100-commits] [Warzone2100/warzone2100] 71500c: Fix Super Cyborg transports sizes in intel displ...

2013-01-17 Thread automerge
tests/qtscripttest.cpp Log Message: --- Squelch warnings. Fixes ticket:3880 and ticket:3882. Commit: 3514a44e8953037fdbb20bd7c7b8b32c3f920673 https://github.com/Warzone2100/warzone2100/commit/3514a44e8953037fdbb20bd7c7b8b32c3f920673 Author: automerge c...@wz2100.net Date

[Warzone2100-commits] [Warzone2100/warzone2100] cb2b66: Remove shadow parts from a few models.

2013-01-13 Thread automerge
: ccc2a07bd3b7c91a1ea398c17b092ed45b07d988 https://github.com/Warzone2100/warzone2100/commit/ccc2a07bd3b7c91a1ea398c17b092ed45b07d988 Author: automerge c...@wz2100.net Date: 2013-01-13 (Sun, 13 Jan 2013) Changed paths: M data/base/features/blbrhut1.pie M data/base/features/blfactrd.pie M data/base/features

[Warzone2100-commits] [Warzone2100/warzone2100] cb2b66: Remove shadow parts from a few models.

2013-01-13 Thread automerge
: 9ce5be67962c18bd64273ba73c43c9c593f2c133 https://github.com/Warzone2100/warzone2100/commit/9ce5be67962c18bd64273ba73c43c9c593f2c133 Author: automerge c...@wz2100.net Date: 2013-01-13 (Sun, 13 Jan 2013) Changed paths: M data/base/features/blbrhut1.pie M data/base/features/blfactrd.pie M data/base/features

[Warzone2100-commits] [Warzone2100/warzone2100] 40cbe8: cleanup: Remove some unused defines.

2013-01-10 Thread automerge
/d24719344d05d178e542f6746acc8b010f679f12 Author: automerge c...@wz2100.net Date: 2013-01-10 (Thu, 10 Jan 2013) Changed paths: M lib/framework/frameresource.cpp M lib/framework/frameresource.h M lib/framework/macros.h M lib/gamelib/anim.h M lib/gamelib/animobj.cpp M lib/gamelib/gtime.cpp M lib

[Warzone2100-commits] [Warzone2100/warzone2100] 40cbe8: cleanup: Remove some unused defines.

2013-01-10 Thread automerge
/63f8e6e0c76b41ce4014e5c3b686d90a0d9a36cc Author: automerge c...@wz2100.net Date: 2013-01-10 (Thu, 10 Jan 2013) Changed paths: M lib/framework/frameresource.cpp M lib/framework/frameresource.h M lib/framework/macros.h M lib/gamelib/anim.h M lib/gamelib/animobj.cpp M lib/gamelib/gtime.cpp M lib

[Warzone2100-commits] [Warzone2100/warzone2100] bf5834: Do not update autorevision.h's time stamp if the c...

2013-01-03 Thread automerge
://github.com/Warzone2100/warzone2100/commit/4fbbeb5a1004041fa42aa5f0ffb55e4ddcc9fb6d Author: automerge c...@wz2100.net Date: 2013-01-03 (Thu, 03 Jan 2013) Changed paths: M macosx/configs/autorevision.sh Log Message: --- Merge branch 'bugfixes' Compare: https://github.com

[Warzone2100-commits] [Warzone2100/warzone2100] bf5834: Do not update autorevision.h's time stamp if the c...

2013-01-03 Thread automerge
://github.com/Warzone2100/warzone2100/commit/e122f8bc555678a66b63389bec26676ff4392f48 Author: automerge c...@wz2100.net Date: 2013-01-03 (Thu, 03 Jan 2013) Changed paths: M macosx/configs/autorevision.sh Log Message: --- Merge branch 'bugfixes' into 3.1 Compare: https

[Warzone2100-commits] [Warzone2100/warzone2100] 840321: Clean up a few scripts.

2012-12-23 Thread automerge
://github.com/Warzone2100/warzone2100/commit/340bb5248c662ddec14c132c0aeecc4834741779 Author: automerge c...@wz2100.net Date: 2012-12-23 (Sun, 23 Dec 2012) Changed paths: M .gitignore M data/base/images/intfac/image_ord_repair1down.png M data/base/images/intfac/image_ord_repair1up.png

[Warzone2100-commits] [Warzone2100/warzone2100] b2c7d4: Also check if vertex array is supported on restori...

2012-12-20 Thread automerge
: c7c23e5a27880bed56abebdb809b0c1d0c9bb2e3 https://github.com/Warzone2100/warzone2100/commit/c7c23e5a27880bed56abebdb809b0c1d0c9bb2e3 Author: automerge c...@wz2100.net Date: 2012-12-20 (Thu, 20 Dec 2012) Changed paths: M 3rdparty/quesoglc/misc.c Log Message: --- Merge branch 'bugfixes' into 3.1 Compare

[Warzone2100-commits] [Warzone2100/warzone2100] acdc3a: Update the mac doc bundle.

2012-12-09 Thread automerge
/41eac5ecbf22e65f3bef2a22517d371a4d2d2907 Author: automerge c...@wz2100.net Date: 2012-12-09 (Sun, 09 Dec 2012) Changed paths: M macosx/configs/fetchscripts/SetupPrebuiltComponents-Docs.sh Log Message: --- Merge branch 'bugfixes' into 3.1 Compare: https://github.com/Warzone2100/warzone2100/compare

[Warzone2100-commits] [Warzone2100/warzone2100] 978ed8: Abort autogen.sh when automake 1.12+ is found.

2012-12-06 Thread automerge
://github.com/Warzone2100/warzone2100/commit/b5588d8eb37b52d4159644cc63c06be3875ff468 Author: automerge c...@wz2100.net Date: 2012-12-06 (Thu, 06 Dec 2012) Changed paths: M autogen.sh M po/de.po M po/hu.po Log Message: --- Merge branch 'bugfixes' Compare: https

[Warzone2100-commits] [Warzone2100/warzone2100] 978ed8: Abort autogen.sh when automake 1.12+ is found.

2012-12-06 Thread automerge
://github.com/Warzone2100/warzone2100/commit/1ee70ff4e323141df132e81f5bc39b2cb7e5ba18 Author: automerge c...@wz2100.net Date: 2012-12-06 (Thu, 06 Dec 2012) Changed paths: M autogen.sh M po/de.po M po/hu.po Log Message: --- Merge branch 'bugfixes' into 3.1 Compare

[Warzone2100-commits] [Warzone2100/warzone2100] ffda8b: Brazilian translation update by Tucalipe.

2012-11-18 Thread automerge
: automerge c...@wz2100.net Date: 2012-11-18 (Sun, 18 Nov 2012) Changed paths: M po/pt_BR.po Log Message: --- Merge branch 'bugfixes' Compare: https://github.com/Warzone2100/warzone2100/compare/b017fd546c6c...9bddcfd4b2fc

[Warzone2100-commits] [Warzone2100/warzone2100] ffda8b: Brazilian translation update by Tucalipe.

2012-11-18 Thread automerge
: automerge c...@wz2100.net Date: 2012-11-18 (Sun, 18 Nov 2012) Changed paths: M po/pt_BR.po Log Message: --- Merge branch 'bugfixes' into 3.1 Compare: https://github.com/Warzone2100/warzone2100/compare/217c5cd459f4...85caeb106c55

[Warzone2100-commits] [Warzone2100/warzone2100] b8bff8: qtscript: Fix origin player in countDroid and coun...

2012-11-15 Thread automerge
Message: --- Update NoQ's NullBot to latest version. Commit: 0f7ce13ad2d70c17b5cfb252891c8e6ee3157bc8 https://github.com/Warzone2100/warzone2100/commit/0f7ce13ad2d70c17b5cfb252891c8e6ee3157bc8 Author: automerge c...@wz2100.net Date: 2012-11-15 (Thu, 15 Nov 2012) Changed

[Warzone2100-commits] [Warzone2100/warzone2100] b8bff8: qtscript: Fix origin player in countDroid and coun...

2012-11-15 Thread automerge
Message: --- Update NoQ's NullBot to latest version. Commit: 217c5cd459f4710d552baf157a688878ac097965 https://github.com/Warzone2100/warzone2100/commit/217c5cd459f4710d552baf157a688878ac097965 Author: automerge c...@wz2100.net Date: 2012-11-15 (Thu, 15 Nov 2012) Changed

[Warzone2100-commits] [Warzone2100/warzone2100] a19e41: Fix droid frustrated state. Make AI droids clip th...

2012-11-02 Thread automerge
: 5997d959c6f3be96005428f3189e5dd19f180b7a https://github.com/Warzone2100/warzone2100/commit/5997d959c6f3be96005428f3189e5dd19f180b7a Author: automerge c...@wz2100.net Date: 2012-11-02 (Fri, 02 Nov 2012) Changed paths: M .gitignore M ChangeLog M Makefile.am A build_tools

[Warzone2100-commits] [Warzone2100/warzone2100] 207248: Add a few forgotten files to the tarball.

2012-11-02 Thread automerge
if a factory loses its production flag. Workaround for bug in ticket:3768. Commit: 40b3e02ffc1c17b25e65f5f75ac6644608f38557 https://github.com/Warzone2100/warzone2100/commit/40b3e02ffc1c17b25e65f5f75ac6644608f38557 Author: automerge c...@wz2100.net Date: 2012-11-02 (Fri, 02 Nov 2012

[Warzone2100-commits] [Warzone2100/warzone2100] 647f5e: Update PhysFS to 2.0.3.

2012-10-26 Thread automerge
/warzone2100/commit/ad5546c9aa4a6970f99eedb3934ad81b85f4a059 Author: automerge c...@wz2100.net Date: 2012-10-25 (Thu, 25 Oct 2012) Changed paths: M macosx/Warzone.xcodeproj/project.pbxproj M macosx/configs/fetchscripts/PhysFS-FetchSource.sh Log Message: --- Merge branch

[Warzone2100-commits] [Warzone2100/warzone2100] f81230: Don't crash when saving game and pViewData is NULL...

2012-10-12 Thread automerge
/commit/32213d44f01430ef46372d83f9dcc29be6d5c9ad Author: automerge c...@wz2100.net Date: 2012-10-11 (Thu, 11 Oct 2012) Changed paths: M ChangeLog M src/game.cpp Log Message: --- Merge branch 'bugfixes' into 3.1 Compare: https://github.com/Warzone2100/warzone2100

[Warzone2100-commits] [Warzone2100/warzone2100] bd65d5: Make Nexus/Semperfi AIs less snobby.

2012-10-08 Thread automerge
Log Message: --- Update changelog Commit: a9c2db1e8c0b791cd74065fb254d5b3883042132 https://github.com/Warzone2100/warzone2100/commit/a9c2db1e8c0b791cd74065fb254d5b3883042132 Author: automerge c...@wz2100.net Date: 2012-10-07 (Sun, 07 Oct 2012) Changed paths: M

[Warzone2100-commits] [Warzone2100/warzone2100] 984bdb: Remove #define gameTime2 realTime.

2012-10-05 Thread automerge
: automerge c...@wz2100.net Date: 2012-10-04 (Thu, 04 Oct 2012) Changed paths: M lib/gamelib/gtime.h M lib/netplay/netplay.cpp M lib/sound/audio.cpp M lib/widget/button.cpp M src/console.cpp M src/display3d.cpp M src/intdisplay.cpp M src/mapdisplay.cpp M src

[Warzone2100-commits] [Warzone2100/warzone2100] 7d433f: Update ChangeLog.

2012-10-01 Thread automerge
/ttypes.ttp Log Message: --- Add new maps by NoQ: Emergence (10p), Monocot (3p), Bloat (5p) and WindFury (9p). Commit: 7523d7b9548aee68fc9d119c21fd45f64d56 https://github.com/Warzone2100/warzone2100/commit/7523d7b9548aee68fc9d119c21fd45f64d56 Author: automerge c

[Warzone2100-commits] [Warzone2100/warzone2100] 2d3c39: Update png to 1.5.13 in the mac build.

2012-09-28 Thread automerge
/be50856bc10c763adff347584b29dd43fb2511e8 Author: automerge c...@wz2100.net Date: 2012-09-27 (Thu, 27 Sep 2012) Changed paths: M macosx/configs/fetchscripts/Png-FetchSource.sh Log Message: --- Merge branch 'bugfixes' into 3.1 Compare: https://github.com/Warzone2100/warzone2100/compare/a96848f31422

[Warzone2100-commits] [Warzone2100/warzone2100] f395be: Do not crash on pressing 'T' with a transporter se...

2012-09-21 Thread automerge
have been researched. Fixes ticket:3327. Commit: c3de482ab69b5c9088d17c3959c9e3b3dc6a7146 https://github.com/Warzone2100/warzone2100/commit/c3de482ab69b5c9088d17c3959c9e3b3dc6a7146 Author: automerge c...@wz2100.net Date: 2012-09-20 (Thu, 20 Sep 2012) Changed paths: M doc

[Warzone2100-commits] [Warzone2100/warzone2100] f395be: Do not crash on pressing 'T' with a transporter se...

2012-09-21 Thread automerge
been researched. Fixes ticket:3327. Commit: efb9ebcb4a19d72a3a86f377713052e3564f30b3 https://github.com/Warzone2100/warzone2100/commit/efb9ebcb4a19d72a3a86f377713052e3564f30b3 Author: automerge c...@wz2100.net Date: 2012-09-20 (Thu, 20 Sep 2012) Changed paths: M doc

[Warzone2100-commits] [Warzone2100/warzone2100] 667b54: Fix assertion on scavengers with more than 5 facto...

2012-09-17 Thread automerge
are non-zero. Fixes ticket:3619. Commit: 46936d7bb36e4939c92d3071ea609b187e17360e https://github.com/Warzone2100/warzone2100/commit/46936d7bb36e4939c92d3071ea609b187e17360e Author: automerge c...@wz2100.net Date: 2012-09-16 (Sun, 16 Sep 2012) Changed paths: M src/display3d.cpp

[Warzone2100-commits] [Warzone2100/warzone2100] 88c1a3: Pathfind to area around queued structure to be bui...

2012-09-17 Thread automerge
/69c4474e572972e2a73eedab6672e1fe3523e903 Author: automerge c...@wz2100.net Date: 2012-09-16 (Sun, 16 Sep 2012) Changed paths: M ChangeLog M src/baseobject.h M src/display3d.cpp M src/display3d.h M src/fpath.cpp M src/game.cpp M src/hci.cpp M src/radar.cpp M

[Warzone2100-commits] [Warzone2100/warzone2100] b256d9: Improve HOMING-INDIRECT terrain avoidance.

2012-09-10 Thread automerge
/4cca382a24b98a7fe3b2437327a5cf4a85c17e6f Author: automerge c...@wz2100.net Date: 2012-09-09 (Sun, 09 Sep 2012) Changed paths: M lib/ivis_opengl/pieblitfunc.cpp M lib/ivis_opengl/pieblitfunc.h M src/frontend.cpp M src/projectile.cpp Log Message: --- Merge branch 'bugfixes

[Warzone2100-commits] [Warzone2100/warzone2100] 47011d: Scale logo to fit box.

2012-09-10 Thread automerge
/fd3dc1db22670cf909c2606926e30e96919a26aa Author: automerge c...@wz2100.net Date: 2012-09-09 (Sun, 09 Sep 2012) Changed paths: M lib/ivis_opengl/pieblitfunc.cpp M lib/ivis_opengl/pieblitfunc.h M src/frontend.cpp Log Message: --- Merge branch 'bugfixes' into 3.1

[Warzone2100-commits] [Warzone2100/warzone2100] 9575cf: Allow setting/clearing game password after game is...

2012-09-07 Thread automerge
, independently of player window size. Text no longer covers player 8. Only affects debug builds. Commit: af649f85fe7e1ee9aa983d3b8e11d59595573561 https://github.com/Warzone2100/warzone2100/commit/af649f85fe7e1ee9aa983d3b8e11d59595573561 Author: automerge c...@wz2100.net Date: 2012-09-06

[Warzone2100-commits] [Warzone2100/warzone2100] c3ba96: Check for automake 1.11, for dist-xz support.

2012-09-03 Thread automerge
: f3bf40bfa4d4d1c81e15eca82781cbb60ebd5590 https://github.com/Warzone2100/warzone2100/commit/f3bf40bfa4d4d1c81e15eca82781cbb60ebd5590 Author: automerge c...@wz2100.net Date: 2012-09-02 (Sun, 02 Sep 2012) Changed paths: M autogen.sh M configure.ac M macosx/Resources/wzlocal

[Warzone2100-commits] [Warzone2100/warzone2100] a05e8c: Patch PhysFS in the mac build until there is a new...

2012-09-03 Thread automerge
.strings files to the mac build. Also make sure the licence actually makes it into the builds. Commit: f835e7f2a53d4ce985311616a124226d0bb5fb58 https://github.com/Warzone2100/warzone2100/commit/f835e7f2a53d4ce985311616a124226d0bb5fb58 Author: automerge c...@wz2100.net Date: 2012-09-02

[Warzone2100-commits] [Warzone2100/warzone2100] 408be7: Warn on apparently buggy PhysFS version 2.0.2.

2012-08-31 Thread automerge
/fdf9558e5c877d689ee368b77ce4ce04b6ca4882 Author: automerge c...@wz2100.net Date: 2012-08-30 (Thu, 30 Aug 2012) Changed paths: M lib/framework/i18n.cpp A macosx/Resources/wzlocal/el.lproj/InfoPlist.strings M pkg/nsis/warzone2100.nsi M po/LINGUAS A po/el.po M po/pl.po M src

[Warzone2100-commits] [Warzone2100/warzone2100] 408be7: Warn on apparently buggy PhysFS version 2.0.2.

2012-08-31 Thread automerge
./autogen.sh See 512ef27f4d4185d004977e0be4b972bfa130c57d. Commit: 23ab2996ebe28af867c7736f6a51392bab2db7f1 https://github.com/Warzone2100/warzone2100/commit/23ab2996ebe28af867c7736f6a51392bab2db7f1 Author: automerge c...@wz2100.net Date: 2012-08-30 (Thu, 30 Aug 2012) Changed

[Warzone2100-commits] [Warzone2100/warzone2100] 11f19f: Fix a bug where the players list vanishes after we...

2012-08-27 Thread automerge
by Kreuvf. Avoids currentBuildPts overflow effect: very long progress bar. Fixes ticket:3685. Commit: 84baba89acb1dc558afcd87e5e55dd033fc7e99b https://github.com/Warzone2100/warzone2100/commit/84baba89acb1dc558afcd87e5e55dd033fc7e99b Author: automerge c...@wz2100.net Date: 2012-08-26

[Warzone2100-commits] [Warzone2100/warzone2100] 0d333a: Update disabled uplink and lassat icons.

2012-08-24 Thread automerge
/590adfd053ffc3fe97789864e9cd37de2ffe165e Author: automerge c...@wz2100.net Date: 2012-08-23 (Thu, 23 Aug 2012) Changed paths: M data/base/images/frontend/image_no_lassat.png M data/base/images/frontend/image_no_uplink.png M src/multiplay.cpp M src/multiplay.h M src/qtscriptfuncs.cpp

[Warzone2100-commits] [Warzone2100/warzone2100] 0d333a: Update disabled uplink and lassat icons.

2012-08-24 Thread automerge
/c55693c436c910ce6bde71f04d7d861b7d0c70fb Author: automerge c...@wz2100.net Date: 2012-08-23 (Thu, 23 Aug 2012) Changed paths: M data/base/images/frontend/image_no_lassat.png M data/base/images/frontend/image_no_uplink.png M src/multiplay.cpp M src/multiplay.h M src/qtscriptfuncs.cpp

[Warzone2100-commits] [Warzone2100/warzone2100] 674ca3: French translation update by Amiral JCDG.

2012-08-20 Thread automerge
: 5801ca7345c15f2ea05b764949f533ff40e29401 https://github.com/Warzone2100/warzone2100/commit/5801ca7345c15f2ea05b764949f533ff40e29401 Author: automerge c...@wz2100.net Date: 2012-08-19 (Sun, 19 Aug 2012) Changed paths: M macosx/Warzone.xcodeproj/project.pbxproj M macosx/configs/Base

[Warzone2100-commits] [Warzone2100/warzone2100] e90f77: Revert Fix reported [-Werror=format] issue.

2012-08-13 Thread automerge
://github.com/Warzone2100/warzone2100/commit/7344958ab39e106287374dfecaf8b2a0469a36c2 Author: automerge c...@wz2100.net Date: 2012-08-12 (Sun, 12 Aug 2012) Changed paths: M lib/ivis_opengl/bitimage.cpp M lib/netplay/netplay.cpp M lib/netplay/netplay.h M src/multiint.cpp

[Warzone2100-commits] [Warzone2100/warzone2100] e90f77: Revert Fix reported [-Werror=format] issue.

2012-08-13 Thread automerge
://github.com/Warzone2100/warzone2100/commit/5f6323a98dbcadcecc80cec45e04119b916b5825 Author: automerge c...@wz2100.net Date: 2012-08-12 (Sun, 12 Aug 2012) Changed paths: M lib/ivis_opengl/bitimage.cpp M lib/netplay/netplay.cpp M lib/netplay/netplay.h M src/multiint.cpp Log

[Warzone2100-commits] [Warzone2100/warzone2100] 087ab8: Fix missing decals in Rocky Mountains tileset that...

2012-08-10 Thread automerge
/c6084f43c330d9d1952cce0169981c4e97e70a1f Author: automerge c...@wz2100.net Date: 2012-08-09 (Thu, 09 Aug 2012) Changed paths: M ChangeLog M data/base/tileset/rockiedecals.txt M data/base/tileset/rockieground.txt M data/base/tileset/urbanground.txt Log Message: --- Merge

[Warzone2100-commits] [Warzone2100/warzone2100] 398f77: No longer save default map, max players and map ha...

2012-08-03 Thread automerge
or filenames. This should be a minor improvement over silently retreiving the wrong resource on filename hash collisions. Commit: e219cd62bf7df7a532c8a52cc6f3ec37445aa0c5 https://github.com/Warzone2100/warzone2100/commit/e219cd62bf7df7a532c8a52cc6f3ec37445aa0c5 Author: automerge c...@wz2100

[Warzone2100-commits] [Warzone2100/warzone2100] df3283: qt: Use QImage instead of QImageReader to load mou...

2012-08-03 Thread automerge
improvement over silently retreiving the wrong resource on filename hash collisions. Commit: 7c76d4eaff71258bb94d4c5cd86d8d4ffef53ccb https://github.com/Warzone2100/warzone2100/commit/7c76d4eaff71258bb94d4c5cd86d8d4ffef53ccb Author: automerge c...@wz2100.net Date: 2012-08-02 (Thu, 02 Aug

[Warzone2100-commits] [Warzone2100/warzone2100] 9d82de: Remove dead code

2012-07-30 Thread automerge
to make it readable. Commit: 298a8891b4b5927a617d47aaeab85f6b90619c5c https://github.com/Warzone2100/warzone2100/commit/298a8891b4b5927a617d47aaeab85f6b90619c5c Author: automerge c...@wz2100.net Date: 2012-07-29 (Sun, 29 Jul 2012) Changed paths: M src/mission.cpp M src

[Warzone2100-commits] [Warzone2100/warzone2100] 9d82de: Remove dead code

2012-07-30 Thread automerge
it readable. Commit: 70a416977f5368a39a8b2368bdc1f1f795c7b268 https://github.com/Warzone2100/warzone2100/commit/70a416977f5368a39a8b2368bdc1f1f795c7b268 Author: automerge c...@wz2100.net Date: 2012-07-29 (Sun, 29 Jul 2012) Changed paths: M src/mission.cpp M src/mission.h

[Warzone2100-commits] [Warzone2100/warzone2100] 62c8c7: Update glew to 1.8.0.

2012-07-23 Thread automerge
AI's, Nexus, Nexus, Nexus would be renamed to Nexus, Nexus_2, Nexus_3, or similar. Commit: 348f53756c2036507a40aad85f59ba47bcd62c10 https://github.com/Warzone2100/warzone2100/commit/348f53756c2036507a40aad85f59ba47bcd62c10 Author: automerge c...@wz2100.net Date: 2012-07-22 (Sun

[Warzone2100-commits] [Warzone2100/warzone2100] 62c8c7: Update glew to 1.8.0.

2012-07-23 Thread automerge
AI's, Nexus, Nexus, Nexus would be renamed to Nexus, Nexus_2, Nexus_3, or similar. Commit: 28a2a034447a73edd652ebc7e86d54c0a64ef01a https://github.com/Warzone2100/warzone2100/commit/28a2a034447a73edd652ebc7e86d54c0a64ef01a Author: automerge c...@wz2100.net Date: 2012-07-22 (Sun, 22

[Warzone2100-commits] [Warzone2100/warzone2100] 0bfee1: Fix reported [-Werror=format] issue.

2012-07-16 Thread automerge
2012) Changed paths: M lib/netplay/netplay.cpp Log Message: --- Fix reported [-Werror=format] issue. Commit: bb76dbc141027b942cbc00c456e6689a1abb6ec5 https://github.com/Warzone2100/warzone2100/commit/bb76dbc141027b942cbc00c456e6689a1abb6ec5 Author: automerge c

[Warzone2100-commits] [Warzone2100/warzone2100] 329572: Add last part of net patch (needs updated server c...

2012-07-16 Thread automerge
/865588631dbaf922befa2ca7b42f6e3010a68a5b Author: automerge c...@wz2100.net Date: 2012-07-15 (Sun, 15 Jul 2012) Changed paths: A data/mp/multiplay/skirmish/nullbot-ge.inc.js A data/mp/multiplay/skirmish/nullbot-head.inc.js A data/mp/multiplay/skirmish/nullbot-tail.inc.js A data/mp/multiplay/skirmish

[Warzone2100-commits] [Warzone2100/warzone2100] 64173c: Fix reverse balanced tree lookup

2012-07-13 Thread automerge
to 1.5.12. Commit: 0b4745d4e6328dec49e817beb0966715053f5704 https://github.com/Warzone2100/warzone2100/commit/0b4745d4e6328dec49e817beb0966715053f5704 Author: automerge c...@wz2100.net Date: 2012-07-12 (Thu, 12 Jul 2012) Changed paths: M lib/framework/treap.cpp M macosx

[Warzone2100-commits] [Warzone2100/warzone2100] 64173c: Fix reverse balanced tree lookup

2012-07-13 Thread automerge
to 1.5.12. Commit: aa676c18bbf496fd62485c1b9cf9d8b9eeae87b3 https://github.com/Warzone2100/warzone2100/commit/aa676c18bbf496fd62485c1b9cf9d8b9eeae87b3 Author: automerge c...@wz2100.net Date: 2012-07-12 (Thu, 12 Jul 2012) Changed paths: M lib/framework/treap.cpp M macosx/configs

[Warzone2100-commits] [Warzone2100/warzone2100] ab44ea: Bump MAX_TERRAIN_TILES from 100 to 512.

2012-07-06 Thread automerge
: M icons/warzone2100.desktop Log Message: --- Update custom translations. Commit: e370f0f707edfaea8027c9b20e9c97426914e784 https://github.com/Warzone2100/warzone2100/commit/e370f0f707edfaea8027c9b20e9c97426914e784 Author: automerge c...@wz2100.net Date: 2012-07

[Warzone2100-commits] [Warzone2100/warzone2100] 3640b0: Let's not hide error messages, and add more debugg...

2012-06-29 Thread automerge
/59cb28115cb888fa79d70b90ebcf981cc022c2cc Author: automerge c...@wz2100.net Date: 2012-06-28 (Thu, 28 Jun 2012) Changed paths: M lib/framework/debug.cpp M lib/ivis_opengl/piestate.cpp M lib/ivis_opengl/piestate.h M lib/ivis_opengl/screen.cpp M lib/netplay/netplay.cpp M src/frontend.cpp M

[Warzone2100-commits] [Warzone2100/warzone2100] d11516: Fix fpathBlockingTile() usage in moveGetObstacleVe...

2012-06-15 Thread automerge
for testing. Commit: ce72663915cbd87495eb60d5d1cb2d888735f774 https://github.com/Warzone2100/warzone2100/commit/ce72663915cbd87495eb60d5d1cb2d888735f774 Author: automerge c...@wz2100.net Date: 2012-06-14 (Thu, 14 Jun 2012) Changed paths: M lib/ivis_opengl/piestate.cpp M lib

[Warzone2100-commits] [Warzone2100/warzone2100] 7e18c2: Update COPYING.NONGPL.

2012-06-11 Thread automerge
our matrix when returning from rendering functions in exceptional circumstances. Commit: 3928607fd9188f5147de396437a7367594949c33 https://github.com/Warzone2100/warzone2100/commit/3928607fd9188f5147de396437a7367594949c33 Author: automerge c...@wz2100.net Date: 2012-06-10 (Sun, 10

[Warzone2100-commits] [Warzone2100/warzone2100] ea7b19: Balance changes by NoQ.

2012-06-11 Thread automerge
: --- Make sure we pop our matrix when returning from rendering functions in exceptional circumstances. Commit: d42095db7b4eaf430d4c1c8a0331d6f9271f11fc https://github.com/Warzone2100/warzone2100/commit/d42095db7b4eaf430d4c1c8a0331d6f9271f11fc Author: automerge c...@wz2100.net Date

[Warzone2100-commits] [Warzone2100/warzone2100] 58551b: Do not return client broadcast messages to the sen...

2012-06-08 Thread automerge
to only show issues in the test outputs. Commit: 7107400b2b3b5761b96fa97fffddcb8a2383a77a https://github.com/Warzone2100/warzone2100/commit/7107400b2b3b5761b96fa97fffddcb8a2383a77a Author: automerge c...@wz2100.net Date: 2012-06-07 (Thu, 07 Jun 2012) Changed paths: M data/base

  1   2   >