Showing with 74,672 additions and 25,316 deletions.
  1. +25 −0 ChangeLog
  2. +2 −2 configure.ac
  3. +2 −0 data/base/images/frontend.img
  4. BIN data/base/images/frontend2.png
  5. +59 −59 data/base/messages/resmessages1.rmsg
  6. +21 −21 data/base/messages/resmessages12.rmsg
  7. +73 −73 data/base/messages/resmessages2.rmsg
  8. +17 −17 data/base/messages/resmessages23.rmsg
  9. +98 −98 data/base/messages/resmessages3.rmsg
  10. +14 −14 data/base/messages/resmessagesall.rmsg
  11. +1 −1 data/base/stats/body.txt
  12. +60 −60 data/mp/messages/resmessages1.rmsg
  13. +21 −21 data/mp/messages/resmessages12.rmsg
  14. +73 −73 data/mp/messages/resmessages2.rmsg
  15. +17 −17 data/mp/messages/resmessages23.rmsg
  16. +98 −98 data/mp/messages/resmessages3.rmsg
  17. +75 −75 data/mp/messages/resmessagesall.rmsg
  18. +25 −25 data/mp/multiplay/maps/4c-greatrift/droid.ini
  19. +58 −58 data/mp/multiplay/maps/4c-greatrift/feature.ini
  20. BIN data/mp/multiplay/maps/4c-greatrift/game.map
  21. +529 −257 data/mp/multiplay/maps/4c-greatrift/struct.ini
  22. +95 −67 data/mp/multiplay/maps/8c-mizamaze/droid.ini
  23. +110 −110 data/mp/multiplay/maps/8c-mizamaze/feature.ini
  24. BIN data/mp/multiplay/maps/8c-mizamaze/game.map
  25. +5,761 −4,004 data/mp/multiplay/maps/8c-mizamaze/struct.ini
  26. +60 −60 data/mp/multiplay/maps/8c-wheeloffortune/droid.ini
  27. +671 −671 data/mp/multiplay/maps/8c-wheeloffortune/feature.ini
  28. BIN data/mp/multiplay/maps/8c-wheeloffortune/game.map
  29. +1,481 −528 data/mp/multiplay/maps/8c-wheeloffortune/struct.ini
  30. BIN data/mp/multiplay/maps/8c-wheeloffortune/ttypes.ttp
  31. +2 −2 data/mp/multiplay/script/scavfact.js
  32. +14 −7 data/mp/multiplay/skirmish/rules.js
  33. +1 −1 data/mp/stats/body.txt
  34. +9 −8 lib/framework/cocoa_wrapper.mm
  35. +6 −1 lib/framework/debug.cpp
  36. +32 −23 lib/ivis_opengl/screen.cpp
  37. +3 −2 lib/ivis_opengl/screen.h
  38. +9 −2 lib/netplay/netlog.cpp
  39. +30 −15 lib/netplay/netplay.cpp
  40. +0 −1 lib/netplay/netplay.h
  41. +1 −1 lib/widget/tip.cpp
  42. +0 −1 macosx/configs/Base-Framework.xcconfig
  43. +10 −3 macosx/configs/FetchPrebuilt.sh
  44. +1 −1 macosx/configs/FetchSource.sh
  45. +1 −1 macosx/configs/Project-All.xcconfig
  46. +3 −3 macosx/configs/fetchscripts/Png-FetchSource.sh
  47. +2 −2 macosx/configs/fetchscripts/SetupPrebuiltComponents-Docs.sh
  48. +1 −1 macosx/configs/mkdmgs.sh
  49. +6 −0 po/POTFILES.in
  50. +2,107 −721 po/ca_ES.po
  51. +2,160 −395 po/cs.po
  52. +2,164 −452 po/da.po
  53. +2,125 −732 po/de.po
  54. +2,172 −747 po/en_GB.po
  55. +2,128 −731 po/es.po
  56. +2,110 −724 po/et_EE.po
  57. +2,119 −343 po/fi.po
  58. +2,120 −723 po/fr.po
  59. +2,117 −327 po/fy.po
  60. +2,114 −327 po/ga.po
  61. +2,123 −667 po/hr.po
  62. +2,186 −804 po/hu.po
  63. +2,112 −722 po/it.po
  64. +2,110 −723 po/ko.po
  65. +2,148 −347 po/la.po
  66. +2,116 −327 po/lt.po
  67. +2,137 −355 po/nb.po
  68. +2,108 −722 po/nl.po
  69. +2,134 −348 po/pl.po
  70. +2,172 −747 po/pt.po
  71. +2,179 −804 po/pt_BR.po
  72. +2,159 −527 po/ro.po
  73. +2,116 −723 po/ru.po
  74. +2,151 −383 po/sk.po
  75. +2,172 −747 po/sl.po
  76. +2,297 −903 po/tr.po
  77. +2,110 −724 po/uk_UA.po
  78. +1 −0 po/update-po.sh
  79. +2,166 −780 po/zh_CN.po
  80. +2,172 −747 po/zh_TW.po
  81. +1 −0 src/cheat.cpp
  82. +10 −4 src/clparse.cpp
  83. +22 −12 src/display.cpp
  84. +1 −1 src/display.h
  85. +28 −14 src/droid.cpp
  86. +1 −1 src/feature.cpp
  87. +15 −34 src/frend.h
  88. +1 −1 src/frontend.cpp
  89. +4 −2 src/game.cpp
  90. +7 −7 src/hci.cpp
  91. +2 −1 src/hci.h
  92. +2 −3 src/intdisplay.cpp
  93. +1 −0 src/intelmap.cpp
  94. +44 −1 src/keybind.cpp
  95. +1 −0 src/keybind.h
  96. +3 −2 src/loop.cpp
  97. +4 −3 src/map.cpp
  98. +2 −1 src/message.cpp
  99. +2 −5 src/move.cpp
  100. +10 −0 src/multibot.cpp
  101. +70 −137 src/multigifts.cpp
  102. +0 −2 src/multigifts.h
  103. +101 −71 src/multiint.cpp
  104. +4 −0 src/multijoin.cpp
  105. +4 −2 src/multiopt.cpp
  106. +20 −3 src/multiplay.cpp
  107. +1 −0 src/multiplay.h
  108. +10 −1 src/multistruct.cpp
  109. +1 −1 src/projectile.cpp
  110. +33 −0 src/qtscriptfuncs.cpp
  111. +3 −3 src/radar.cpp
  112. +1 −1 src/random.h
  113. +3 −1 src/scriptfuncs.cpp
  114. +32 −9 src/structure.cpp
  115. +339 −180 src/terrain.cpp
  116. +1 −1 src/version.cpp
  117. +1 −1 tests/lint.cpp
  118. +1 −1 tools/map/mapload.h
  119. +4 −4 win32/warzone2100.rc
