Merge remote-tracking branch 'upstream/master' into loadout_copy_paste

Author: myk002

CHANGELOG.txt

@@ -26,6 +26,18 @@ New features:
 - Transitioned Translation system to GetLocalization rather than maintaining it manually.
 - Complete overhaul of menu system, now totally consistent between main menu/geoscape/battlescape.
 - Saved Games will now indicate the in-game date and time, and if appropriate, turn number.
+- Combo Box and Slider functionality added.
+- Options menu completely overhauled.
+  -- UI volume now adjustable.
+  -- Internal game resolution may be adjusted for both battlescape and geoscape individually.
+  -- All kinds of in-game timings are now adjustable, so you can make it run like your old 286, or pentium.
+  -- Mods can now be activated from in-game, and don't require a restart.
+  -- Many more advanced options added, most of which were previously omitted for requiring a restart.
+  -- Many UFOextender and XComUtil options added (either as advanced options or individual mods)
+- New Battle menu completely overhauled.
+- Support for old or modded savedgames improved, including warnings about potential incompatibilities.
+- Multiline support added for textlists.
+- Support added for multiple data folders.
 
   Geoscape:
 - Automatically end dogfights if the UFO outpaces the fighter and the window is minimised.
@@ -37,6 +49,12 @@ New features:
 - Added estimates for craft repair/refuel times
 - Alien Containment management screen added.
 - Soldier Memorial screen added to keep track of Xcom casualties.
+- Hotkeys for base selection added.
+- Last selected base now preserved on closing base window.
+- Fixed craft renaming not working.
+- Fixed HWPs not reloading when new ammo arrived.
+- Added Prev/Next key shortcuts to Basescape soldier info.
+- Aircraft flight path line indicators added.
 
   Battlescape:
 - Inventory: Control-click an item to attempt to swap it between the ground and your soldier's inventory.
@@ -75,6 +93,14 @@ New features:
 - When using a medi-kit, any injured body part will be selected by default.
 - Sprites added for mind controlled terror unit weapons.
 - Shotgun behaviour added for modded weapons.
+- Deployment data for crafts added, allows for fine-tuned placement of units.
+- New sprites added for alien weapons, courtesy of Arne.
+- TFTD damage formula added.*
+- Melee Aliens will now hit you with their strength rather than a static value.
+- Notification added for disarming grenades pre-battle.
+- Smooth bullet camera mode, follows the bullet as it moves rather than jumping the camera around.*
+- Confirm fire mode, requires a second click to confirm a fire order.*
+- Melee skill now included in hit calculations.
 
 * These features are disabled by default but can be enabled in the advanced options menu or by editing your configuration file.
 
@@ -85,7 +111,9 @@ Bugfixes:
 - Various Linux and OS X-related fixes.
 - Renamable fields no longer accept blank strings. (ie. no more bases, interceptors, or soldiers named "")
 - Can now set the config folder via command line switch (-user)
-
+- Added sprites fixed for OSX.
+- Game icon now correctly displayed in game window on all operating systems.
+- Palette system overhauled to prevent windows changing colours wrongly.
 
   Geoscape:
 - Fixed various source files to properly #include other relevant files. (This should prevent errors compiling the code in some IDEs)
@@ -100,8 +128,12 @@ Bugfixes:
 - When only one item remains to research and is added to the active projects, properly clear it from the "new projects" menu.
 - Research now consumes items only as appropriate.
 - Landed/Crashed UFOs will no longer try to detect Xcom bases.
