Branch: refs/heads/master
Home: https://github.com/Warzone2100/warzone2100
Commit: e636d41472762f0573979c1f05ada2e1484e4eca
https://github.com/Warzone2100/warzone2100/commit/e636d41472762f0573979c1f05ada2e1484e4eca
Author: safety0ff <safety...@users.sourceforge.net>
Date: 2012-06-16 (Sat, 16 Jun 2012)
Changed paths:
M data/base/structs/blfact0.pie
M data/base/structs/blfact1.pie
M data/base/structs/blfact2.pie
M data/base/texpages/page-13-player-buildings.png
M data/base/texpages/page-13_tcmask.png
Log Message:
-----------
Use Berg's animated factory (GPL).
Commit: 02b99612b6b45264ddca2ab3c8b0eb14069ce426
https://github.com/Warzone2100/warzone2100/commit/02b99612b6b45264ddca2ab3c8b0eb14069ce426
Author: dak180 <dak...@users.sourceforge.net>
Date: 2012-06-16 (Sat, 16 Jun 2012)
Changed paths:
M data/base/texpages/page-11-player-buildings.png
M data/base/texpages/page-11_tcmask.png
M data/base/texpages/page-12-player-buildings.png
M data/base/texpages/page-12_tcmask.png
M data/base/texpages/page-13-player-buildings.png
M data/base/texpages/page-13_tcmask.png
M data/base/texpages/page-14-droid-hubs.png
M data/base/texpages/page-14_tcmask.png
M data/base/texpages/page-17-droid-weapons.png
M data/base/texpages/page-17_tcmask.png
Log Message:
-----------
Pngs should be crushed, a lot.
Preferably before being committed.
Commit: caa2074679691724fc0a77385c6b9fdc335f2fa8
https://github.com/Warzone2100/warzone2100/commit/caa2074679691724fc0a77385c6b9fdc335f2fa8
Author: dak180 <dak...@users.sourceforge.net>
Date: 2012-06-16 (Sat, 16 Jun 2012)
Changed paths:
M macosx/configs/fetchscripts/SetupPrebuiltComponents-Docs.sh
Log Message:
-----------
Update the mac doc bundle.
Commit: f5a7fd52c01dbe848ecaab27da4a08fc7eef536a
https://github.com/Warzone2100/warzone2100/commit/f5a7fd52c01dbe848ecaab27da4a08fc7eef536a
Author: Cyp <c...@wz2100.net>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M lib/ivis_opengl/screen.cpp
Log Message:
-----------
Do archaic OpenGL driver workaround before trying to enable shaders, as well
as after the workaround is clobbered.
Commit: 43f9036607e275e6456c71911ac7cf9bc31ae653
https://github.com/Warzone2100/warzone2100/commit/43f9036607e275e6456c71911ac7cf9bc31ae653
Author: Per Inge Mathisen <p...@wz2100.net>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M tools/map/Makefile.am
Log Message:
-----------
Do not install map tools. Closes ticket:3494
Commit: eb3001bd2fb6c0494abb3677cd05f62c1b0d8a4a
https://github.com/Warzone2100/warzone2100/commit/eb3001bd2fb6c0494abb3677cd05f62c1b0d8a4a
Author: Per Inge Mathisen <p...@wz2100.net>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M src/game.cpp
Log Message:
-----------
Make sure we do not overwrite sensible defaults with non-sensible ones
when reading rearm pad data from savegame files. Closes ticket:3518
Commit: 8aa4a686761b76f2d9a78423864dc173ba0bbd1f
https://github.com/Warzone2100/warzone2100/commit/8aa4a686761b76f2d9a78423864dc173ba0bbd1f
Author: Cyp <c...@wz2100.net>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M src/structure.cpp
Log Message:
-----------
Do not dereference NULL on referencing non-existent structure in
structureweapons.txt.
Fixes ticket:3543.
Commit: 7dbe64278c23883253f1fbd0ae830332e85eb6b8
https://github.com/Warzone2100/warzone2100/commit/7dbe64278c23883253f1fbd0ae830332e85eb6b8
Author: Per Inge Mathisen <p...@wz2100.net>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M src/qtscriptfuncs.cpp
Log Message:
-----------
qtscript: Set .stattype of a Laser Satellite building to correct ID. Closes
ticket:3506
Commit: 69727cdb9a6aa1994016f70426f64739dce6101e
https://github.com/Warzone2100/warzone2100/commit/69727cdb9a6aa1994016f70426f64739dce6101e
Author: Per Inge Mathisen <p...@wz2100.net>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M src/qtscriptfuncs.cpp
M src/qtscriptfuncs.h
Log Message:
-----------
qtscript: Add .type properties to common game objects, as requested in
http://forums.wz2100.net/viewtopic.php?f=35&t=9576&p=105883
Commit: 29af6bf8d201df86e8102f48b36a925706085a85
https://github.com/Warzone2100/warzone2100/commit/29af6bf8d201df86e8102f48b36a925706085a85
Author: Per Inge Mathisen <p...@wz2100.net>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M src/function.cpp
Log Message:
-----------
Clean up crazy indentation in function.cpp to make it readable. Refs
ticket:3220
Commit: ec2bbb95f610d7f5fce2610188c94f2a02e4a1b7
https://github.com/Warzone2100/warzone2100/commit/ec2bbb95f610d7f5fce2610188c94f2a02e4a1b7
Author: Per Inge Mathisen <p...@wz2100.net>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M src/function.cpp
Log Message:
-----------
Extra manual cleanup of function.cpp
Commit: 4a1aec1c57adedd57c757fb06df91dfecfe071dc
https://github.com/Warzone2100/warzone2100/commit/4a1aec1c57adedd57c757fb06df91dfecfe071dc
Author: Cyp <c...@wz2100.net>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M data/mp/addon.lev
Log Message:
-----------
Swap Rush-T[23] map with 4c-Rush2-T[23] map, such that the map order does not
depend on tech level.
Commit: 474216b781e1b5f418585a073cb693dafdc777dd
https://github.com/Warzone2100/warzone2100/commit/474216b781e1b5f418585a073cb693dafdc777dd
Author: Cyp <c...@wz2100.net>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M lib/framework/crc.cpp
M lib/framework/crc.h
Log Message:
-----------
Add SHA-256 implementation.
Commit: 7867b7abe209613da26ae36897ac864eaee73a14
https://github.com/Warzone2100/warzone2100/commit/7867b7abe209613da26ae36897ac864eaee73a14
Author: Cyp <c...@wz2100.net>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M lib/ivis_opengl/piestate.cpp
M lib/ivis_opengl/screen.cpp
Log Message:
-----------
In fallback, try to use glBlendColorEXT if glBlendColor is not present.
Commit: d9aab02307d326caf7d42e54f4d8ef19d75b09ce
https://github.com/Warzone2100/warzone2100/commit/d9aab02307d326caf7d42e54f4d8ef19d75b09ce
Author: dak180 <dak...@users.sourceforge.net>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M Makefile.am
Log Message:
-----------
Add tools/image to the tarballs.
Closes #3528.
Commit: da433789c3e272c9c22307b6e74eeb81b2925e07
https://github.com/Warzone2100/warzone2100/commit/da433789c3e272c9c22307b6e74eeb81b2925e07
Author: safety0ff <safety...@users.sourceforge.net>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M data/base/structs/blcfact1.pie
Log Message:
-----------
Use Berg's animated cyborg factory (GPL.)
Commit: b35afbf9d34ef33980888af3803cbc29bb05497a
https://github.com/Warzone2100/warzone2100/commit/b35afbf9d34ef33980888af3803cbc29bb05497a
Author: safety0ff <safety...@users.sourceforge.net>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M lib/ivis_opengl/piedraw.cpp
M lib/ivis_opengl/piemode.cpp
Log Message:
-----------
Determine which stencil functions and enums to use once instead of each frame.
Commit: 9d428d553e271f834a848776b296b62ba321e754
https://github.com/Warzone2100/warzone2100/commit/9d428d553e271f834a848776b296b62ba321e754
Author: safety0ff <safety...@users.sourceforge.net>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M doc/gl/wzgl.ods
Log Message:
-----------
Add some enums that were missed and update the functions for a newly used
function.
Commit: 2e72860fb1c666f9950350d0bdd5238315c4ea1c
https://github.com/Warzone2100/warzone2100/commit/2e72860fb1c666f9950350d0bdd5238315c4ea1c
Author: dak180 <dak...@users.sourceforge.net>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M Makefile.am
Log Message:
-----------
Be somewhat less unaimed in putting the image tool in the tarball.
Commit: 691df6a1837cec65fe7ac4e924c96868df2b749d
https://github.com/Warzone2100/warzone2100/commit/691df6a1837cec65fe7ac4e924c96868df2b749d
Author: safety0ff <safety...@users.sourceforge.net>
Date: 2012-06-18 (Mon, 18 Jun 2012)
Changed paths:
M lib/ivis_opengl/piedraw.cpp
M lib/ivis_opengl/piestate.cpp
M lib/ivis_opengl/piestate.h
M lib/ivis_opengl/screen.cpp
M lib/ivis_opengl/screen.h
M src/clparse.cpp
M src/configuration.cpp
M src/frontend.cpp
M src/frontend.h
M src/main.cpp
M src/warzoneconfig.cpp
M src/warzoneconfig.h
Log Message:
-----------
Add shader toggle UI.
Commit: 15c04ab10f87de89ca7dcae2813834bd1a03247b
https://github.com/Warzone2100/warzone2100/commit/15c04ab10f87de89ca7dcae2813834bd1a03247b
Author: Cyp <c...@wz2100.net>
Date: 2012-06-18 (Mon, 18 Jun 2012)
Changed paths:
M lib/framework/crc.cpp
M lib/framework/crc.h
M lib/framework/file.h
M lib/framework/frame.cpp
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M src/configuration.cpp
M src/game.cpp
M src/init.cpp
M src/levels.cpp
M src/levels.h
M src/main.cpp
M src/main.h
M src/multiint.cpp
M src/multimenu.cpp
M src/multimenu.h
M src/multiopt.cpp
M src/multiplay.cpp
M src/multiplay.h
Log Message:
-----------
Handle different maps with identical names, instead of a desynch.
Fixes ticket:3531 and ticket:3180.
Commit: 769fccc22001dc94a0f243c533185c7ab9676640
https://github.com/Warzone2100/warzone2100/commit/769fccc22001dc94a0f243c533185c7ab9676640
Author: Cyp <c...@wz2100.net>
Date: 2012-06-18 (Mon, 18 Jun 2012)
Changed paths:
M ChangeLog
Log Message:
-----------
Update ChangeLog.
Commit: 205609302755ec151d4768da6cdcefe768059fb1
https://github.com/Warzone2100/warzone2100/commit/205609302755ec151d4768da6cdcefe768059fb1
Author: vexed <ve...@wz2100.net>
Date: 2012-06-18 (Mon, 18 Jun 2012)
Changed paths:
M src/init.cpp
Log Message:
-----------
Don't convert to a platform specific string here, it causes bad things to
happen.
"const char * PHYSFS_getRealDir ( const char * filename
)
Figure out where in the search path a file resides.
The file is specified in platform-independent notation. "
Commit: 1461b3a5a81b72381bc3cc3dbc57bbd2f5ce22a7
https://github.com/Warzone2100/warzone2100/commit/1461b3a5a81b72381bc3cc3dbc57bbd2f5ce22a7
Author: Cyp <c...@wz2100.net>
Date: 2012-06-19 (Tue, 19 Jun 2012)
Changed paths:
M src/game.cpp
Log Message:
-----------
Fix loading of campaign savegames.
Apparently, the game.map variable is set to "Sk-Rush" in campaign. And the
actual map name is saved somewhere else.
Broken in 15c04ab10f87de89ca7dcae2813834bd1a03247b.
Commit: a0b7030cd651af0f165a74b9a37638b6de899dfe
https://github.com/Warzone2100/warzone2100/commit/a0b7030cd651af0f165a74b9a37638b6de899dfe
Author: cybersphinx <chr....@gmx.net>
Date: 2012-06-19 (Tue, 19 Jun 2012)
Changed paths:
M lib/netplay/netplay.cpp
M src/multiint.cpp
Log Message:
-----------
Remove unused variable, and fix some narrowing stuff.
src/multiint.cpp:404:52: error: narrowing conversion of ‘(rand() % 256)’ from
‘int’ to ‘char’ inside { } is ill-formed in C++11 [-Werror=narrowing]
Fixes #3552.
Commit: 6a3121754793d994069af0854fd61fc64b073c92
https://github.com/Warzone2100/warzone2100/commit/6a3121754793d994069af0854fd61fc64b073c92
Author: cybersphinx <chr....@gmx.net>
Date: 2012-06-19 (Tue, 19 Jun 2012)
Changed paths:
M ChangeLog
Log Message:
-----------
Update ChangeLog.
Commit: 0007657291832d003639eb3f408d069881ed3b39
https://github.com/Warzone2100/warzone2100/commit/0007657291832d003639eb3f408d069881ed3b39
Author: dak180 <dak...@users.sourceforge.net>
Date: 2012-06-19 (Tue, 19 Jun 2012)
Changed paths:
M macosx/configs/fetchscripts/SetupPrebuiltComponents-Docs.sh
Log Message:
-----------
Update the mac doc bundle.
Commit: 0c55d94ea0b6c3ff17527dbe61b8c0b0c0f885a9
https://github.com/Warzone2100/warzone2100/commit/0c55d94ea0b6c3ff17527dbe61b8c0b0c0f885a9
Author: cybersphinx <chr....@gmx.net>
Date: 2012-06-19 (Tue, 19 Jun 2012)
Changed paths:
M po/ca_ES.po
M po/cs.po
M po/da.po
M po/de.po
M po/en_GB.po
M po/es.po
M po/et_EE.po
M po/fi.po
M po/fr.po
M po/fy.po
M po/ga.po
M po/hr.po
M po/hu.po
M po/it.po
M po/ko.po
M po/la.po
M po/lt.po
M po/nb.po
M po/nl.po
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/sk.po
M po/sl.po
M po/tr.po
M po/uk_UA.po
M po/zh_CN.po
M po/zh_TW.po
Log Message:
-----------
Update translations.
Commit: 9784c655af2a66bd541268e2c9e6f19fcd1ac200
https://github.com/Warzone2100/warzone2100/commit/9784c655af2a66bd541268e2c9e6f19fcd1ac200
Author: Cyp <c...@wz2100.net>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M lib/framework/crc.cpp
M lib/framework/crc.h
M src/configuration.cpp
M src/levels.cpp
M src/levels.h
M src/multiint.cpp
Log Message:
-----------
Save and load map hashes in config file.
This prevents a zero hash from being sent by the host when the user has not
selected the map between starting the
program and hosting. This also means remembering exactly which map was last
used, even if multiple maps have the
same name.
Commit: e8ee5e6f431d03def032659d4f19856176d4df26
https://github.com/Warzone2100/warzone2100/commit/e8ee5e6f431d03def032659d4f19856176d4df26
Author: Cyp <c...@wz2100.net>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M lib/ivis_opengl/screen.cpp
Log Message:
-----------
Don't require OpenGL extensions to be reported, if present in the reported
OpenGL version.
Commit: e1dcb241abcfd42ef988bf88bb1c44dd8cd89d1f
https://github.com/Warzone2100/warzone2100/commit/e1dcb241abcfd42ef988bf88bb1c44dd8cd89d1f
Author: Cyp <c...@wz2100.net>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M src/combat.cpp
M src/display3d.cpp
M src/droid.cpp
M src/game.cpp
M src/movedef.h
M src/structure.cpp
M src/weapondef.h
Log Message:
-----------
Rename DROID::sMove.iAttackRuns[i] to DROID::asWeaps[i].usedAmmo.
The sMove structure is cleared when unloading from transports, and it makes no
sense to think of used ammo as pathfinding-related, anyway.
Fixes ticket:3554.
Commit: adc13fe9fa8f83dbb23abff4d9d0a86b54a2e904
https://github.com/Warzone2100/warzone2100/commit/adc13fe9fa8f83dbb23abff4d9d0a86b54a2e904
Author: Cyp <c...@wz2100.net>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M src/droid.cpp
M src/droid.h
M src/structure.cpp
Log Message:
-----------
Cleanup: Remove unused mendVtol() function and fix excess indentation.
Commit: 581d65411e714bec6c5b0e783dbaa705ff6a38c4
https://github.com/Warzone2100/warzone2100/commit/581d65411e714bec6c5b0e783dbaa705ff6a38c4
Author: safety0ff <safety...@users.sourceforge.net>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M src/edit3d.cpp
Log Message:
-----------
Fix blueprint alignment and snap modules.
Closes #3466.
Commit: 6382bbb08ea7e6ca93a0ba83fdb65952778c962a
https://github.com/Warzone2100/warzone2100/commit/6382bbb08ea7e6ca93a0ba83fdb65952778c962a
Author: safety0ff <safety...@users.sourceforge.net>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M src/display.cpp
M src/display.h
M src/display3d.cpp
M src/edit3d.cpp
M src/hci.cpp
M src/init.cpp
M src/loop.cpp
M src/scriptfuncs.cpp
M src/structure.cpp
M src/structure.h
Log Message:
-----------
Fix dangling pointer when structures are destroyed and you are repositioning
the delivery point.
Untangles delivery points code from building placement code.
You can no longer "quick queue" units from the debug menu.
Fixes #2041.
Commit: 6c6180495cc791afe9f818b7070f8a6bc3b13fae
https://github.com/Warzone2100/warzone2100/commit/6c6180495cc791afe9f818b7070f8a6bc3b13fae
Author: safety0ff <safety...@users.sourceforge.net>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M lib/exceptionhandler/exceptionhandler.cpp
Log Message:
-----------
Fix compilation on non-x86 platforms.
Refs. #3558.
Commit: 67b2a6210afa4306e813489d7cf2288c7ff4211f
https://github.com/Warzone2100/warzone2100/commit/67b2a6210afa4306e813489d7cf2288c7ff4211f
Author: Per Inge Mathisen <p...@wz2100.net>
Date: 2012-06-23 (Sat, 23 Jun 2012)
Changed paths:
M src/qtscriptfuncs.cpp
Log Message:
-----------
qtscript: Add new function that returns unit limit(s).
Commit: 88e94391669e54808b2d6f40cba994d3501efb08
https://github.com/Warzone2100/warzone2100/commit/88e94391669e54808b2d6f40cba994d3501efb08
Author: Cyp <c...@wz2100.net>
Date: 2012-06-23 (Sat, 23 Jun 2012)
Changed paths:
M src/structure.cpp
Log Message:
-----------
Fix uninitialised variable usage on removing repair facilities.
See previous commit.
Commit: 032956e649e69aa51edd80787c9c94bf2c08d164
https://github.com/Warzone2100/warzone2100/commit/032956e649e69aa51edd80787c9c94bf2c08d164
Author: Cyp <c...@wz2100.net>
Date: 2012-06-23 (Sat, 23 Jun 2012)
Changed paths:
M src/droid.cpp
M src/transporter.cpp
Log Message:
-----------
Fix minor memory leak on loading/unloading transporters.
DROID::sMove.asPath is set to NULL on unloading droids, but was never freed.
Also, clear any remaining pathfinding job for the droid on loading transporter.
Commit: 3c5e8792be30278fee65ac5d5f59933388f384ed
https://github.com/Warzone2100/warzone2100/commit/3c5e8792be30278fee65ac5d5f59933388f384ed
Author: safety0ff <safety...@users.sourceforge.net>
Date: 2012-06-23 (Sat, 23 Jun 2012)
Changed paths:
M src/edit3d.cpp
Log Message:
-----------
Revert "Fix blueprint alignment and snap modules."
This reverts commit 581d65411e714bec6c5b0e783dbaa705ff6a38c4.
Commit: 7bc528ebd7a766a87e993a76f1c294542995c63f
https://github.com/Warzone2100/warzone2100/commit/7bc528ebd7a766a87e993a76f1c294542995c63f
Author: Per Inge Mathisen <p...@wz2100.net>
Date: 2012-06-25 (Mon, 25 Jun 2012)
Changed paths:
M ChangeLog
M Makefile.am
M data/base/structs/blcfact1.pie
M data/base/structs/blfact0.pie
M data/base/structs/blfact1.pie
M data/base/structs/blfact2.pie
M data/base/texpages/page-11-player-buildings.png
M data/base/texpages/page-11_tcmask.png
M data/base/texpages/page-12-player-buildings.png
M data/base/texpages/page-12_tcmask.png
M data/base/texpages/page-13-player-buildings.png
M data/base/texpages/page-13_tcmask.png
M data/base/texpages/page-14-droid-hubs.png
M data/base/texpages/page-14_tcmask.png
M data/base/texpages/page-17-droid-weapons.png
M data/base/texpages/page-17_tcmask.png
M data/mp/addon.lev
M doc/gl/wzgl.ods
M lib/exceptionhandler/exceptionhandler.cpp
M lib/framework/crc.cpp
M lib/framework/crc.h
M lib/framework/file.h
M lib/framework/frame.cpp
M lib/ivis_opengl/piedraw.cpp
M lib/ivis_opengl/piemode.cpp
M lib/ivis_opengl/piestate.cpp
M lib/ivis_opengl/piestate.h
M lib/ivis_opengl/screen.cpp
M lib/ivis_opengl/screen.h
M lib/netplay/netplay.cpp
M lib/netplay/netplay.h
M macosx/configs/fetchscripts/SetupPrebuiltComponents-Docs.sh
M po/ca_ES.po
M po/cs.po
M po/da.po
M po/de.po
M po/en_GB.po
M po/es.po
M po/et_EE.po
M po/fi.po
M po/fr.po
M po/fy.po
M po/ga.po
M po/hr.po
M po/hu.po
M po/it.po
M po/ko.po
M po/la.po
M po/lt.po
M po/nb.po
M po/nl.po
M po/pl.po
M po/pt.po
M po/pt_BR.po
M po/ro.po
M po/ru.po
M po/sk.po
M po/sl.po
M po/tr.po
M po/uk_UA.po
M po/zh_CN.po
M po/zh_TW.po
M src/clparse.cpp
M src/combat.cpp
M src/configuration.cpp
M src/display.cpp
M src/display.h
M src/display3d.cpp
M src/droid.cpp
M src/droid.h
M src/edit3d.cpp
M src/frontend.cpp
M src/frontend.h
M src/function.cpp
M src/game.cpp
M src/hci.cpp
M src/init.cpp
M src/levels.cpp
M src/levels.h
M src/loop.cpp
M src/main.cpp
M src/main.h
M src/movedef.h
M src/multiint.cpp
M src/multimenu.cpp
M src/multimenu.h
M src/multiopt.cpp
M src/multiplay.cpp
M src/multiplay.h
M src/qtscriptfuncs.cpp
M src/qtscriptfuncs.h
M src/scriptfuncs.cpp
M src/structure.cpp
M src/structure.h
M src/transporter.cpp
M src/warzoneconfig.cpp
M src/warzoneconfig.h
M src/weapondef.h
M tools/map/Makefile.am
Log Message:
-----------
Merge branch 'bugfixes'
Conflicts:
src/qtscriptfuncs.cpp
Compare:
https://github.com/Warzone2100/warzone2100/compare/1347384694b6...7bc528ebd7a7
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits
