[Warzone2100-commits] [Warzone2100/warzone2100] e636d4: Use Berg's animated factory (GPL).

2012-06-25 Thread Per Inge Mathisen
  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: e636d41472762f0573979c1f05ada2e1484e4eca
  
https://github.com/Warzone2100/warzone2100/commit/e636d41472762f0573979c1f05ada2e1484e4eca
  Author: safety0ff 
  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 
  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 
  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 
  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 
  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 
  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 
  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 
  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 
  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 
  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 
  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/4a1aec1c57adedd57c757fb06df91dfecfe07

[Warzone2100-commits] [Warzone2100/warzone2100] e636d4: Use Berg's animated factory (GPL).

2012-06-17 Thread automerge
  Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: e636d41472762f0573979c1f05ada2e1484e4eca
  
https://github.com/Warzone2100/warzone2100/commit/e636d41472762f0573979c1f05ada2e1484e4eca
  Author: safety0ff 
  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 
  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 
  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 
  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 
  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 
  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 
  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 
  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 
  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 
  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 
  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

[Warzone2100-commits] [Warzone2100/warzone2100] e636d4: Use Berg's animated factory (GPL).

2012-06-16 Thread safety0ff
  Branch: refs/heads/bugfixes
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: e636d41472762f0573979c1f05ada2e1484e4eca
  
https://github.com/Warzone2100/warzone2100/commit/e636d41472762f0573979c1f05ada2e1484e4eca
  Author: safety0ff 
  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).



--
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