+- Graphs screen scale corrected.
 - UFO flight-paths fixed to use correct areas for waypoint selection. Flight paths should now mimic vanilla (as much as something that's random can)
-
+- Crafts teleporting when over poles corrected.
+- Rare music bug in base defences fixed.
+- Fix for soldiers in transfer not being counted when handing out promotions.
+- Fix the council congratulating XCom on a job well done as they cancel the project.
 
   Battlescape:
 - Fixes to various UFOpaedia articles.
@@ -161,6 +193,12 @@ Bugfixes:
 - Explosions now play the full animation instead of starting half way through.
 - Lots of bugs regarding flying in power armor and kneeling fixed.
 - Unconscious units being carried into the exit zone will now be properly accounted for.
+- Accuracy formula corrected.
+- Camera movements now follow vanilla formula.
+- Pathfinding preview altered and fixed in many ways.
+  -- Now updates appropriately according to reserve setting.
+  -- No longer thinks that paths moving vertically wipe out all remaining TUs.
+- Energy recovery now in-line with vanilla formula.
 
 
 Version 0.9 (07-05-2013)

bin/data/Language/en-GB.yml

@@ -412,6 +412,8 @@ en-GB:
   STR_DAMAGE_LASER_BEAM: "LASER BEAM"
   STR_DAMAGE_PLASMA_BEAM: "PLASMA BEAM"
   STR_DAMAGE_STUN: "STUN"
+  STR_DAMAGE_MELEE: "MELEE"
+  STR_DAMAGE_ACID: "ACID"
   STR_DAMAGE_SMOKE: "SMOKE"
   STR_SHOT_TYPE: "SHOT TYPE"
   STR_ACCURACY_UC: "ACCURACY"
@@ -1125,29 +1127,31 @@ en-GB:
   STR_ALLOWAUTOSELLPRODUCTION: "Manufacture auto-sale"
   STR_ALLOWAUTOSELLPRODUCTION_DESC: "Right-click the increase button on a manufacturing project's \"total to produce\" to auto-sell."
   STR_ALLOWBUILDINGQUEUE: "Allow building queue"
-  STR_ALLOWBUILDINGQUEUE_DESC: "Unfinished facilities act as links to the access lift when new facilities are placed."
+  STR_ALLOWBUILDINGQUEUE_DESC: "New facilities can be placed next to unfinished ones."
   STR_BATTLEAUTOEND: "Auto-end battle"
   STR_BATTLEAUTOEND_DESC: "Battles automatically end when the last living enemy is neutralized."
   STR_BATTLEINSTANTGRENADE: "Instant grenades"
   STR_BATTLEINSTANTGRENADE_DESC: "Grenades primed to go off in 0 turns will explode immediately when thrown, instead of at the end of the turn."
   STR_BATTLEUFOEXTENDERACCURACY: "UFO Extender accuracy"
   STR_BATTLEUFOEXTENDERACCURACY_DESC: "Accuracy of shots drops off after a certain distance, according to shot type. Adjusted accuracy will be displayed on the cursor."
-  STR_CANMANUFACTUREMOREITEMSPERHOUR: "Sub-hour manufacture"
-  STR_CANMANUFACTUREMOREITEMSPERHOUR_DESC: "Allows manufacturing projects to produce more than one item per hour, like in Terror From The Deep."
+  STR_CANMANUFACTUREMOREITEMSPERHOUR: "TFTD manufacture rules"
+  STR_CANMANUFACTUREMOREITEMSPERHOUR_DESC: "Allows manufacturing projects to produce multiple items per hour, as opposed to X-COM: UFO Defense's one item limit."
   STR_CANTRANSFERCRAFTSWHILEAIRBORNE: "Airborne transfers"
-  STR_CANTRANSFERCRAFTSWHILEAIRBORNE_DESC: "Aircraft currently in-flight can be transferred."
-  STR_CRAFTLAUNCHALWAYS: "Force aircraft launch"
-  STR_CRAFTLAUNCHALWAYS_DESC: "You may force your aircraft into flight, overriding the need to completely refuel and rearm."
+  STR_CANTRANSFERCRAFTSWHILEAIRBORNE_DESC: "Craft currently in-flight can be transferred."
+  STR_CRAFTLAUNCHALWAYS: "Force craft launch"
+  STR_CRAFTLAUNCHALWAYS_DESC: "Craft can be launched even when they aren't ready, overriding the need for maintenance."
   STR_CUSTOMINITIALBASE: "Custom initial base"
   STR_CUSTOMINITIALBASE_DESC: "When starting a new game, you can manually place your starting facilities instead of using the default layout."
+  STR_GLOBESEASONS: "Realistic globe lighting"
+  STR_GLOBESEASONS_DESC: "Uses more realistic projection of sunlight on the Geoscape according to Earth's axial tilt."
   STR_PLAYINTRO: "Play intro"
   STR_PLAYINTRO_DESC: "Show the intro cinematic on startup."
-  STR_SHOWMORESTATSININVENTORYVIEW: "Inventory stats"
+  STR_SHOWMORESTATSININVENTORYVIEW: "Inventory extra stats"
   STR_SHOWMORESTATSININVENTORYVIEW_DESC: "Show extra information on the selected soldier in the inventory screen."
   STR_SNEAKYAI: "Sneaky AI"
   STR_SNEAKYAI_DESC: "AI avoids exposing themselves to the player whenever possible."
-  STR_STRAFE: "Strafe setting"
-  STR_STRAFE_DESC: "Enable strafing, running, and independent tank turret movement. Hold CTRL to use alternate movement methods."
+  STR_STRAFE: "Alternate movement methods"
+  STR_STRAFE_DESC: "Enables strafing, running, and independent tank turret movement when holding CTRL."
   STR_BATTLEEXPLOSIONHEIGHT: "Explosion height"
   STR_BATTLEEXPLOSIONHEIGHT_DESC: "Change how far height-wise explosions may spread.{NEWLINE}(Flat: 0, Round: 3)"
   STR_AUTOSAVE: "Autosave mode"
@@ -1161,8 +1165,8 @@ en-GB:
   STR_NOT_ENOUGH_SPACE: "Not Enough Space!"
   STR_WEAPONSELFDESTRUCTION: "Alien weapon self destruction"
   STR_WEAPONSELFDESTRUCTION_DESC: "Weapons carried by aliens will self destruct if their owner is killed, like in XCOM 2012."
-  STR_SPENDRESEARCHEDITEMS: "Spend Researched items"
-  STR_SPENDRESEARCHEDITEMS_DESC: "Researched items are removed from your stores and will be disassembled, like in XCOM 2012. After \"researching\" living aliens, the body will be returned to the base stores."
+  STR_SPENDRESEARCHEDITEMS: "Spend researched items"
+  STR_SPENDRESEARCHEDITEMS_DESC: "Researched items are disassembled and removed from your stores, like in XCOM 2012. After \"researching\" living aliens, the body will be returned to the base stores."
   STR_SAVE_VOXEL_VIEW: "Save First-Person Screenshot"
   STR_TIME_UNITS_RESERVED_FOR_KNEELING: "Time Units reserved for Kneeling"
   STR_TIME_UNITS_RESERVED_FOR_KNEELING_AND_FIRING: "TUs reserved for Kneeling and Firing"
@@ -1253,7 +1257,7 @@ en-GB:
   STR_GLOBE_FLIGHT_PATHS: "Flight Paths"
   STR_GLOBE_FLIGHT_PATHS_DESC: "Shows craft flight paths on the globe."
   STR_CONTROLS_DESC: "Left-click a shortcut and press a key to change it.{NEWLINE}Right-click a shortcut to disable it."
-  STR_MODS_DESC: "NOTE: Enabled mods immediately take effect on every game played. Be careful when changing mods of existing savegames, as missing content may cause instability and crashes."
+  STR_MODS_DESC: "Changing mods will automatically restart OpenXcom.{NEWLINE}Enabled mods are applied to both new and loaded saved games."
   STR_EDGE_SCROLL: "Edge Scroll"
   STR_EDGE_SCROLL_DESC: "Trigger: Scroll map when the left mouse button is held down on a screen edge.{NEWLINE}Auto: Scroll map when the cursor is over a screen edge."
   STR_TRIGGER_SCROLL: "Trigger"
@@ -1302,21 +1306,30 @@ en-GB:
   STR_DISPLAY_OPTIONS_CONFIRM: "Do you want to keep the current display options?"
   STR_DISPLAY_OPTIONS_REVERT: "Reverting in 0:{0}"
   STR_MISSING_CONTENT_PROMPT: "WARNING:{SMALLLINE}This save relies on mods that are unavailable. Missing content will be removed, and it may fail to load.{NEWLINE}Continue?"
-  STR_INCLUDE_PRIMESTATE_IN_SAVED_LAYOUT: "Include prime-state in the saved equipment-layout"
-  STR_INCLUDE_PRIMESTATE_IN_SAVED_LAYOUT_DESC: "Save and load back the prime-states of the grenades in the equipment-layouts along with the items."
+  STR_INCLUDE_PRIMESTATE_IN_SAVED_LAYOUT: "Save pre-primed grenades"
+  STR_INCLUDE_PRIMESTATE_IN_SAVED_LAYOUT_DESC: "Saves grenades primed during pre-battle inventory in the soldier's equipment layout."
   STR_NEWSEEDONLOAD: "Save scumming"
-  STR_NEWSEEDONLOAD_DESC: "Loading a game will reset the random number seed, so taking the same action can yield different results."
+  STR_NEWSEEDONLOAD_DESC: "Loading a game will reset the random number seed, so taking the same action can yield different results. Doesn't affect Ironman Mode."
   STR_CHANGEVALUEBYMOUSEWHEEL: "Change values with mouse wheel"
   STR_CHANGEVALUEBYMOUSEWHEEL_DESC: "Allows you to use the mouse wheel to increase/decrease values by this amount."
   STR_BATTLEHAIRBLEACH: "Enhanced soldier sprites"
   STR_BATTLEHAIRBLEACH_DESC: "Changes soldier Battlescape sprites to match their inventory look."
   STR_DRAGSCROLLINVERT: "Invert drag-scrolling"
   STR_DRAGSCROLLINVERT_DESC: "Inverts the direction of drag-scrolling. When enabled you drag towards the target, when disabled you drag away instead."
-  STR_BATTLESCAPE_SCALE: "Battlescape Scale"
+  STR_BATTLESCAPE_SCALE: "Battlescape Resolution"
   STR_BATTLESCAPE_SCALE_DESC: "Changes the resolution of the Battlescape viewport.{NEWLINE}EXPERIMENTAL! May cause interface and performance bugs! Check the documentation for more details."
-  STR_GEOSCAPE_SCALE: "Geoscape Scale"
-  STR_SCALE_TO_WINDOW: "To Window"
+  STR_GEOSCAPE_SCALE: "Geoscape Resolution"
   STR_GEOSCAPESCALE_SCALE_DESC: "Changes the resolution of the Geoscape viewport.{NEWLINE}EXPERIMENTAL! May cause interface and performance bugs! Check the documentation for more details."
-  STR_1.5X: "1.5x"
-  STR_2X: "2x"
-  STR_3X: "3x"
+  STR_1.5X: "1.5x Original"
+  STR_2X: "2x Original"
+  STR_THIRD_DISPLAY: "1/3 Display"
+  STR_HALF_DISPLAY: "1/2 Display"
+  STR_FULL_DISPLAY: "Full Display"
+  STR_FPS_LIMIT: "FPS limit"
+  STR_FPS_LIMIT_DESC: "Limits the number of screen updates per second, 0 for no limit. Note: this will only affect software modes, as OpenGL handles this itself."
+  STR_NOALIENPANICMESSAGES: "Supress panic messages for aliens"
+  STR_NOALIENPANICMESSAGES_DESC: "Don't show panic messages for aliens unless it is visible to the player."
+  STR_ALIENBLEEDING: "Alien bleeding"
+  STR_ALIENBLEEDING_DESC: "Allows fatal wounds to be inflicted on most aliens"
+  STR_FIELDPROMOTIONS: "Field promotions"
+  STR_FIELDPROMOTIONS_DESC: "Only soldiers that were present at the mission site are eligible for promotion."