Showing with 21,486 additions and 22,204 deletions.
  1. +2 −0 .gitignore
  2. +0 −21 3rdparty/miniupnpc/makefile.win32
  3. +22 −0 ChangeLog
  4. +998 −549 Doxyfile
  5. +4 −2 Makefile.am
  6. +1 −1 autogen.sh
  7. +0 −1 autorevision.conf
  8. +0 −16 build_tools/autorevision/Makefile.am
  9. +0 −829 build_tools/autorevision/autorevision.cpp
  10. +0 −25 build_tools/autorevision/makefile.win32
  11. +0 −8 build_tools/makefile.win32
  12. +3 −3 configure.ac
  13. +1 −1 data/base/multiplay/script/scavfact.js
  14. +1 −5 data/base/multiplay/skirmish/rules.js
  15. +1 −0 data/base/palette.txt
  16. +7 −0 data/base/shaders/tcmask.frag
  17. +63 −63 data/base/structs/blguard3.pie
  18. +48 −30 data/base/structs/blwall2.pie
  19. +73 −30 data/base/structs/blwall3.pie
  20. +144 −128 data/base/structs/blwallc1.pie
  21. +120 −60 data/base/structs/blwallc2.pie
  22. +144 −52 data/base/structs/blwallc3.pie
  23. +73 −48 data/base/structs/blwallh.pie
  24. BIN data/base/texpages/page-12-player-buildings.png
  25. +1 −1 data/base/wrf/cam3/cam3change.wrf
  26. +0 −73 data/makefile.win32
  27. +0 −8 data/mods/makefile.win32
  28. +0 −67 data/mods/multiplay/makefile.win32
  29. +1 −1 data/mp/stats/ecm.txt
  30. +3 −3 doc/Makefile.am
  31. +5 −5 doc/code/mainpage.dox
  32. +0 −13 lib/exceptionhandler/makefile.win32
  33. +6 −3 lib/framework/Makefile.am
  34. +0 −13 lib/framework/frame.cpp
  35. +2 −0 lib/framework/framework.vcxproj
  36. +1 −1 lib/framework/geometry.cpp
  37. +1 −1 lib/framework/i18n.cpp
  38. +0 −38 lib/framework/makefile.win32
  39. +22 −0 lib/framework/stdio_ext.cpp
  40. +5 −0 lib/framework/stdio_ext.h
  41. +14 −0 lib/framework/wzapp.cpp
  42. +5 −0 lib/framework/wzglobal.h
  43. +3 −1 lib/gamelib/gamelib.vcxproj
  44. +0 −23 lib/gamelib/makefile.win32
  45. +0 −31 lib/ivis_opengl/makefile.win32
  46. +7 −0 lib/ivis_opengl/piedraw.cpp
  47. +2 −1 lib/ivis_opengl/piepalette.h
  48. +24 −7 lib/ivis_opengl/piestate.cpp
  49. +2 −0 lib/ivis_opengl/piestate.h
  50. +1 −0 lib/ivis_opengl/pietypes.h
  51. +2 −6 lib/ivis_opengl/screen.cpp
  52. +1 −1 lib/ivis_opengl/tex.h
  53. +0 −17 lib/makefile.win32
  54. +0 −17 lib/netplay/makefile.win32
  55. +2 −2 lib/netplay/netlobby.cpp
  56. +4 −4 lib/netplay/netplay.cpp
  57. +12 −2 lib/qtgame/Makefile.am
  58. +187 −0 lib/qtgame/macosx_screen_resolutions.cpp
  59. +33 −0 lib/qtgame/macosx_screen_resolutions.h
  60. +13 −5 lib/qtgame/qtgame.cpp
  61. +36 −1 lib/qtgame/qtgame.vcxproj
  62. +23 −148 lib/script/event.cpp
  63. +0 −14 lib/script/event.h
  64. +130 −452 lib/script/eventsave.cpp
  65. +2 −2 lib/script/eventsave.h
  66. +6 −11 lib/script/interpreter.cpp
  67. +1 −1 lib/script/interpreter.h
  68. +0 −27 lib/script/makefile.win32
  69. +3 −2 lib/script/parse.h
  70. +3 −9 lib/script/script.h
  71. +2 −0 lib/script/script.vcxproj
  72. +0 −14 lib/sequence/makefile.win32
  73. +0 −18 lib/sound/makefile.win32
  74. +0 −19 lib/widget/makefile.win32
  75. +106 −21 macosx/Warzone.xcodeproj/project.pbxproj
  76. +1 −0 macosx/configs/Base-Framework.xcconfig
  77. +6 −2 macosx/configs/FetchPrebuilt.sh
  78. +0 −1 macosx/configs/FetchSource.sh
  79. +1 −1 macosx/configs/LangDis
  80. +2 −1 macosx/configs/MiniUPnPc-All.xcconfig
  81. +12 −6 macosx/configs/QuesoGLC-All.xcconfig
  82. +2 −1 macosx/configs/Vorbis-All.xcconfig
  83. +40 −25 macosx/configs/mkdmgs.sh
  84. +0 −10 makefile.win32
  85. +0 −20 makerules/common.mk
  86. +0 −19 makerules/config.mk.tmpl
  87. +0 −94 makerules/configure.mk
  88. +0 −13 makerules/exe.mk
  89. +0 −11 makerules/lib.mk
  90. +0 −6 makerules/submake.mk
  91. +0 −8 pkg/makefile.win32
  92. +3 −3 pkg/nsis/Makefile.am
  93. +0 −17 pkg/nsis/makefile.win32
  94. +93 −51 pkg/nsis/warzone2100.nsi
  95. +3 −3 po/Makefile.in.in
  96. +1 −0 po/POTFILES.in
  97. +394 −399 po/ca_ES.po
  98. +392 −400 po/cs.po
  99. +1,055 −1,246 po/da.po
  100. +439 −453 po/de.po
  101. +391 −399 po/en_GB.po
  102. +394 −399 po/es.po
  103. +394 −399 po/et_EE.po
  104. +382 −399 po/fi.po
  105. +394 −399 po/fr.po
  106. +388 −399 po/fy.po
  107. +382 −399 po/ga.po
  108. +394 −399 po/hr.po
  109. +919 −869 po/hu.po
  110. +394 −399 po/it.po
  111. +394 −399 po/ko.po
  112. +379 −399 po/la.po
  113. +379 −399 po/lt.po
  114. +0 −42 po/makefile.win32
  115. +385 −399 po/nb.po
  116. +1,062 −870 po/nl.po
  117. +394 −399 po/pl.po
  118. +394 −399 po/pt.po
  119. +414 −423 po/pt_BR.po
  120. +1,024 −1,033 po/ro.po
  121. +394 −399 po/ru.po
  122. +391 −399 po/sk.po
  123. +391 −399 po/sl.po
  124. +414 −428 po/tr.po
  125. +394 −399 po/uk_UA.po
  126. +3,743 −2,990 po/zh_CN.po
  127. +391 −399 po/zh_TW.po
  128. +0 −2 releaseBranch
  129. +1 −1 src/Makefile.am
  130. +13 −9 src/Warzone2100.vcxproj
  131. +3 −2 src/action.cpp
  132. +12 −14 src/advvis.cpp
  133. +1 −42 src/ai.cpp
  134. +1 −1 src/basedef.h
  135. +26 −30 src/cmddroid.cpp
  136. +20 −19 src/cmddroid.h
  137. +17 −9 src/cmddroiddef.h
  138. +13 −30 src/component.cpp
  139. +3 −2 src/component.h
  140. +0 −6 src/configuration.cpp
  141. +3 −2 src/display.cpp
  142. +68 −65 src/display3d.cpp
  143. +2 −2 src/droid.cpp
  144. +2 −5 src/feature.cpp
  145. +93 −43 src/frontend.cpp
  146. +6 −2 src/frontend.h
  147. +14 −109 src/game.cpp
  148. +1 −11 src/hci.cpp
  149. +1 −1 src/init.cpp
  150. +4 −4 src/intdisplay.cpp
  151. +4 −17 src/keybind.cpp
  152. +1 −2 src/keymap.cpp
  153. +16 −15 src/lighting.cpp
  154. +0 −10 src/loop.cpp
  155. +4 −1 src/main.cpp
  156. +0 −145 src/makefile.win32
  157. +6 −0 src/map.cpp
  158. +3 −0 src/map.h
  159. +1 −1 src/mapdisplay.cpp
  160. +2 −1 src/move.cpp
  161. +12 −59 src/multiint.cpp
  162. +0 −4 src/multiint.h
  163. +1 −1 src/multilimit.cpp
  164. +4 −2 src/multiopt.cpp
  165. +0 −1 src/multiplay.h
  166. +209 −185 src/order.cpp
  167. +58 −46 src/order.h
  168. +116 −108 src/orderdef.h
  169. +0 −59 src/power.cpp
  170. +0 −9 src/power.h
  171. +71 −19 src/qtscript.cpp
  172. +2 −1 src/qtscript.h
  173. +44 −32 src/qtscriptfuncs.cpp
  174. +7 −1 src/radar.cpp
  175. +81 −13 src/raycast.cpp
  176. +1 −11 src/research.cpp
  177. +9 −56 src/scriptfuncs.cpp
  178. +110 −360 src/scriptobj.cpp
  179. +2 −2 src/scriptobj.h
  180. +3 −3 src/stats.cpp
  181. +3 −3 src/stats.h
  182. +4 −13 src/structure.cpp
  183. +1 −0 src/structuredef.h
  184. +2 −0 src/transporter.cpp
  185. +122 −148 src/visibility.cpp
  186. +2 −3 src/visibility.h
  187. +1 −32 src/warzoneconfig.cpp
  188. +0 −2 src/warzoneconfig.h
  189. +1 −1 tests/Makefile.am
  190. +53 −28 tests/lint.cpp
  191. 0 tests/{maptest.c → maptest.cpp}
  192. +1 −1 tools/map/map2lnd.cpp
  193. +1 −1 tools/map/map2preview.cpp
  194. +27 −4 win32/Warzone2100.sln
  195. +0 −11 win32/makefile.win32
  196. +2 −2 win32/warzone2100.rc
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
*.gmo
*.pyc
*.wz
# Doxygen files
/doc/code/html
# LaTeX generated (binary) files
*.aux
*.log
Expand Down
21 changes: 0 additions & 21 deletions 3rdparty/miniupnpc/makefile.win32
View file

