Showing with 16,360 additions and 14,723 deletions.
  1. +4 −35 COPYING.NONGPL
  2. +65 −0 ChangeLog
  3. +3 −0 Makefile.am
  4. +1 −1 configure.ac
  5. +4 −4 data/base/effects/fxft.pie
  6. +4 −4 data/base/effects/fxlightr.pie
  7. +24 −24 data/base/effects/fxvtl01.pie
  8. +24 −24 data/base/effects/fxvtl04.pie
  9. +40 −40 data/base/effects/fxvtl09.pie
  10. +40 −40 data/base/effects/fxvtl10.pie
  11. +40 −40 data/base/effects/fxvtl11.pie
  12. +40 −40 data/base/effects/fxvtl12.pie
  13. +24 −24 data/base/effects/fxvtl2and3.pie
  14. +24 −24 data/base/effects/fxvtl5to8.pie
  15. +4 −4 data/base/misc/blipart.pie
  16. +4 −4 data/base/misc/blipenm.pie
  17. +4 −4 data/base/misc/blipres.pie
  18. +24 −24 data/base/misc/taljetfx.pie
  19. +24 −24 data/base/misc/tbmjetfx.pie
  20. +40 −40 data/base/misc/tchjetfx.pie
  21. +1 −0 data/base/palette.txt
  22. +1 −1 data/base/script/data/tutorial3.vlo
  23. +129 −129 data/base/stats/templates.txt
  24. +105 −99 data/base/structs/blcfact1.pie
  25. +15 −5 data/base/structs/blfact0.pie
  26. +14 −2 data/base/structs/blfact1.pie
  27. +20 −2 data/base/structs/blfact2.pie
  28. BIN data/base/texpages/page-100-rock-earth-rockies.png
  29. BIN data/base/texpages/page-109-sand-arizona.png
  30. BIN data/base/texpages/page-11-player-buildings.png
  31. BIN data/base/texpages/page-11_tcmask.png
  32. BIN data/base/texpages/page-12-player-buildings.png
  33. BIN data/base/texpages/page-12_tcmask.png
  34. BIN data/base/texpages/page-13-player-buildings.png
  35. BIN data/base/texpages/page-13_tcmask.png
  36. BIN data/base/texpages/page-14-droid-hubs.png
  37. BIN data/base/texpages/page-14_tcmask.png
  38. BIN data/base/texpages/page-17-droid-weapons.png
  39. BIN data/base/texpages/page-17_tcmask.png
  40. BIN data/base/texpages/page-25-sky-urban.png
  41. BIN data/base/texpages/tertilesc1hw-128/tile-18.png
  42. BIN data/base/texpages/tertilesc1hw-128/tile-45.png
  43. BIN data/base/texpages/tertilesc1hw-128/tile-46.png
  44. BIN data/base/texpages/tertilesc1hw-128/tile-71.png
  45. BIN data/base/texpages/tertilesc1hw-128/tile-75.png
  46. BIN data/base/texpages/tertilesc1hw-16/tile-18.png
  47. BIN data/base/texpages/tertilesc1hw-16/tile-45.png
  48. BIN data/base/texpages/tertilesc1hw-16/tile-46.png
  49. BIN data/base/texpages/tertilesc1hw-16/tile-71.png
  50. BIN data/base/texpages/tertilesc1hw-16/tile-75.png
  51. BIN data/base/texpages/tertilesc1hw-32/tile-18.png
  52. BIN data/base/texpages/tertilesc1hw-32/tile-45.png
  53. BIN data/base/texpages/tertilesc1hw-32/tile-46.png
  54. BIN data/base/texpages/tertilesc1hw-32/tile-71.png
  55. BIN data/base/texpages/tertilesc1hw-32/tile-75.png
  56. BIN data/base/texpages/tertilesc1hw-64/tile-18.png
  57. BIN data/base/texpages/tertilesc1hw-64/tile-45.png
  58. BIN data/base/texpages/tertilesc1hw-64/tile-46.png
  59. BIN data/base/texpages/tertilesc1hw-64/tile-71.png
  60. BIN data/base/texpages/tertilesc1hw-64/tile-75.png
  61. BIN data/base/texpages/tertilesc2hw-128/tile-68.png
  62. BIN data/base/texpages/tertilesc2hw-128/tile-69.png
  63. BIN data/base/texpages/tertilesc2hw-128/tile-70.png
  64. BIN data/base/texpages/tertilesc2hw-16/tile-68.png
  65. BIN data/base/texpages/tertilesc2hw-16/tile-69.png
  66. BIN data/base/texpages/tertilesc2hw-16/tile-70.png
  67. BIN data/base/texpages/tertilesc2hw-32/tile-68.png
  68. BIN data/base/texpages/tertilesc2hw-32/tile-69.png
  69. BIN data/base/texpages/tertilesc2hw-32/tile-70.png
  70. BIN data/base/texpages/tertilesc2hw-64/tile-68.png
  71. BIN data/base/texpages/tertilesc2hw-64/tile-69.png
  72. BIN data/base/texpages/tertilesc2hw-64/tile-70.png
  73. BIN data/base/texpages/tertilesc3hw-128/tile-09.png
  74. BIN data/base/texpages/tertilesc3hw-128/tile-18.png
  75. BIN data/base/texpages/tertilesc3hw-128/tile-29.png
  76. BIN data/base/texpages/tertilesc3hw-128/tile-30.png
  77. BIN data/base/texpages/tertilesc3hw-128/tile-42.png
  78. BIN data/base/texpages/tertilesc3hw-128/tile-44.png
  79. BIN data/base/texpages/tertilesc3hw-128/tile-45.png
  80. BIN data/base/texpages/tertilesc3hw-128/tile-46.png
  81. BIN data/base/texpages/tertilesc3hw-128/tile-54.png
  82. BIN data/base/texpages/tertilesc3hw-128/tile-61.png
  83. BIN data/base/texpages/tertilesc3hw-128/tile-63.png
  84. BIN data/base/texpages/tertilesc3hw-128/tile-68.png
  85. BIN data/base/texpages/tertilesc3hw-128/tile-69.png
  86. BIN data/base/texpages/tertilesc3hw-128/tile-71.png
  87. BIN data/base/texpages/tertilesc3hw-128/tile-76.png
  88. BIN data/base/texpages/tertilesc3hw-128/tile-77.png
  89. BIN data/base/texpages/tertilesc3hw-128/tile-78.png
  90. BIN data/base/texpages/tertilesc3hw-16/tile-09.png
  91. BIN data/base/texpages/tertilesc3hw-16/tile-18.png
  92. BIN data/base/texpages/tertilesc3hw-16/tile-29.png
  93. BIN data/base/texpages/tertilesc3hw-16/tile-30.png
  94. BIN data/base/texpages/tertilesc3hw-16/tile-42.png
  95. BIN data/base/texpages/tertilesc3hw-16/tile-44.png
  96. BIN data/base/texpages/tertilesc3hw-16/tile-45.png
  97. BIN data/base/texpages/tertilesc3hw-16/tile-46.png
  98. BIN data/base/texpages/tertilesc3hw-16/tile-54.png
  99. BIN data/base/texpages/tertilesc3hw-16/tile-61.png
  100. BIN data/base/texpages/tertilesc3hw-16/tile-63.png
  101. BIN data/base/texpages/tertilesc3hw-16/tile-68.png
  102. BIN data/base/texpages/tertilesc3hw-16/tile-69.png
  103. BIN data/base/texpages/tertilesc3hw-16/tile-71.png
  104. BIN data/base/texpages/tertilesc3hw-16/tile-76.png
  105. BIN data/base/texpages/tertilesc3hw-16/tile-77.png
  106. BIN data/base/texpages/tertilesc3hw-16/tile-78.png
  107. BIN data/base/texpages/tertilesc3hw-32/tile-09.png
  108. BIN data/base/texpages/tertilesc3hw-32/tile-18.png
  109. BIN data/base/texpages/tertilesc3hw-32/tile-29.png
  110. BIN data/base/texpages/tertilesc3hw-32/tile-30.png
  111. BIN data/base/texpages/tertilesc3hw-32/tile-42.png
  112. BIN data/base/texpages/tertilesc3hw-32/tile-44.png
  113. BIN data/base/texpages/tertilesc3hw-32/tile-45.png
  114. BIN data/base/texpages/tertilesc3hw-32/tile-46.png
  115. BIN data/base/texpages/tertilesc3hw-32/tile-54.png
  116. BIN data/base/texpages/tertilesc3hw-32/tile-61.png
  117. BIN data/base/texpages/tertilesc3hw-32/tile-63.png
  118. BIN data/base/texpages/tertilesc3hw-32/tile-68.png
  119. BIN data/base/texpages/tertilesc3hw-32/tile-69.png
  120. BIN data/base/texpages/tertilesc3hw-32/tile-71.png
  121. BIN data/base/texpages/tertilesc3hw-32/tile-76.png
  122. BIN data/base/texpages/tertilesc3hw-32/tile-77.png
  123. BIN data/base/texpages/tertilesc3hw-32/tile-78.png
  124. BIN data/base/texpages/tertilesc3hw-64/tile-09.png
  125. BIN data/base/texpages/tertilesc3hw-64/tile-18.png
  126. BIN data/base/texpages/tertilesc3hw-64/tile-29.png
  127. BIN data/base/texpages/tertilesc3hw-64/tile-30.png
  128. BIN data/base/texpages/tertilesc3hw-64/tile-42.png
  129. BIN data/base/texpages/tertilesc3hw-64/tile-44.png
  130. BIN data/base/texpages/tertilesc3hw-64/tile-45.png
  131. BIN data/base/texpages/tertilesc3hw-64/tile-46.png
  132. BIN data/base/texpages/tertilesc3hw-64/tile-54.png
  133. BIN data/base/texpages/tertilesc3hw-64/tile-61.png
  134. BIN data/base/texpages/tertilesc3hw-64/tile-63.png
  135. BIN data/base/texpages/tertilesc3hw-64/tile-68.png
  136. BIN data/base/texpages/tertilesc3hw-64/tile-69.png
  137. BIN data/base/texpages/tertilesc3hw-64/tile-71.png
  138. BIN data/base/texpages/tertilesc3hw-64/tile-76.png
  139. BIN data/base/texpages/tertilesc3hw-64/tile-77.png
  140. BIN data/base/texpages/tertilesc3hw-64/tile-78.png
  141. +2 −1 data/base/tileset/arizona_enum.txt
  142. +6 −1 data/base/tileset/arizonadecals.txt
  143. +14 −14 data/base/tileset/arizonaground.txt
  144. +18 −1 data/base/tileset/rockiedecals.txt
  145. +2 −1 data/base/tileset/tertilesc1hwGtype.txt
  146. +2 −2 data/base/tileset/tertilesc3hwGtype.txt
  147. +4 −1 data/base/tileset/urbandecals.txt
  148. +2 −0 data/base/wrf/vidmem.wrf
  149. +8 −8 data/mp/addon.lev
  150. +40 −40 data/mp/effects/fxvtl14.pie
  151. +3 −3 data/mp/stats/functions.txt
  152. +2 −2 data/mp/stats/research/multiplayer/research.txt
  153. +4 −4 data/mp/stats/structures.txt
  154. +329 −329 data/mp/stats/templates.txt
  155. +20 −20 data/mp/stats/weapons.txt
  156. +2 −0 data/mp/wrf/vidmem.wrf
  157. +1 −0 doc/gl/extractGlEnums.sh
  158. +1 −0 doc/gl/extractGlFunctions.sh
  159. BIN doc/gl/wzgl.ods
  160. +126 −0 lib/framework/crc.cpp
  161. +16 −0 lib/framework/crc.h
  162. +5 −0 lib/framework/file.h
  163. +21 −6 lib/framework/frame.cpp
  164. +2 −0 lib/gamelib/gtime.cpp
  165. +53 −31 lib/ivis_opengl/imdload.cpp
  166. +97 −61 lib/ivis_opengl/piedraw.cpp
  167. +9 −0 lib/ivis_opengl/piematrix.h
  168. +1 −0 lib/ivis_opengl/piemode.cpp
  169. +2 −1 lib/ivis_opengl/piepalette.h
  170. +17 −4 lib/ivis_opengl/piestate.cpp
  171. +3 −0 lib/ivis_opengl/piestate.h
  172. +90 −20 lib/ivis_opengl/screen.cpp
  173. +1 −1 lib/ivis_opengl/screen.h
  174. +101 −110 lib/netplay/netplay.cpp
  175. +2 −1 lib/netplay/netplay.h
  176. +12 −11 lib/netplay/netsocket.cpp
  177. +25 −4 lib/netplay/nettypes.cpp
  178. +5 −2 lib/netplay/nettypes.h
  179. +1 −1 lib/script/parse.h
  180. +1 −1 macosx/Warzone.xcodeproj/project.pbxproj
  181. +4 −3 macosx/configs/fetchscripts/Png-FetchSource.sh
  182. +2 −2 macosx/configs/fetchscripts/SetupPrebuiltComponents-Docs.sh
  183. +4 −4 macosx/configs/fetchscripts/Zlib-FetchSource.sh
  184. +427 −410 po/ca_ES.po
  185. +427 −410 po/cs.po
  186. +427 −410 po/da.po
  187. +432 −414 po/de.po
  188. +427 −410 po/en_GB.po
  189. +431 −413 po/es.po
  190. +427 −410 po/et_EE.po
  191. +427 −410 po/fi.po
  192. +456 −450 po/fr.po
  193. +426 −410 po/fy.po
  194. +426 −410 po/ga.po
  195. +1 −2 po/generate-statistics-html.py
  196. +427 −410 po/hr.po
  197. +433 −415 po/hu.po
  198. +427 −410 po/it.po
  199. +427 −410 po/ko.po
  200. +426 −410 po/la.po
  201. +426 −410 po/lt.po
  202. +426 −410 po/nb.po
  203. +562 −582 po/nl.po
  204. +448 −437 po/pl.po
  205. +427 −410 po/pt.po
  206. +432 −414 po/pt_BR.po
  207. +427 −410 po/ro.po
  208. +429 −412 po/ru.po
  209. +427 −410 po/sk.po
  210. +427 −410 po/sl.po
  211. +452 −441 po/tr.po
  212. +427 −410 po/uk_UA.po
  213. +427 −410 po/zh_CN.po
  214. +427 −410 po/zh_TW.po
  215. +9 −8 src/action.cpp
  216. +11 −0 src/astar.cpp
  217. +1 −1 src/clparse.cpp
  218. +8 −0 src/cmddroid.cpp
  219. +16 −8 src/combat.cpp
  220. +2 −2 src/component.cpp
  221. +5 −0 src/configuration.cpp
  222. +0 −1 src/display.cpp
  223. +124 −123 src/display3d.cpp
  224. +6 −7 src/droid.cpp
  225. +2 −1 src/droid.h
  226. +38 −0 src/frontend.cpp
  227. +2 −0 src/frontend.h
  228. +181 −297 src/function.cpp
  229. +66 −34 src/game.cpp
  230. +5 −1 src/hci.cpp
  231. +65 −38 src/init.cpp
  232. +33 −12 src/levels.cpp
  233. +9 −3 src/levels.h
  234. +1 −1 src/loop.cpp
  235. +15 −24 src/main.cpp
  236. +1 −1 src/main.h
  237. +1 −1 src/map.cpp
  238. +4 −2 src/move.cpp
  239. +4 −1 src/multigifts.cpp
  240. +69 −9 src/multiint.cpp
  241. +5 −6 src/multijoin.cpp
  242. +68 −63 src/multimenu.cpp
  243. +1 −1 src/multimenu.h
  244. +4 −24 src/multiopt.cpp
  245. +10 −29 src/multiplay.cpp
  246. +3 −9 src/multiplay.h
  247. +1 −1 src/objmem.cpp
  248. +24 −13 src/qtscriptfuncs.cpp
  249. +4 −2 src/qtscriptfuncs.h
  250. +1 −1 src/scriptvals.h
  251. +3 −10 src/selection.cpp
  252. +74 −43 src/structure.cpp
  253. +3 −3 src/template.cpp
  254. +0 −3 src/terrain.cpp
  255. +1 −1 src/version.cpp
  256. +32 −0 src/visibility.cpp
  257. +18 −5 src/warzoneconfig.cpp
  258. +9 −0 src/warzoneconfig.h
  259. +4 −4 tests/Tests.xcodeproj/project.pbxproj
  260. +1 −0 tests/configs/modeltest-All.xcconfig
  261. +1 −1 tests/configs/scripts/jslist.sh
  262. +1 −1 tests/configs/scripts/maplist.sh
  263. +1 −1 tests/configs/scripts/modellist.sh
  264. +1 −1 tests/modeltest.c
  265. +5 −2 tools/image/.gitignore
  266. +453 −0 tools/image/Image.xcodeproj/project.pbxproj
  267. +17 −0 tools/image/configs/Base-Image.xcconfig
  268. +29 −0 tools/image/configs/Project-All.xcconfig
  269. +40 −0 tools/image/configs/image-All.xcconfig
  270. +17 −0 tools/image/configs/image-Debug.xcconfig
  271. +14 −0 tools/image/configs/image-Release.xcconfig
  272. +11 −0 tools/image/configs/image-StaticAnalyzer.xcconfig
  273. +1 −1 tools/image/image.cpp
  274. +1 −1 tools/map/Makefile.am
  275. +4 −4 win32/warzone2100.rc
