Branch: refs/heads/master
Home: https://github.com/Warzone2100/warzone2100
Commit: ea7b1912fdd6d733288e9b5e783af8cd1c3cf408
https://github.com/Warzone2100/warzone2100/commit/ea7b1912fdd6d733288e9b5e783af8cd1c3cf408
Author: Cyp <c...@wz2100.net>
Date: 2012-06-09 (Sat, 09 Jun 2012)
Changed paths:
M data/mp/stats/functions.txt
M data/mp/stats/research/multiplayer/research.txt
M data/mp/stats/structures.txt
M data/mp/stats/weapons.txt
Log Message:
-----------
Balance changes by NoQ.
And thanks to Reg312, Iluvalar and tmp500 for valuable suggestions.
Inferno: price 80->110, incend.radius 64->48, incend.damage 40->32
Thermite Cyborg: incend.damage 38->32
Plasmite: price 80->130, incend.radius 96->60, incend.damage 63->50
Incendiary Mortar: price 150->200, pit price 135->170, incend.damage 30->22
Incendiary Howitzer: price 250->300, emplacement price 325->400, incend.damage
60->32
Minipod: range 1152->1088
MRA: damage 34->29, splash damage 30->29, reload time 145->165
HMG: damage 18->17
AG: fire pause 3->4, damage 20->19
TAG: price 100->120, fire pause 3->4, damage 30->28
AG Cyborg: fire pause 4->5, damage 20->18
MG: ROF upgrades 15%/30%/45% -> 17%/34%/50%.
MC: research points 4800->3600
HPV: research points 7200->4800
Gates: price 25->75
Whirlwind: fire pause 3->4
Thermite Bombs: incend.damage 200->120
Plasmite Bombs: incend.damage 200->140
Cannon Fortress: price 1000->900, range 1792->1408
Seraph: damage 120->110, splash 100->90, INDIRECT->HOMING-INDIRECT
Archangel: INDIRECT->HOMING-INDIRECT
Commit: 4a53a0e010452a1ef2a64d92fd3f12c27b451a50
https://github.com/Warzone2100/warzone2100/commit/4a53a0e010452a1ef2a64d92fd3f12c27b451a50
Author: Cyp <c...@wz2100.net>
Date: 2012-06-09 (Sat, 09 Jun 2012)
Changed paths:
M data/base/texpages/page-100-rock-earth-rockies.png
A data/base/texpages/page-109-sand-arizona.png
M data/base/texpages/tertilesc1hw-128/tile-18.png
M data/base/texpages/tertilesc1hw-128/tile-45.png
M data/base/texpages/tertilesc1hw-128/tile-46.png
M data/base/texpages/tertilesc1hw-128/tile-71.png
M data/base/texpages/tertilesc1hw-128/tile-75.png
M data/base/texpages/tertilesc1hw-16/tile-18.png
M data/base/texpages/tertilesc1hw-16/tile-45.png
M data/base/texpages/tertilesc1hw-16/tile-46.png
M data/base/texpages/tertilesc1hw-16/tile-71.png
M data/base/texpages/tertilesc1hw-16/tile-75.png
M data/base/texpages/tertilesc1hw-32/tile-18.png
M data/base/texpages/tertilesc1hw-32/tile-45.png
M data/base/texpages/tertilesc1hw-32/tile-46.png
M data/base/texpages/tertilesc1hw-32/tile-71.png
M data/base/texpages/tertilesc1hw-32/tile-75.png
M data/base/texpages/tertilesc1hw-64/tile-18.png
M data/base/texpages/tertilesc1hw-64/tile-45.png
M data/base/texpages/tertilesc1hw-64/tile-46.png
M data/base/texpages/tertilesc1hw-64/tile-71.png
M data/base/texpages/tertilesc1hw-64/tile-75.png
M data/base/texpages/tertilesc2hw-128/tile-68.png
M data/base/texpages/tertilesc2hw-128/tile-69.png
M data/base/texpages/tertilesc2hw-128/tile-70.png
M data/base/texpages/tertilesc2hw-16/tile-68.png
M data/base/texpages/tertilesc2hw-16/tile-69.png
M data/base/texpages/tertilesc2hw-16/tile-70.png
M data/base/texpages/tertilesc2hw-32/tile-68.png
M data/base/texpages/tertilesc2hw-32/tile-69.png
M data/base/texpages/tertilesc2hw-32/tile-70.png
M data/base/texpages/tertilesc2hw-64/tile-68.png
M data/base/texpages/tertilesc2hw-64/tile-69.png
M data/base/texpages/tertilesc2hw-64/tile-70.png
M data/base/texpages/tertilesc3hw-128/tile-09.png
M data/base/texpages/tertilesc3hw-128/tile-18.png
M data/base/texpages/tertilesc3hw-128/tile-29.png
M data/base/texpages/tertilesc3hw-128/tile-30.png
M data/base/texpages/tertilesc3hw-128/tile-42.png
M data/base/texpages/tertilesc3hw-128/tile-44.png
M data/base/texpages/tertilesc3hw-128/tile-45.png
M data/base/texpages/tertilesc3hw-128/tile-46.png
M data/base/texpages/tertilesc3hw-128/tile-54.png
M data/base/texpages/tertilesc3hw-128/tile-61.png
M data/base/texpages/tertilesc3hw-128/tile-63.png
M data/base/texpages/tertilesc3hw-128/tile-68.png
M data/base/texpages/tertilesc3hw-128/tile-69.png
M data/base/texpages/tertilesc3hw-128/tile-71.png
M data/base/texpages/tertilesc3hw-128/tile-76.png
M data/base/texpages/tertilesc3hw-128/tile-77.png
M data/base/texpages/tertilesc3hw-128/tile-78.png
M data/base/texpages/tertilesc3hw-16/tile-09.png
M data/base/texpages/tertilesc3hw-16/tile-18.png
M data/base/texpages/tertilesc3hw-16/tile-29.png
M data/base/texpages/tertilesc3hw-16/tile-30.png
M data/base/texpages/tertilesc3hw-16/tile-42.png
M data/base/texpages/tertilesc3hw-16/tile-44.png
M data/base/texpages/tertilesc3hw-16/tile-45.png
M data/base/texpages/tertilesc3hw-16/tile-46.png
M data/base/texpages/tertilesc3hw-16/tile-54.png
M data/base/texpages/tertilesc3hw-16/tile-61.png
M data/base/texpages/tertilesc3hw-16/tile-63.png
M data/base/texpages/tertilesc3hw-16/tile-68.png
M data/base/texpages/tertilesc3hw-16/tile-69.png
M data/base/texpages/tertilesc3hw-16/tile-71.png
M data/base/texpages/tertilesc3hw-16/tile-76.png
M data/base/texpages/tertilesc3hw-16/tile-77.png
M data/base/texpages/tertilesc3hw-16/tile-78.png
M data/base/texpages/tertilesc3hw-32/tile-09.png
M data/base/texpages/tertilesc3hw-32/tile-18.png
M data/base/texpages/tertilesc3hw-32/tile-29.png
M data/base/texpages/tertilesc3hw-32/tile-30.png
M data/base/texpages/tertilesc3hw-32/tile-42.png
M data/base/texpages/tertilesc3hw-32/tile-44.png
M data/base/texpages/tertilesc3hw-32/tile-45.png
M data/base/texpages/tertilesc3hw-32/tile-46.png
M data/base/texpages/tertilesc3hw-32/tile-54.png
M data/base/texpages/tertilesc3hw-32/tile-61.png
M data/base/texpages/tertilesc3hw-32/tile-63.png
M data/base/texpages/tertilesc3hw-32/tile-68.png
M data/base/texpages/tertilesc3hw-32/tile-69.png
M data/base/texpages/tertilesc3hw-32/tile-71.png
M data/base/texpages/tertilesc3hw-32/tile-76.png
M data/base/texpages/tertilesc3hw-32/tile-77.png
M data/base/texpages/tertilesc3hw-32/tile-78.png
M data/base/texpages/tertilesc3hw-64/tile-09.png
M data/base/texpages/tertilesc3hw-64/tile-18.png
M data/base/texpages/tertilesc3hw-64/tile-29.png
M data/base/texpages/tertilesc3hw-64/tile-30.png
M data/base/texpages/tertilesc3hw-64/tile-42.png
M data/base/texpages/tertilesc3hw-64/tile-44.png
M data/base/texpages/tertilesc3hw-64/tile-45.png
M data/base/texpages/tertilesc3hw-64/tile-46.png
M data/base/texpages/tertilesc3hw-64/tile-54.png
M data/base/texpages/tertilesc3hw-64/tile-61.png
M data/base/texpages/tertilesc3hw-64/tile-63.png
M data/base/texpages/tertilesc3hw-64/tile-68.png
M data/base/texpages/tertilesc3hw-64/tile-69.png
M data/base/texpages/tertilesc3hw-64/tile-71.png
M data/base/texpages/tertilesc3hw-64/tile-76.png
M data/base/texpages/tertilesc3hw-64/tile-77.png
M data/base/texpages/tertilesc3hw-64/tile-78.png
M data/base/tileset/arizona_enum.txt
M data/base/tileset/arizonadecals.txt
M data/base/tileset/arizonaground.txt
M data/base/tileset/rockiedecals.txt
M data/base/tileset/tertilesc1hwGtype.txt
M data/base/tileset/tertilesc3hwGtype.txt
M data/base/tileset/urbandecals.txt
M data/base/wrf/vidmem.wrf
M data/mp/wrf/vidmem.wrf
Log Message:
-----------
Texture changes by several people.
Cliff decals by Jorzi, sand support by Mysteryem, new rocky ground texture by
MaNGusT, minor tweaks by NoQ.
Cliffs should now be visible.
Commit: 74d8086132a3f847ea13b88254096fe68a30474b
https://github.com/Warzone2100/warzone2100/commit/74d8086132a3f847ea13b88254096fe68a30474b
Author: Cyp <c...@wz2100.net>
Date: 2012-06-09 (Sat, 09 Jun 2012)
Changed paths:
M src/combat.cpp
Log Message:
-----------
Always reload weapons when bar is full.
Weapons would only reload if completely empty. If not completely empty, the
reloading bar was meaningless.
Commit: 7e18c2a58a4c73941f4fdd6aba238e162f81f641
https://github.com/Warzone2100/warzone2100/commit/7e18c2a58a4c73941f4fdd6aba238e162f81f641
Author: cybersphinx <chr....@gmx.net>
Date: 2012-06-09 (Sat, 09 Jun 2012)
Changed paths:
M COPYING.NONGPL
Log Message:
-----------
Update COPYING.NONGPL.
Closes #3533, refs #3534.
Commit: d51cea925ba706b58b14ff66dd32f2ce133c1baa
https://github.com/Warzone2100/warzone2100/commit/d51cea925ba706b58b14ff66dd32f2ce133c1baa
Author: cybersphinx <chr....@gmx.net>
Date: 2012-06-09 (Sat, 09 Jun 2012)
Changed paths:
M ChangeLog
Log Message:
-----------
Update ChangeLog.
Commit: aca180e0e860f42206bc9be21d9e7a65638afbec
https://github.com/Warzone2100/warzone2100/commit/aca180e0e860f42206bc9be21d9e7a65638afbec
Author: Christian Ohm <chr....@gmx.net>
Date: 2012-06-09 (Sat, 09 Jun 2012)
Changed paths:
M COPYING.NONGPL
M data/base/texpages/page-25-sky-urban.png
Log Message:
-----------
New skybox for urban maps.
Closes #3534.
Commit: c7e72b30e917459d15da0f9e2bda2ac23c16ab36
https://github.com/Warzone2100/warzone2100/commit/c7e72b30e917459d15da0f9e2bda2ac23c16ab36
Author: safety0ff <safety...@users.sourceforge.net>
Date: 2012-06-10 (Sun, 10 Jun 2012)
Changed paths:
M lib/ivis_opengl/piematrix.h
M src/display3d.cpp
Log Message:
-----------
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: 2012-06-10 (Sun, 10 Jun 2012)
Changed paths:
M COPYING.NONGPL
M ChangeLog
M data/base/texpages/page-100-rock-earth-rockies.png
A data/base/texpages/page-109-sand-arizona.png
M data/base/texpages/page-25-sky-urban.png
M data/base/texpages/tertilesc1hw-128/tile-18.png
M data/base/texpages/tertilesc1hw-128/tile-45.png
M data/base/texpages/tertilesc1hw-128/tile-46.png
M data/base/texpages/tertilesc1hw-128/tile-71.png
M data/base/texpages/tertilesc1hw-128/tile-75.png
M data/base/texpages/tertilesc1hw-16/tile-18.png
M data/base/texpages/tertilesc1hw-16/tile-45.png
M data/base/texpages/tertilesc1hw-16/tile-46.png
M data/base/texpages/tertilesc1hw-16/tile-71.png
M data/base/texpages/tertilesc1hw-16/tile-75.png
M data/base/texpages/tertilesc1hw-32/tile-18.png
M data/base/texpages/tertilesc1hw-32/tile-45.png
M data/base/texpages/tertilesc1hw-32/tile-46.png
M data/base/texpages/tertilesc1hw-32/tile-71.png
M data/base/texpages/tertilesc1hw-32/tile-75.png
M data/base/texpages/tertilesc1hw-64/tile-18.png
M data/base/texpages/tertilesc1hw-64/tile-45.png
M data/base/texpages/tertilesc1hw-64/tile-46.png
M data/base/texpages/tertilesc1hw-64/tile-71.png
M data/base/texpages/tertilesc1hw-64/tile-75.png
M data/base/texpages/tertilesc2hw-128/tile-68.png
M data/base/texpages/tertilesc2hw-128/tile-69.png
M data/base/texpages/tertilesc2hw-128/tile-70.png
M data/base/texpages/tertilesc2hw-16/tile-68.png
M data/base/texpages/tertilesc2hw-16/tile-69.png
M data/base/texpages/tertilesc2hw-16/tile-70.png
M data/base/texpages/tertilesc2hw-32/tile-68.png
M data/base/texpages/tertilesc2hw-32/tile-69.png
M data/base/texpages/tertilesc2hw-32/tile-70.png
M data/base/texpages/tertilesc2hw-64/tile-68.png
M data/base/texpages/tertilesc2hw-64/tile-69.png
M data/base/texpages/tertilesc2hw-64/tile-70.png
M data/base/texpages/tertilesc3hw-128/tile-09.png
M data/base/texpages/tertilesc3hw-128/tile-18.png
M data/base/texpages/tertilesc3hw-128/tile-29.png
M data/base/texpages/tertilesc3hw-128/tile-30.png
M data/base/texpages/tertilesc3hw-128/tile-42.png
M data/base/texpages/tertilesc3hw-128/tile-44.png
M data/base/texpages/tertilesc3hw-128/tile-45.png
M data/base/texpages/tertilesc3hw-128/tile-46.png
M data/base/texpages/tertilesc3hw-128/tile-54.png
M data/base/texpages/tertilesc3hw-128/tile-61.png
M data/base/texpages/tertilesc3hw-128/tile-63.png
M data/base/texpages/tertilesc3hw-128/tile-68.png
M data/base/texpages/tertilesc3hw-128/tile-69.png
M data/base/texpages/tertilesc3hw-128/tile-71.png
M data/base/texpages/tertilesc3hw-128/tile-76.png
M data/base/texpages/tertilesc3hw-128/tile-77.png
M data/base/texpages/tertilesc3hw-128/tile-78.png
M data/base/texpages/tertilesc3hw-16/tile-09.png
M data/base/texpages/tertilesc3hw-16/tile-18.png
M data/base/texpages/tertilesc3hw-16/tile-29.png
M data/base/texpages/tertilesc3hw-16/tile-30.png
M data/base/texpages/tertilesc3hw-16/tile-42.png
M data/base/texpages/tertilesc3hw-16/tile-44.png
M data/base/texpages/tertilesc3hw-16/tile-45.png
M data/base/texpages/tertilesc3hw-16/tile-46.png
M data/base/texpages/tertilesc3hw-16/tile-54.png
M data/base/texpages/tertilesc3hw-16/tile-61.png
M data/base/texpages/tertilesc3hw-16/tile-63.png
M data/base/texpages/tertilesc3hw-16/tile-68.png
M data/base/texpages/tertilesc3hw-16/tile-69.png
M data/base/texpages/tertilesc3hw-16/tile-71.png
M data/base/texpages/tertilesc3hw-16/tile-76.png
M data/base/texpages/tertilesc3hw-16/tile-77.png
M data/base/texpages/tertilesc3hw-16/tile-78.png
M data/base/texpages/tertilesc3hw-32/tile-09.png
M data/base/texpages/tertilesc3hw-32/tile-18.png
M data/base/texpages/tertilesc3hw-32/tile-29.png
M data/base/texpages/tertilesc3hw-32/tile-30.png
M data/base/texpages/tertilesc3hw-32/tile-42.png
M data/base/texpages/tertilesc3hw-32/tile-44.png
M data/base/texpages/tertilesc3hw-32/tile-45.png
M data/base/texpages/tertilesc3hw-32/tile-46.png
M data/base/texpages/tertilesc3hw-32/tile-54.png
M data/base/texpages/tertilesc3hw-32/tile-61.png
M data/base/texpages/tertilesc3hw-32/tile-63.png
M data/base/texpages/tertilesc3hw-32/tile-68.png
M data/base/texpages/tertilesc3hw-32/tile-69.png
M data/base/texpages/tertilesc3hw-32/tile-71.png
M data/base/texpages/tertilesc3hw-32/tile-76.png
M data/base/texpages/tertilesc3hw-32/tile-77.png
M data/base/texpages/tertilesc3hw-32/tile-78.png
M data/base/texpages/tertilesc3hw-64/tile-09.png
M data/base/texpages/tertilesc3hw-64/tile-18.png
M data/base/texpages/tertilesc3hw-64/tile-29.png
M data/base/texpages/tertilesc3hw-64/tile-30.png
M data/base/texpages/tertilesc3hw-64/tile-42.png
M data/base/texpages/tertilesc3hw-64/tile-44.png
M data/base/texpages/tertilesc3hw-64/tile-45.png
M data/base/texpages/tertilesc3hw-64/tile-46.png
M data/base/texpages/tertilesc3hw-64/tile-54.png
M data/base/texpages/tertilesc3hw-64/tile-61.png
M data/base/texpages/tertilesc3hw-64/tile-63.png
M data/base/texpages/tertilesc3hw-64/tile-68.png
M data/base/texpages/tertilesc3hw-64/tile-69.png
M data/base/texpages/tertilesc3hw-64/tile-71.png
M data/base/texpages/tertilesc3hw-64/tile-76.png
M data/base/texpages/tertilesc3hw-64/tile-77.png
M data/base/texpages/tertilesc3hw-64/tile-78.png
M data/base/tileset/arizona_enum.txt
M data/base/tileset/arizonadecals.txt
M data/base/tileset/arizonaground.txt
M data/base/tileset/rockiedecals.txt
M data/base/tileset/tertilesc1hwGtype.txt
M data/base/tileset/tertilesc3hwGtype.txt
M data/base/tileset/urbandecals.txt
M data/base/wrf/vidmem.wrf
M data/mp/stats/functions.txt
M data/mp/stats/research/multiplayer/research.txt
M data/mp/stats/structures.txt
M data/mp/stats/weapons.txt
M data/mp/wrf/vidmem.wrf
M lib/ivis_opengl/piematrix.h
M src/combat.cpp
M src/display3d.cpp
Log Message:
-----------
Merge branch 'bugfixes'
Compare: https://github.com/Warzone2100/warzone2100/compare/95f2d28...d42095d
------------------------------------------------------------------------------
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