This file was deleted.

22 changes: 22 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
master_20111026
* General:
* Change: Show planned structure blueprints to allies (commit:86c945152515478c9982677bd1e482fbc6ff2362)
* Change: Support for ECM jammers (ticket:340, commit:55a6259b121515b2d0ca9b2c580361dca970171d)
* Fix: Prevent VTOLs from getting stuck on buildings (ticket:2534, commit:818e9b423601c923ae0267293d68e64e2830de5c)
* Fix: Prevent droids getting strange orders after loading a savegame (commit:d74a73a34d6ac2e4b006792e95f72855a668804c)
* Fix: Factories build properly again after loading a savegame (commit:850e0e5e004172c6873d6fdfda51bd2607c19aca)
* UI:
* Fix: Correct player placement/colours and buildings in the map preview (ticket:2859, commit:0d6a27380de7dc286d6e0131b3e4e2a26c200f1b, commit:4de9642cd9bc91285eefe6b223cbda3c1493fd59)
* Graphics:
* Change: Remove fog of war/mist options in favour of a combined explored/seen mode (ticket:2920, commit:c04bf74f3a004e95c9d0fa0813a20aa3fdaff079)
* Change: Walls now don't adapt their shape to the terrain, according new models (commit:50f1ce21455ec64c03e2f5bf2d92bc225c364d5d, commit:a4d922dc54cdc2e90a6fb670dcdca6928a2fa682, commit:aac05b3bff0a42de58dbf992dad947ddc7569034, commit:8662843058dad71a4d2452bc2bcdf48e7814c4d4, commit:5839c490b10500c1ff251085ceed9434f2f675aa)
* Translations:
* Update: Simplified Chinese (ticket:2858, ticket:2869, commit:614ca9a8672e09e45bdf926f9144a4e7d437aea5, commit:8e29659f64096d574949098054b4b68942587c54, commit:cd3f9edc42043aee1560386ff0dfda8bda2d5e49)
* Update: Hungarian (ticket:2865, commit:58668d7fd54fe1245a6ca49012663636d124fbe0)
* Update: Brazilian (ticket:2868, commit:fbee38857ac66f4902743ab95d26e792ee620e6f)
* Update: Turkish (ticket:2884, commit:31da7b5d4d23e57bbbcc81b1f0ec576dccfd66ce)
* Update: Danish (commit:1c8d7e4e0450a40ccffd113ac58bde12ea3893ca)
* Update: Romanian (ticket:2906, commit:ffd2ad7adb69641b6b1cb091af1e359e8f692cd4, commit:9d7232eb60b51270cc1a12aa6208a99a9df059a3)
* Update: German (ticket:2898, commit:55632ba308f75283141195c70ffd649b25e1aad3)
* Update: Dutch (commit:0af391ad1db21002d48a6268828e781669953059)

master_20110801
* General:
* Fix: Maps can never override game data (ticket:2825, commit:e0007a217e282326856a23c932665b9a82c379a9)
Expand Down
Loading