39 changes: 4 additions & 35 deletions COPYING.NONGPL
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,46 +8,15 @@ data/texpages/bdrops/backdrop4.png
data/texpages/bdrops/backdrop6.png
- CC0 - Copyright (c) 2010-2011 jorzi
data/base/texpages/page-25-sky-urban.png
- CC BY 2.0 - Adapted from a photo Copyright (c) 2006 Mark A. Vargas
lib/framework/tagfile.*
- Public Domain
lib/netplay/miniupnpc/*
- CC0, original work by cybersphinx
3rdparty/miniupnpc/*
- BSD, copyright Thomas Bernard (http://miniupnp.free.fr)
3rdparty/quesoglc/*
- LGPL 2.1, copyright Bertrand Coconnier
data/base/texpages/page-6-features-rockies.png
- CC BY SA 3.0 - Copyright (c) 2009 <Mysteryem>
data/base/texpages/page-17-droid-weapons.png
- CC BY SA 3.0 - Copyright (c) 2009 <Mysteryem>
data/base/texpages/page-40-ground-plants.png
data/base/texpages/page-41-slightly-cracked-concrete.png
data/base/texpages/page-42-rock.png
data/base/texpages/page-43-mud.png
data/base/texpages/page-53-cracked-concrete.png
data/base/texpages/page-54-snow-grass.png
data/base/texpages/page-55-grass.png
- GPLv2 or later - Copyright (c) 2008 Image*After/Tristan Bethe (imageafter.com)
data/base/texpages/page-44-mud.png
data/base/texpages/page-45-yellow-sand.png
data/base/texpages/page-46-cliff.png
data/base/texpages/page-47-tiles.png
Some source textures have been used which are created by CGTextures.com.
Permission is granted to use these specific textures under the GPLv2 or
any later version (at your option). As additional requirement, this text
should be included in a relevant place in any released product. Note that
textures downloaded from CGTextures.com DO NOT fall under the GPL license
by default.
data/base/texpages/page-48-rubble.png
- CC BY 2.0 - Adapted from a photo Copyright (c) 2006 Peter Kaminski
data/base/texpages/page-49-dirt.png
- CC BY 2.0 - Adapted from a photo Copyright (c) 2005 Jennifer Boyer
data/base/texpages/page-50-rocks.png
- CC BY 2.0 - Adapted from a photo Copyright (c) 2007 Mitch Featherston
data/base/texpages/page-51-debris.png
- CC BY-SA 2.0 - Adapted from a photo Copyright (c) 2006 Bart Everson
data/base/texpages/page-52-plants-on-rock.png
- CC BY 2.0 - Adapted from a photo Copyright (c) 2008 Sherrie Thai
data/base/texpages/page-56-gravel.png
data/base/texpages/page-58-snow-gravel.png
- CC BY 2.0 - Adapted from a photo Copyright (c) 2007 Konstantin Kleine-Niermann
data/base/components/prop/prsrwhl1.pie
data/base/components/prop/prslwhl1.pie
data/base/components/prop/prmrwhl1.pie
Expand Down
65 changes: 65 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,68 @@
2012-06-20: Version 3.1 beta11
* General:
* Change: CB sensor also defends allies (commit:313738ed235c69c64c83eb9b987d63efc95d8782)
* Change: Structures with no cost to build (oil derricks) deconstruct when abandoned, taking one minute for 100% build progress (commit:5ba90fec427096f6016867852ce696126514d378)
* Change: Queue building on burning oil wells, trucks wait until the fire stops (commit:353357b1b6f3b8a12131abd7c2c2cef571402e5b)
* Fix: Pathfinding improvements (commit:d11516795a7d98a6bcf0cdeafe159435108344a4, commit:57a56f21c372e268a645e6312b3f1c5a95a98000, commit:f7c6e38aa8e06051c6ac6e42ab9bbaf1b760c9e8)
* Fix: Loading of rearm pads in savegames (ticket:3518, commit:eb3001bd2fb6c0494abb3677cd05f62c1b0d8a4a)
* Fix: CB fire against mobile targets (ticket:3529, commit:193eba2a9f8d4a5fc2dd6ed58dabe4c42e1eaa1a)
* Fix: Weapon reloading (commit:74d8086132a3f847ea13b88254096fe68a30474b)
* Fix: Correct unit count of commanders after loading a savegame (ticket:3062, ticket:3513, commit:b3f3b089f1438bf66fad0e3d4db4447bd2dd6d23)
* Fix: Correct factory numbers after loading a savegame (ticket:3384, commit:737b3d9d24ab1634dafd09558fc8b8a5354ffa9c)
* Fix: Show correct number of selected units (ticket:3479, commit:22799c2b2607949b1920e8d1f143311c167f7a39)
* Fix: Player switching in debug mode (ticket:3264, commit:4a2f7d4399649662f33d146cbe97a12110b8995b)
* Graphics:
* Change: Support texture animations on structures (commit:190c7a99cccc9e831a49712ec431b194f0b65cb8, commit:2d0a089bad6b6b2fdca75556444a66e07ad3dbaa, commit:b59fe8bdb587671c8a382887c10ce804a1d1cd9a, commit:07a2a9671b32d4817942739de723f380c7b88cc7, commit:e636d41472762f0573979c1f05ada2e1484e4eca, commit:da433789c3e272c9c22307b6e74eeb81b2925e07)
* Change: New skybox for urban maps (ticket:3534, commit:aca180e0e860f42206bc9be21d9e7a65638afbec)
* Change: New cliff decals to make cliffs more visible (commit:4a53a0e010452a1ef2a64d92fd3f12c27b451a50)
* Fix: Work better with archaic OpenGL drivers, and add a workaround option to the menu (commit:f54eb00d7044827e011bd3261108bfd446f6a68e, commit:8b8282cc1f9bbddd6c48cef4dbf1681b84160129, commit:0c03151e250a89f23ea5960cd488367112bd3fdc, commit:96272ebf5008ad7ac47865e3493d43a597371944, commit:f5a7fd52c01dbe848ecaab27da4a08fc7eef536a, commit:7867b7abe209613da26ae36897ac864eaee73a14, commit:691df6a1837cec65fe7ac4e924c96868df2b749d)
* Fix: Placement of droid selection boxes and group/commander numbers (ticket:3547, commit:dd8025d10853fe775ef37c0c632647086752b4d9)
* Multiplayer:
* Change: Add oil barrels to map preview (commit:5b07a7b755a529d37c5f308b5ecd6df52da05fec)
* Fix: Sensibly handle multiple maps with the same name (ticket:3531, ticket:3180, commit:15c04ab10f87de89ca7dcae2813834bd1a03247b, commit:205609302755ec151d4768da6cdcefe768059fb1, commit:1461b3a5a81b72381bc3cc3dbc57bbd2f5ce22a7)
* Fix: Don't crash when a player fails to join a game (commit:bf2483cbd7430bd81457a6931c1e526828c7d18a, commit:7a0cd2eccfe733215ee43cab28243d7f29918b75)
* Fix: Don't freeze when a player leaves (ticket:3410, commit:53ce0a7c38822feda52bc9ba24fd45d02a0fa7cc, commit:e0939a02175e56f8a0f1468286f0cbd039053174)
* Fix: Don't desync when a player leaves (commit:35f301b1ba7f76be1bbfc80d8cdb924f12d6ae7e)
* Fix: More consistent ping display (commit:bedd8704f2aef5afd1c2acfa4566a0445d3b22fb)
* Fix: When a player freezes, don't block communication (e.g. chat) between the remaining ones (commit:e14c39fb38ba8c6f11bb4f8e3f0e78a61cb86828)
* Fix: Show all players when a player has left (ticket:3461, commit:00b1968184ff4f215ed7de8b217857f0d5866ad1)
* Fix: Play "Artifact recovered" sound only to the player who actually found it (ticket:3488, commit:acaf4620e0f14d50b0c1696e0236ef9e82ca8e6a)
* Multiplayer balance (commit:ea7b1912fdd6d733288e9b5e783af8cd1c3cf408):
* Nerf flamers, mostly by decreasing incendiary damage of flamers, to compensate the fact that it is unaffected by armor type modifiers. Also decrease incendiary radius to prevent ground flamers from causing incendiary damage to walls.
* Inferno: price 80->110, incendiary radius 64->48, incendiary damage 40->32
* Thermite Cyborg: incendiary damage 38->32
* Plasmite: price 80->130, incendiary radius 96->60, incendiary damage 63->50
* incendiary Mortar: price 150->200, pit price 135->170, incendiary damage 30->22
* incendiary Howitzer: price 250->300, emplacement price 325->400, incendiary damage 60->32
* Thermite Bombs: incendiary damage 200->120
* Plasmite Bombs: incendiary damage 200->140
* Nerf machineguns to compensate the ROF fix that used to decrease with game FPS.
* 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%.
* Whirlwind: fire pause 3->4
* Slightly nerf rocket branch in comparison to cannons. Most importantly, nerf MRAs to compensate the fix in indirect fire mechanics.
* Minipod: range 1152->1088
* MRA: damage 34->29, splash damage 30->29, reload time 145->165
* MC: research points 4800->3600
* HPV: research points 7200->4800
* Make T3 missiles homing, making use of the new homing-indirect targeting class. Nerf Seraphs to compensate that fact.
* Seraph: damage 120->110, splash 100->90, targeting class INDIRECT->HOMING-INDIRECT
* Archangel: targeting class INDIRECT->HOMING-INDIRECT
* Make walls effective even after gates are invented.
* Gates: price 25->75
* Make cannon fortresses cheaper, while nerfing range, in order to make them usable in low oil matchups and less effective in high-oil settings.
* Cannon Fortress: price 1000->900, range 1792->1408
* Translations:
* Update: Polish (ticket:1347, commit:9fc92b7d64200c65f7ea8baab617ed8d19a773cf)
* Update: French (ticket:3483, ticket:3512, commit:badb8c05cb3e9e8a8e1af529288d57b96126e482, commit:113796a9d6a8e34ced9c93bae213ba53b19d5944)
* Update: Hungarian (ticket:3485, commit:d74ebad6a32dbe49771223c347ad9515a101976b)
* Update: Turkish (ticket:3486, commit:a400fe055fd5d176cd809bcfdc0973cf839a4a2c)
* Update: Dutch (ticket:3484, commit:c46d2d56ea3cbfe9d7ba7516f5b1962a2fef2d37)


2012-05-13: Version 3.1 beta10
* General:
* Fix: Loading of skirmish games (ticket:3451, commit:18216c60e76d05ad0fe2bf7d860347f76f70c8f8)
Expand Down
3 changes: 3 additions & 0 deletions Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ EXTRA_DIST= \
pkg/dpkg \
macosx \
3rdparty/SDL/mac \
tools/image/image.cpp \
tools/image/configs \
tools/image/Image.xcodeproj \
po/custom/mac-infoplist.txt \
po/custom/warzone2100.desktop.txt

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AC_PREREQ([2.56])
AC_INIT([Warzone 2100],[3.1_beta10],[http://wz2100.net/],[warzone2100])
AC_INIT([Warzone 2100],[3.1_beta11],[http://wz2100.net/],[warzone2100])

AM_INIT_AUTOMAKE([1.10 tar-ustar])

Expand Down
8 changes: 4 additions & 4 deletions data/base/effects/fxft.pie
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ POINTS 4
-24 41 0
-24 0 0
POLYGONS 4
4200 3 0 1 2 8 1 32 32 31 255 31 225 1 225
4200 3 0 2 3 8 1 32 32 31 255 1 225 1 255
4200 3 3 2 1 8 1 32 32 1 255 1 225 31 225
4200 3 3 1 0 8 1 32 32 1 255 31 225 31 255
4200 3 0 1 2 8 100 32 32 31 255 31 225 1 225
4200 3 0 2 3 8 100 32 32 31 255 1 225 1 255
4200 3 3 2 1 8 100 32 32 1 255 1 225 31 225
4200 3 3 1 0 8 100 32 32 1 255 31 225 31 255
8 changes: 4 additions & 4 deletions data/base/effects/fxlightr.pie
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ POINTS 4
8 8 0
-8 8 0
POLYGONS 4
4200 3 0 1 2 3 1 20 19 183 237 203 237 203 218
4200 3 0 2 3 3 1 20 19 183 237 203 218 183 218
4200 3 3 2 1 3 1 20 19 183 218 203 218 203 237
4200 3 3 1 0 3 1 20 19 183 218 203 237 183 237
4200 3 0 1 2 3 1024 20 19 183 237 203 237 203 218
4200 3 0 2 3 3 1024 20 19 183 237 203 218 183 218
4200 3 3 2 1 3 1024 20 19 183 218 203 218 203 237
4200 3 3 1 0 3 1024 20 19 183 218 203 237 183 237
48 changes: 24 additions & 24 deletions data/base/effects/fxvtl01.pie
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,27 +29,27 @@ POINTS 24
6 14 42
6 14 33
POLYGONS 24
4200 3 0 1 2 8 1 32 15 32 216 32 201 0 201
4200 3 0 2 3 8 1 32 15 32 216 0 201 0 216
4200 3 3 2 1 8 1 32 15 0 216 0 201 32 201
4200 3 3 1 0 8 1 32 15 0 216 32 201 32 216
4200 3 4 5 6 8 1 32 15 32 216 32 201 0 201
4200 3 4 6 7 8 1 32 15 32 216 0 201 0 216
4200 3 7 6 5 8 1 32 15 0 216 0 201 32 201
4200 3 7 5 4 8 1 32 15 0 216 32 201 32 216
4200 3 8 9 10 8 1 32 15 32 216 32 201 0 201
4200 3 8 10 11 8 1 32 15 32 216 0 201 0 216
4200 3 11 10 9 8 1 32 15 0 216 0 201 32 201
4200 3 11 9 8 8 1 32 15 0 216 32 201 32 216
4200 3 12 13 14 8 1 32 15 32 216 32 201 0 201
4200 3 12 14 15 8 1 32 15 32 216 0 201 0 216
4200 3 15 14 13 8 1 32 15 0 216 0 201 32 201
4200 3 15 13 12 8 1 32 15 0 216 32 201 32 216
4200 3 16 17 18 8 1 32 15 32 216 32 201 0 201
4200 3 16 18 19 8 1 32 15 32 216 0 201 0 216
4200 3 19 18 17 8 1 32 15 0 216 0 201 32 201
4200 3 19 17 16 8 1 32 15 0 216 32 201 32 216
4200 3 20 21 22 8 1 32 15 32 216 32 201 0 201
4200 3 20 22 23 8 1 32 15 32 216 0 201 0 216
4200 3 23 22 21 8 1 32 15 0 216 0 201 32 201
4200 3 23 21 20 8 1 32 15 0 216 32 201 32 216
4200 3 0 1 2 8 100 32 15 32 216 32 201 0 201
4200 3 0 2 3 8 100 32 15 32 216 0 201 0 216
4200 3 3 2 1 8 100 32 15 0 216 0 201 32 201
4200 3 3 1 0 8 100 32 15 0 216 32 201 32 216
4200 3 4 5 6 8 100 32 15 32 216 32 201 0 201
4200 3 4 6 7 8 100 32 15 32 216 0 201 0 216
4200 3 7 6 5 8 100 32 15 0 216 0 201 32 201
4200 3 7 5 4 8 100 32 15 0 216 32 201 32 216
4200 3 8 9 10 8 100 32 15 32 216 32 201 0 201
4200 3 8 10 11 8 100 32 15 32 216 0 201 0 216
4200 3 11 10 9 8 100 32 15 0 216 0 201 32 201
4200 3 11 9 8 8 100 32 15 0 216 32 201 32 216
4200 3 12 13 14 8 100 32 15 32 216 32 201 0 201
4200 3 12 14 15 8 100 32 15 32 216 0 201 0 216
4200 3 15 14 13 8 100 32 15 0 216 0 201 32 201
4200 3 15 13 12 8 100 32 15 0 216 32 201 32 216
4200 3 16 17 18 8 100 32 15 32 216 32 201 0 201
4200 3 16 18 19 8 100 32 15 32 216 0 201 0 216
4200 3 19 18 17 8 100 32 15 0 216 0 201 32 201
4200 3 19 17 16 8 100 32 15 0 216 32 201 32 216
4200 3 20 21 22 8 100 32 15 32 216 32 201 0 201
4200 3 20 22 23 8 100 32 15 32 216 0 201 0 216
4200 3 23 22 21 8 100 32 15 0 216 0 201 32 201
4200 3 23 21 20 8 100 32 15 0 216 32 201 32 216
48 changes: 24 additions & 24 deletions data/base/effects/fxvtl04.pie
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,27 +29,27 @@ POINTS 24
6 18 40
6 18 32
POLYGONS 24
4200 3 0 1 2 8 1 32 15 32 216 32 201 0 201
4200 3 0 2 3 8 1 32 15 32 216 0 201 0 216
4200 3 3 2 1 8 1 32 15 0 216 0 201 32 201
4200 3 3 1 0 8 1 32 15 0 216 32 201 32 216
4200 3 4 5 6 8 1 32 15 32 216 32 201 0 201
4200 3 4 6 7 8 1 32 15 32 216 0 201 0 216
4200 3 7 6 5 8 1 32 15 0 216 0 201 32 201
4200 3 7 5 4 8 1 32 15 0 216 32 201 32 216
4200 3 8 9 10 8 1 32 15 32 216 32 201 0 201
4200 3 8 10 11 8 1 32 15 32 216 0 201 0 216
4200 3 11 10 9 8 1 32 15 0 216 0 201 32 201
4200 3 11 9 8 8 1 32 15 0 216 32 201 32 216
4200 3 12 13 14 8 1 32 15 32 216 32 201 0 201
4200 3 12 14 15 8 1 32 15 32 216 0 201 0 216
4200 3 15 14 13 8 1 32 15 0 216 0 201 32 201
4200 3 15 13 12 8 1 32 15 0 216 32 201 32 216
4200 3 16 17 18 8 1 32 15 32 216 32 201 0 201
4200 3 16 18 19 8 1 32 15 32 216 0 201 0 216
4200 3 19 18 17 8 1 32 15 0 216 0 201 32 201
4200 3 19 17 16 8 1 32 15 0 216 32 201 32 216
4200 3 20 21 22 8 1 32 15 32 216 32 201 0 201
4200 3 20 22 23 8 1 32 15 32 216 0 201 0 216
4200 3 23 22 21 8 1 32 15 0 216 0 201 32 201
4200 3 23 21 20 8 1 32 15 0 216 32 201 32 216
4200 3 0 1 2 8 100 32 15 32 216 32 201 0 201
4200 3 0 2 3 8 100 32 15 32 216 0 201 0 216
4200 3 3 2 1 8 100 32 15 0 216 0 201 32 201
4200 3 3 1 0 8 100 32 15 0 216 32 201 32 216
4200 3 4 5 6 8 100 32 15 32 216 32 201 0 201
4200 3 4 6 7 8 100 32 15 32 216 0 201 0 216
4200 3 7 6 5 8 100 32 15 0 216 0 201 32 201
4200 3 7 5 4 8 100 32 15 0 216 32 201 32 216
4200 3 8 9 10 8 100 32 15 32 216 32 201 0 201
4200 3 8 10 11 8 100 32 15 32 216 0 201 0 216
4200 3 11 10 9 8 100 32 15 0 216 0 201 32 201
4200 3 11 9 8 8 100 32 15 0 216 32 201 32 216
4200 3 12 13 14 8 100 32 15 32 216 32 201 0 201
4200 3 12 14 15 8 100 32 15 32 216 0 201 0 216
4200 3 15 14 13 8 100 32 15 0 216 0 201 32 201
4200 3 15 13 12 8 100 32 15 0 216 32 201 32 216
4200 3 16 17 18 8 100 32 15 32 216 32 201 0 201
4200 3 16 18 19 8 100 32 15 32 216 0 201 0 216
4200 3 19 18 17 8 100 32 15 0 216 0 201 32 201
4200 3 19 17 16 8 100 32 15 0 216 32 201 32 216
4200 3 20 21 22 8 100 32 15 32 216 32 201 0 201
4200 3 20 22 23 8 100 32 15 32 216 0 201 0 216
4200 3 23 22 21 8 100 32 15 0 216 0 201 32 201
4200 3 23 21 20 8 100 32 15 0 216 32 201 32 216
80 changes: 40 additions & 40 deletions data/base/effects/fxvtl09.pie
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,43 +45,43 @@ POINTS 40
11 28 65
11 28 51
POLYGONS 40
4200 3 0 1 2 8 1 32 15 32 216 32 201 0 201
4200 3 0 2 3 8 1 32 15 32 216 0 201 0 216
4200 3 3 2 1 8 1 32 15 0 216 0 201 32 201
4200 3 3 1 0 8 1 32 15 0 216 32 201 32 216
4200 3 4 5 6 8 1 32 15 32 216 32 201 0 201
4200 3 4 6 7 8 1 32 15 32 216 0 201 0 216
4200 3 7 6 5 8 1 32 15 0 216 0 201 32 201
4200 3 7 5 4 8 1 32 15 0 216 32 201 32 216
4200 3 8 9 10 8 1 32 15 32 216 32 201 0 201
4200 3 8 10 11 8 1 32 15 32 216 0 201 0 216
4200 3 11 10 9 8 1 32 15 0 216 0 201 32 201
4200 3 11 9 8 8 1 32 15 0 216 32 201 32 216
4200 3 12 13 14 8 1 32 15 32 216 32 201 0 201
4200 3 12 14 15 8 1 32 15 32 216 0 201 0 216
4200 3 15 14 13 8 1 32 15 0 216 0 201 32 201
4200 3 15 13 12 8 1 32 15 0 216 32 201 32 216
4200 3 16 17 18 8 1 32 15 32 216 32 201 0 201
4200 3 16 18 19 8 1 32 15 32 216 0 201 0 216
4200 3 19 18 17 8 1 32 15 0 216 0 201 32 201
4200 3 19 17 16 8 1 32 15 0 216 32 201 32 216
4200 3 20 21 22 8 1 32 15 32 216 32 201 0 201
4200 3 20 22 23 8 1 32 15 32 216 0 201 0 216
4200 3 23 22 21 8 1 32 15 0 216 0 201 32 201
4200 3 23 21 20 8 1 32 15 0 216 32 201 32 216
4200 3 24 25 26 8 1 32 15 32 216 32 201 0 201
4200 3 24 26 27 8 1 32 15 32 216 0 201 0 216
4200 3 27 26 25 8 1 32 15 0 216 0 201 32 201
4200 3 27 25 24 8 1 32 15 0 216 32 201 32 216
4200 3 28 29 30 8 1 32 15 32 216 32 201 0 201
4200 3 28 30 31 8 1 32 15 32 216 0 201 0 216
4200 3 31 30 29 8 1 32 15 0 216 0 201 32 201
4200 3 31 29 28 8 1 32 15 0 216 32 201 32 216
4200 3 32 33 34 8 1 32 15 32 216 32 201 0 201
4200 3 32 34 35 8 1 32 15 32 216 0 201 0 216
4200 3 35 34 33 8 1 32 15 0 216 0 201 32 201
4200 3 35 33 32 8 1 32 15 0 216 32 201 32 216
4200 3 36 37 38 8 1 32 15 32 216 32 201 0 201
4200 3 36 38 39 8 1 32 15 32 216 0 201 0 216
4200 3 39 38 37 8 1 32 15 0 216 0 201 32 201
4200 3 39 37 36 8 1 32 15 0 216 32 201 32 216
4200 3 0 1 2 8 100 32 15 32 216 32 201 0 201
4200 3 0 2 3 8 100 32 15 32 216 0 201 0 216
4200 3 3 2 1 8 100 32 15 0 216 0 201 32 201
4200 3 3 1 0 8 100 32 15 0 216 32 201 32 216
4200 3 4 5 6 8 100 32 15 32 216 32 201 0 201
4200 3 4 6 7 8 100 32 15 32 216 0 201 0 216
4200 3 7 6 5 8 100 32 15 0 216 0 201 32 201
4200 3 7 5 4 8 100 32 15 0 216 32 201 32 216
4200 3 8 9 10 8 100 32 15 32 216 32 201 0 201
4200 3 8 10 11 8 100 32 15 32 216 0 201 0 216
4200 3 11 10 9 8 100 32 15 0 216 0 201 32 201
4200 3 11 9 8 8 100 32 15 0 216 32 201 32 216
4200 3 12 13 14 8 100 32 15 32 216 32 201 0 201
4200 3 12 14 15 8 100 32 15 32 216 0 201 0 216
4200 3 15 14 13 8 100 32 15 0 216 0 201 32 201
4200 3 15 13 12 8 100 32 15 0 216 32 201 32 216
4200 3 16 17 18 8 100 32 15 32 216 32 201 0 201
4200 3 16 18 19 8 100 32 15 32 216 0 201 0 216
4200 3 19 18 17 8 100 32 15 0 216 0 201 32 201
4200 3 19 17 16 8 100 32 15 0 216 32 201 32 216
4200 3 20 21 22 8 100 32 15 32 216 32 201 0 201
4200 3 20 22 23 8 100 32 15 32 216 0 201 0 216
4200 3 23 22 21 8 100 32 15 0 216 0 201 32 201
4200 3 23 21 20 8 100 32 15 0 216 32 201 32 216
4200 3 24 25 26 8 100 32 15 32 216 32 201 0 201
4200 3 24 26 27 8 100 32 15 32 216 0 201 0 216
4200 3 27 26 25 8 100 32 15 0 216 0 201 32 201
4200 3 27 25 24 8 100 32 15 0 216 32 201 32 216
4200 3 28 29 30 8 100 32 15 32 216 32 201 0 201
4200 3 28 30 31 8 100 32 15 32 216 0 201 0 216
4200 3 31 30 29 8 100 32 15 0 216 0 201 32 201
4200 3 31 29 28 8 100 32 15 0 216 32 201 32 216
4200 3 32 33 34 8 100 32 15 32 216 32 201 0 201
4200 3 32 34 35 8 100 32 15 32 216 0 201 0 216
4200 3 35 34 33 8 100 32 15 0 216 0 201 32 201
4200 3 35 33 32 8 100 32 15 0 216 32 201 32 216
4200 3 36 37 38 8 100 32 15 32 216 32 201 0 201
4200 3 36 38 39 8 100 32 15 32 216 0 201 0 216
4200 3 39 38 37 8 100 32 15 0 216 0 201 32 201
4200 3 39 37 36 8 100 32 15 0 216 32 201 32 216
Loading