25 changes: 25 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
2012-04-22: Version 3.1_beta8
* General:
* Change: Make screen shake not shake on walls, and the duration depend on what was destroyed (commit:33842677af6b6cb591c5a3a677849eb600e10e2f)
* Fix: Enable truck template when building factory before HQ (ticket:3337, commit:7291bb9b28e3d5835bf9cee6f5e407f4112cc8a9)
* Fix: Problem with continent generation making droids refuse orders (ticket:3269, commit:3bd70ae8b9be93bb19d4bc694b7197277bc412fe)
* Fix: Don't show repair icon for a selected repair droid itself (ticket:3242, commit:1fae45407f91a89e632a6534b4bebc10450c3e31)
* Multiplayer:
* Change: Update GreatRift, MizaMaze and Wheel to include scavengers and new walls, add missing cliff tiles (ticket:2857, ticket:3317, commit:0ad1b227ff63958b1af969f6e6b3d256f8607647)
* Fix: Avoid mixing up droid orders during lag (commit:83f7adecc9ec6d769f10ee4df2e7f8c75a84ecb8)
* Fix: Factories drop artifacts again (commit:29966c5da299f944a0e52ab579d2b3a7ed8d3063, commit:aaeaa4140a157341f68eb827ddbfaf1e90c4261b, commit:8e48e9e422b6a962374e9f822c2de1e95f196942)
* Fix: Disable unit design when HQ gets destroyed (ticket:3342, commit:466880e1cdbc5830210dc8eaaed5a2d0b7781d76)
* Fix: Make unit design/radar depend on the existence of an HQ, not the base setting (commit:d0fc1e580d7fc57a5c10efabc764085835f45e51)
* Lobby:
* Change: Distinguish between wrong version, wrong mod and full game (commit:dc6a4b3eb82d2c062273b9ecd504e7065e3badfd)
* Change: Subtract closed slots from the shown maximum player number (commit:0c5aebfdc1baf3d19d1524b829a23e802d6590a4)
* Fix: Properly handle a disappearing host (ticket:3313, commit:0de4f38295d2db0e1df9db11c6ccb598f5e84d2f)
* Fix: Always show lock icon when a password is set, don't show it in games without password (ticket:3357, commit:bd6c1d203b784a923e9331f67b2cee7226daab99)
* Translations:
* Update: Spanish (ticket:3361, commit:a018ecdbb200dc6f83fc45f326ab82b60a78bdb1)
* Update: Polish (ticket:1347, commit:c0d7331cdc30ac4ccca1703d8a746f3f366ea500, commit:a67868fed5e3035a7d182095b9d49374c2b4047d)
* Update: Hungarian (ticket:3412, commit:b9d6e17f93c5f651c1070c4d89eedaec094794a1, commit:188b4ac5a010e8ab2c1b86b4e77728b76067f713)
* Update: Brazilian (ticket:3415, commit:74bd1b13aed3a369e0c93796d56ee5f323593f27)
* Update: Turkish (ticket:3417, commit:13128367ad68725d310bc3372dfe624b3045a881)
* Update: German (ticket:3418, commit:641092f6cefdc3cadbc871a18dc2e08a3b979932)

