Branch: refs/heads/3.1
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: 02395b3f02589a7a908cb7cddfaaf5248fdd8d23
https://github.com/Warzone2100/warzone2100/commit/02395b3f02589a7a908cb7cddfaaf5248fdd8d23
Author: automerge <c...@wz2100.net>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
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/framework/crc.cpp
M lib/framework/crc.h
M lib/ivis_opengl/piedraw.cpp
M lib/ivis_opengl/piemode.cpp
M lib/ivis_opengl/piestate.cpp
M lib/ivis_opengl/screen.cpp
M macosx/configs/fetchscripts/SetupPrebuiltComponents-Docs.sh
M src/function.cpp
M src/game.cpp
M src/qtscriptfuncs.cpp
M src/qtscriptfuncs.h
M src/structure.cpp
M tools/map/Makefile.am
Log Message:
-----------
Merge branch 'bugfixes' into 3.1
Compare:
https://github.com/Warzone2100/warzone2100/compare/2ccf4e04f51b...02395b3f0258
------------------------------------------------------------------------------
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
