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

Author: Shoes01

CHANGELOG.txt

@@ -242,7 +242,7 @@ New features:
 - Game can now be completed, game over screens for winning and losing.
 - Randomizer for "New Battle" mode.
 - Your settings in "New Battle" mode will be saved for next time you play.
-- New translations: Ukranian, Bulgarian, Portuguese (Portugal), Spanish (Latin American), Danish.
+- New translations: Ukrainian, Bulgarian, Portuguese (Portugal), Spanish (Latin American), Danish.
 - New soldier names: Italian, Hungarian.
 - Aliens progress their equipment levels, races and aggression over time.
 - Added "Alien Weapon Level" button in New Battle menu.
@@ -343,7 +343,7 @@ Bugfixes:
 Battlescape:
 - Battlescape buttons are now unavailable during alien turn.
 - Fixed bug in map generator regarding nodes outside the map.
-- Improved map generation of alien base assualt missions.
+- Improved map generation of alien base assault missions.
 - The player no longer reveals the tile an alien is standing on when they detect an alien on an unrevealed tile.
 - The camera resets after non-reaction shots.
 - Camera now correctly centers on explosions, and properly detects explosion visibility.

CMakeLists.txt

@@ -39,16 +39,10 @@ if ( IS_DIRECTORY ${DEPS_DIR} )
    set ( SDLMIXER_LIBRARY SDL_mixer )
    set ( SDLIMAGE_LIBRARY SDL_image )
    set ( YAMLCPP_LIBRARY yaml-cpp )
+   set ( YAMLCPP_LIBRARY_DEBUG yaml-cppd )
 else ( )
   find_package ( SDL2 COMPONENTS mixer gfx image)
   find_package ( Yaml_cpp 0.5.0)
-  find_package ( OpenGL )
-
-  if ( NOT OPENGL_FOUND )
-	  message ( FATAL_ERROR "Can't find OpenGL; how does that even happen?" )
-  else ()
-	  include_directories ( ${OPENGL_INCLUDE_DIR} )
-  endif ()
 
   if ( NOT SDL_FOUND )
     message ( FATAL_ERROR "Can't find SDL which is required" )
@@ -86,6 +80,12 @@ else ( )
   endif ( NOT YAMLCPP_FOUND )
 endif()
 
+# Find OpenGL
+find_package ( OpenGL )
+if ( NOT OPENGL_FOUND )
+  message ( FATAL_ERROR "Can't find OpenGL; how does that even happen?" )
+endif ()
+
 # Read version number
 set ( file "${CMAKE_SOURCE_DIR}/src/version.h" )
 file ( READ ${file} lines )

bin/common/Language/en-GB.yml

@@ -6,44 +6,44 @@ cutscenes:
   - type: winGame
     slideshow:
       transitionSeconds: 30
-      musicId: "GMWIN"
+      musicId: GMWIN
       slides:
-        - imagePath: "UFOINTRO/PICT1.LBM"
+        - imagePath: UFOINTRO/PICT1.LBM
           caption: STR_VICTORY_1
           captionSize: [195, 56]
           captionPos: [5, 0]
           captionColor: 249
-        - imagePath: "UFOINTRO/PICT2.LBM"
+        - imagePath: UFOINTRO/PICT2.LBM
           caption: STR_VICTORY_2
           captionSize: [232, 64]
           captionPos: [88, 136]
           captionColor: 249
-        - imagePath: "UFOINTRO/PICT3.LBM"
+        - imagePath: UFOINTRO/PICT3.LBM
           caption: STR_VICTORY_3
           captionSize: [254, 48]
           captionPos: [66, 152]
           captionColor: 249
-        - imagePath: "UFOINTRO/PICT6.LBM"
+        - imagePath: UFOINTRO/PICT6.LBM
           caption: STR_VICTORY_4
           captionSize: [300, 200]
           captionPos: [5, 0]
           captionColor: 249
-        - imagePath: "UFOINTRO/PICT7.LBM"
+        - imagePath: UFOINTRO/PICT7.LBM
           caption: STR_VICTORY_5
           captionSize: [310, 42]
           captionPos: [5, 158]
           captionColor: 249
   - type: loseGame
     slideshow:
       transitionSeconds: 30
-      musicId: "GMLOSE"
+      musicId: GMLOSE
       slides:
-        - imagePath: "UFOINTRO/PICT4.LBM"
+        - imagePath: UFOINTRO/PICT4.LBM
           caption: STR_GAME_OVER_1
           captionSize: [190, 104]
           captionPos: [0, 0]
           captionColor: 249
-        - imagePath: "UFOINTRO/PICT5.LBM"
+        - imagePath: UFOINTRO/PICT5.LBM
           caption: STR_GAME_OVER_2
           captionSize: [200, 34]
           captionPos: [32, 0]

bin/common/Language/en-US.yml

@@ -1,6 +1,7 @@
 
 interfaces:
   - type: mainMenu
+    music: GMSTORY
     elements:
       - id: palette
         color: 0     # brown
@@ -941,6 +942,7 @@ interfaces:
       - id: button
         color: 213   # gold
   - type: soldierMemorial
+    music: GMLOSE
     palette: PAL_BASESCAPE
     elements:
       - id: palette

bin/standard/xcom1/Language/en-GB.yml

@@ -851,4 +851,5 @@ units:
     aggression: 2
     energyRecovery: 20
     spawnUnit: STR_CHRYSSALID_TERRORIST
-    livingWeapon: true
+    livingWeapon: true
+    deathSound: -2