Merge branch 'master' of github.com:SupSuper/OpenXcom

Author: Shoes01

CMakeLists.txt

@@ -130,6 +130,8 @@ if ( BUILD_PACKAGE )
     endif ()
   endif ( )
   set ( CPACK_PACKAGE_VENDOR "The OpenXcom project" )
+  set ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "Open-source clone of UFO: Enemy Unknown" )
+  set ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/cmake/modules/Description.txt" )
   set ( CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.txt" )
   if ( NOT APPLE )
     set ( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.txt" )

Makefile.am

@@ -161,6 +161,8 @@ openxcom_SOURCES = \
 	src/Battlescape/MedikitState.h \
 	src/Battlescape/MedikitView.cpp \
 	src/Battlescape/MedikitView.h \
+	src/Battlescape/MeleeAttackBState.cpp \
+	src/Battlescape/MeleeAttackBState.h \
 	src/Battlescape/MiniMapState.cpp \
 	src/Battlescape/MiniMapState.h \
 	src/Battlescape/MiniMapView.cpp \
@@ -187,6 +189,8 @@ openxcom_SOURCES = \
 	src/Battlescape/Projectile.h \
 	src/Battlescape/PromotionsState.cpp \
 	src/Battlescape/PromotionsState.h \
+	src/Battlescape/PsiAttackBState.cpp \
+	src/Battlescape/PsiAttackBState.h \
 	src/Battlescape/ScannerState.cpp \
 	src/Battlescape/ScannerState.h \
 	src/Battlescape/ScannerView.cpp \
@@ -540,6 +544,8 @@ openxcom_SOURCES = \
 	src/Ruleset/StatStringCondition.cpp \
 	src/Ruleset/SoundDefinition.h \
 	src/Ruleset/SoundDefinition.cpp \
+	src/Ruleset/Texture.h \
+	src/Ruleset/Texture.cpp \
 	src/Ruleset/UfoTrajectory.cpp \
 	src/Ruleset/UfoTrajectory.h \
 	src/Ruleset/Unit.cpp \

bin/data/Language/en-GB.yml

@@ -1284,6 +1284,10 @@ en-GB:
   STR_MOUNT: "Mountain"
   STR_DESERT: "Desert"
   STR_POLAR: "Polar"
+  STR_URBAN: "City"
+  STR_UBASE: "Alien Base"
+  STR_XBASE: "X-COM Base"
+  STR_MARS: "Mars"  
   STR_MIXED: "Mixed"
   STR_RESTORE_DEFAULTS_QUESTION: "Are you sure you want to restore the default options?"
   STR_DISPLAY_OPTIONS_CONFIRM: "Do you want to keep the current display options?"

bin/data/Language/en-US.yml

@@ -1284,6 +1284,10 @@ en-US:
   STR_MOUNT: "Mountain"
   STR_DESERT: "Desert"
   STR_POLAR: "Polar"
+  STR_URBAN: "City"
+  STR_UBASE: "Alien Base"
+  STR_XBASE: "X-COM Base"
+  STR_MARS: "Mars"
   STR_MIXED: "Mixed"
   STR_RESTORE_DEFAULTS_QUESTION: "Are you sure you want to restore the default options?"
   STR_DISPLAY_OPTIONS_CONFIRM: "Do you want to keep the current display options?"

bin/data/Resources/UI/globe_tftd.png

@@ -832,9 +832,12 @@ alienDeployments:
     civilians: 16
     terrains:
       - URBAN
+    alert: STR_ALIENS_TERRORISE
     briefing:
       palette: 2
-      music: GMENBASE
+      music: GMENBASE    
+    markerName: STR_TERROR_SITE
+    duration: [4, 10]
   - type: STR_ALIEN_BASE_ASSAULT
     data:
       - alienRank: 6
@@ -1147,7 +1150,8 @@ alienDeployments:
       - XBASE
     shade: 5
     briefing:
-      palette: 2
+      palette: 0
+      background: BACK01.SCR
       music: GMENBASE
   - type: STR_MARS_CYDONIA_LANDING
     data:
@@ -1225,6 +1229,7 @@ alienDeployments:
       textOffset: -16
       palette: 6
       music: GMNEWMAR
+      showTarget: false
   - type: STR_MARS_THE_FINAL_ASSAULT
     data:
       - alienRank: 0