Permalink
Browse files

Merge branch 'bugfixes'

Conflicts:
	src/droiddef.h
	src/qtscriptfuncs.cpp
  • Loading branch information...
2 parents ce9eea6 + 9e63fe3 commit 123e5a3a65835b0ab8359afbd6fa6022e875cbf0 @vexed vexed committed Feb 28, 2012
Showing with 1,951 additions and 540 deletions.
  1. +1 −1 data/mp/stats/templates.txt
  2. +83 −99 po/de.po
  3. +57 −53 po/ru.po
  4. +0 −1 src/Makefile.am
  5. +3 −3 src/action.cpp
  6. +2 −1 src/ai.cpp
  7. +2 −1 src/component.cpp
  8. +6 −0 src/design.cpp
  9. +10 −8 src/display.cpp
  10. +1 −0 src/display.h
  11. +3 −3 src/display3d.cpp
  12. +69 −49 src/drive.cpp
  13. +18 −17 src/droid.cpp
  14. +25 −1 src/droiddef.h
  15. +1 −1 src/fpath.cpp
  16. +4 −7 src/function.cpp
  17. +6 −5 src/game.cpp
  18. +2 −2 src/group.cpp
  19. +21 −14 src/hci.cpp
  20. +45 −32 src/intdisplay.cpp
  21. +4 −2 src/intorder.cpp
  22. +1 −1 src/keybind.cpp
  23. +2 −0 src/loop.cpp
  24. +1 −0 src/main.cpp
  25. +1 −0 src/mapdisplay.cpp
  26. +62 −71 src/mission.cpp
  27. +16 −16 src/move.cpp
  28. +1 −1 src/multigifts.cpp
  29. +12 −2 src/multimenu.cpp
  30. +3 −3 src/objmem.cpp
  31. +21 −20 src/order.cpp
  32. +2 −0 src/projectile.cpp
  33. +4 −2 src/qtscriptfuncs.cpp
  34. +10 −11 src/research.cpp
  35. +5 −3 src/scriptai.cpp
  36. +29 −30 src/scriptfuncs.cpp
  37. +1 −0 src/scripttabs.cpp
  38. +4 −4 src/selection.cpp
  39. +4 −4 src/structure.cpp
  40. +2 −0 src/template.cpp
  41. +20 −28 src/transporter.cpp
  42. +3 −0 tests/.gitignore
  43. +1 −0 tests/Tests.xcodeproj/Do not hand edit these files under any circumstances, always use xcode
  44. +929 −0 tests/Tests.xcodeproj/project.pbxproj
  45. +15 −0 tests/configs/Base-Tests.xcconfig
  46. +29 −0 tests/configs/Project-All.xcconfig
  47. +40 −0 tests/configs/maptest-All.xcconfig
  48. +17 −0 tests/configs/maptest-Debug.xcconfig
  49. +14 −0 tests/configs/maptest-Release.xcconfig
  50. +11 −0 tests/configs/maptest-StaticAnalyzer.xcconfig
  51. +40 −0 tests/configs/modeltest-All.xcconfig
  52. +17 −0 tests/configs/modeltest-Debug.xcconfig
  53. +14 −0 tests/configs/modeltest-Release.xcconfig
  54. +11 −0 tests/configs/modeltest-StaticAnalyzer.xcconfig
  55. +40 −0 tests/configs/qslint-All.xcconfig
  56. +17 −0 tests/configs/qslint-Debug.xcconfig
  57. +14 −0 tests/configs/qslint-Release.xcconfig
  58. +11 −0 tests/configs/qslint-StaticAnalyzer.xcconfig
  59. +40 −0 tests/configs/qtscripttest-All.xcconfig
  60. +17 −0 tests/configs/qtscripttest-Debug.xcconfig
  61. +14 −0 tests/configs/qtscripttest-Release.xcconfig
  62. +11 −0 tests/configs/qtscripttest-StaticAnalyzer.xcconfig
  63. +12 −0 tests/configs/scripts/jslist.sh
  64. +12 −0 tests/configs/scripts/maplist.sh
  65. +12 −0 tests/configs/scripts/modellist.sh
  66. +1 −0 ...map/MapUtilities.xcodeproj/Do not hand edit these files under any circumstances, always use xcode
  67. +43 −43 tools/map/MapUtilities.xcodeproj/project.pbxproj
  68. +1 −1 tools/map/configs/Project-All.xcconfig
  69. +1 −0 tools/map/configs/map2png-All.xcconfig
@@ -364,6 +364,6 @@ SK-Mantis-VTOL-HBB,743,Body12SUP,ZNULLBRAIN,ZNULLCONSTRUCT,ZNULLECM,NO,V-Tol,ZNU
SK-Retre-VTOL-HBB,744,Body7ABT,ZNULLBRAIN,ZNULLCONSTRUCT,ZNULLECM,NO,V-Tol,ZNULLREPAIR,DROID,DefaultSensor1Mk1,1
SK-Retal-VTOL-Scourge,745,Body3MBT,ZNULLBRAIN,ZNULLCONSTRUCT,ZNULLECM,NO,V-Tol,ZNULLREPAIR,DROID,DefaultSensor1Mk1,1
SK-Retre-VTOL-Plasmite,746,Body7ABT,ZNULLBRAIN,ZNULLCONSTRUCT,ZNULLECM,NO,V-Tol,ZNULLREPAIR,DROID,DefaultSensor1Mk1,1
-SuperTransport,746,SuperTransportBody,ZNULLBRAIN,ZNULLCONSTRUCT,ZNULLECM,YES,V-Tol,ZNULLREPAIR,TRANSPORTER,DefaultSensor1Mk1,1
+SuperTransport,746,SuperTransportBody,ZNULLBRAIN,ZNULLCONSTRUCT,ZNULLECM,YES,V-Tol,ZNULLREPAIR,SUPERTRANSPORTER,DefaultSensor1Mk1,1
SK-Veng-Hover-Seraph,747,Body10MBT,ZNULLBRAIN,ZNULLCONSTRUCT,ZNULLECM,NO,hover01,ZNULLREPAIR,DROID,DefaultSensor1Mk1,1
Dragon-Hover-SeraphGauss,748,Body14SUP,ZNULLBRAIN,ZNULLCONSTRUCT,ZNULLECM,NO,hover01,ZNULLREPAIR,DROID,DefaultSensor1Mk1,2
Oops, something went wrong.

0 comments on commit 123e5a3

Please sign in to comment.