Showing with 10,386 additions and 6,560 deletions.
  1. +13 −0 ChangeLog
  2. +2 −2 configure.ac
  3. +589 −0 data/mp/messages/resmessages1.rmsg
  4. +209 −0 data/mp/messages/resmessages12.rmsg
  5. +729 −0 data/mp/messages/resmessages2.rmsg
  6. +169 −0 data/mp/messages/resmessages23.rmsg
  7. +979 −0 data/mp/messages/resmessages3.rmsg
  8. +749 −0 data/mp/messages/resmessagesall.rmsg
  9. +7 −4 data/mp/multiplay/skirmish/rules.js
  10. +6 −2 lib/exceptionhandler/exceptionhandler.vcxproj
  11. +8 −1 lib/framework/cocoa_wrapper.h
  12. +52 −5 lib/framework/cocoa_wrapper.mm
  13. +49 −23 lib/framework/debug.cpp
  14. +6 −7 lib/framework/debug.h
  15. +6 −2 lib/framework/framework.vcxproj
  16. +6 −2 lib/gamelib/gamelib.vcxproj
  17. +6 −2 lib/ivis_opengl/ivis_opengl.vcxproj
  18. +19 −16 lib/ivis_opengl/screen.cpp
  19. +9 −1 lib/ivis_opengl/screen.h
  20. +44 −11 lib/netplay/netplay.cpp
  21. +1 −1 lib/netplay/netplay.h
  22. +6 −2 lib/netplay/netplay.vcxproj
  23. +2 −0 lib/netplay/netsocket.cpp
  24. +2 −2 lib/netplay/nettypes.cpp
  25. +1 −0 lib/qtgame/qtgame.vcxproj
  26. +6 −2 lib/script/script.vcxproj
  27. +7 −0 lib/sdl/SDL.vcxproj
  28. +6 −2 lib/sequence/sequence.vcxproj
  29. +6 −2 lib/sound/sound.vcxproj
  30. +7 −2 lib/widget/widget.vcxproj
  31. +1 −0 pkg/dpkg/control
  32. +212 −211 po/ca_ES.po
  33. +212 −211 po/cs.po
  34. +212 −211 po/da.po
  35. +210 −209 po/de.po
  36. +212 −211 po/en_GB.po
  37. +256 −272 po/es.po
  38. +212 −211 po/et_EE.po
  39. +204 −209 po/fi.po
  40. +230 −229 po/fr.po
  41. +204 −209 po/fy.po
  42. +204 −209 po/ga.po
  43. +212 −211 po/hr.po
  44. +212 −211 po/hu.po
  45. +212 −211 po/it.po
  46. +212 −211 po/ko.po
  47. +204 −209 po/la.po
  48. +204 −209 po/lt.po
  49. +204 −209 po/nb.po
  50. +212 −211 po/nl.po
  51. +210 −209 po/pl.po
  52. +212 −211 po/pt.po
  53. +212 −211 po/pt_BR.po
  54. +212 −211 po/ro.po
  55. +212 −211 po/ru.po
  56. +212 −211 po/sk.po
  57. +212 −211 po/sl.po
  58. +210 −209 po/tr.po
  59. +212 −211 po/uk_UA.po
  60. +212 −211 po/zh_CN.po
  61. +212 −211 po/zh_TW.po
  62. +12 −9 src/Warzone2100.vcxproj
  63. +0 −3 src/Warzone2100.vcxproj.filters
  64. +3 −2 src/astar.cpp
  65. +1 −0 src/cheat.cpp
  66. +6 −4 src/configuration.cpp
  67. +1 −1 src/display.cpp
  68. +6 −9 src/display3d.cpp
  69. +4 −2 src/frontend.cpp
  70. +2 −4 src/function.cpp
  71. +56 −0 src/game.cpp
  72. +7 −11 src/hci.cpp
  73. +17 −2 src/mapgrid.h
  74. +2 −2 src/message.cpp
  75. +9 −3 src/move.cpp
  76. +2 −1 src/multiint.cpp
  77. +11 −11 src/multiint.h
  78. +9 −0 src/multiplay.cpp
  79. +1 −2 src/qtscriptfuncs.cpp
  80. +1 −1 src/research.cpp
  81. +1 −1 src/scores.cpp
  82. +1 −1 src/scores.h
  83. +4 −2 src/structure.cpp
  84. +0 −1 src/structuredef.h
  85. +2 −1 src/transporter.cpp
  86. +1 −1 src/version.cpp
  87. +153 −0 tools/conversion/rmsg2ini.php
  88. +4 −4 win32/warzone2100.rc
13 changes: 13 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
2012-03-19: Version 3.1_beta7
* General:
* Fix: Don't randomly crash when moving units (ticket:3301, commit:fbc600ecdf9246a34038f58063baa2b460f6c984)
* Fix: When unloading a transporter, put the units on the terrain and not above or below it (ticket:3169, commit:f54529ae0a62b76db6c2bc65a74e60bb021a09e8)
* Fix: Improve pathfinding (commit:c9a618cd821d02b47315c24f4fe0cacecbe04ecc)
* Fix: Save factory numbers to properly restore their order on loading (ticket:3244, commit:c041fb3dab50bb6a6348fd9340bf0d61902e3c4d)
* Multiplayer:
* Fix: Show research messages again in the intelligence screen (ticket:3085, commit:c8dd2f173bda1469dbd20921ba0fab940e73037c)
* Fix: Disable unit design without HQ (ticket:3305, commit:d5a97c039912b4b29b34f8df6bbd925f684aa835)
* Translations:
* Update: French (ticket:3311, commit:f1e38830fd6ab7242a0078db53c9c2dfcb72ff33)
* Update: Spanish (ticket:3335, commit:952f62a87bae585472556f315157b51098c68dcc)

2012-03-13: Version 3.1_beta6
* General:
* Fix: Make VTOLs rearm on rearming pads, not beside them (ticket:3285, commit:b4ad988996732c0266be62a301b9fb0a66940ad1)
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.1git],[http://wz2100.net/],[warzone2100])
AC_INIT([Warzone 2100],[3.1_beta7],[http://wz2100.net/],[warzone2100])

AM_INIT_AUTOMAKE([1.10 tar-ustar])

Expand Down Expand Up @@ -262,7 +262,7 @@ AS_IF([test "x$enable_sound" != "xyes"],[
# Add later for stricter checking: -Wextra -Wmissing-declarations -Wstrict-prototypes
AC_ARG_ENABLE([debug],
AS_HELP_STRING([--enable-debug[=yes/relaxed/profile/debugprofile/optimised/no]],[Compile debug version [[yes]]]),
[ enable_debug=${enableval} ], [ enable_debug=yes ])
[ enable_debug=${enableval} ], [ enable_debug=no ])
AC_MSG_CHECKING([whether to compile in debug mode])
AC_MSG_RESULT([${enable_debug}])

Expand Down
Loading