2012-03-19: Version 3.1_beta7
* General:
* Fix: Don't randomly crash when moving units (ticket:3301, commit:fbc600ecdf9246a34038f58063baa2b460f6c984)
Expand Down
4 changes: 2 additions & 2 deletions 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_beta7],[http://wz2100.net/],[warzone2100])
AC_INIT([Warzone 2100],[3.1_beta8],[http://wz2100.net/],[warzone2100])

AM_INIT_AUTOMAKE([1.10 tar-ustar])

Expand Down Expand Up @@ -457,7 +457,7 @@ WZ_CPPFLAGS="${WZ_CPPFLAGS} -DLOCALEDIR=\"\\\"\${localedir}\\\"\""
WZ_CPPFLAGS="${WZ_CPPFLAGS} -I\$(top_srcdir)"

# 3rdparty libs
WZ_CPPFLAGS="${WZ_CPPFLAGS} -I\$(top_srcdir)/3rdparty"
WZ_CPPFLAGS="${WZ_CPPFLAGS} -I\$(top_srcdir)/3rdparty -I\$(top_srcdir)/3rdparty/quesoglc"


AC_SUBST([WZ_CPPFLAGS], [${WZ_CPPFLAGS}])
Expand Down
2 changes: 2 additions & 0 deletions data/base/images/frontend.img
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@
3,150,78,29,31,0,0,"IMAGE KEYMAP DEFAULT"
2,237,62,9,10,0,0,"IMAGE MULTIRANK3"
2,121,3,19,19,0,0,"IMAGE NOJOIN"
2,90,0,19,19,0,0,"IMAGE NOJOIN FULL"
2,0,174,19,19,0,0,"IMAGE NOJOIN MOD"
4,0,0,35,24,0,0,"IMAGE ALLI TEAMS HI"
4,36,0,35,24,0,0,"IMAGE ALLI TEAMS"
4,0,27,25,21,0,0,"IMAGE TEAM0"
Expand Down
Binary file modified data/base/images/frontend2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading