Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: X2CommunityCore/X2WOTCCommunityHighlander
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 940934d318d3dcd80974fc45cda8cf87008289f1
Choose a base ref
..
head repository: X2CommunityCore/X2WOTCCommunityHighlander
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2a483c0b941a612dc090bff37d4730a02d4f681d
Choose a head ref
Showing with 4 additions and 3 deletions.
  1. +3 −2 X2WOTCCommunityHighlander/Config/XComGame.ini
  2. +1 −1 X2WOTCCommunityHighlander/Src/XComGame/Classes/UIAfterAction.uc
5 changes: 3 additions & 2 deletions X2WOTCCommunityHighlander/Config/XComGame.ini
Original file line number Diff line number Diff line change
@@ -298,8 +298,9 @@ iMixedCharacterPoolChance = 50
;;; Issue #1398 - Change to adjust the delay of the 'Squad member dead' voiceline after a unit is killed
fSquadMemberDeadVoicelineDelay = 3.0f

; Issue #1453 - Uncomment to disable automatic photobooth poster generation in certain circumstances
;;; HL-Docs: feature:DisableAutoPhotos
; Uncomment to disable automatic photobooth poster generation when certain events happen
;bDisableAutomaticMissionPhoto = true
;bDisableAutomaticMemorialPhoto = true
;bDisableAutomaticPromotionPhoto = true
;bDisableAutomaticBondPhoto = true
;bDisableAutomaticBondPhoto = true
Original file line number Diff line number Diff line change
@@ -113,7 +113,7 @@ simulated function InitScreen(XComPlayerController InitController, UIMovie InitM
isBondIconFocused = UIAfterAction_ListItem(m_kSlotList.GetSelectedItem()).BondIcon.bIsFocused; // bsg-jrebar (05/19/17): Keep focus on bond or promote

// Start Issue #1453 - Additional config gate to disable automatic memorial photo
/// HL-Docs: feature:DisableAutoPhotobooth; issue:1453; tags:strategy,tactical
/// HL-Docs: feature:DisableAutoPhotos; issue:1453; tags:strategy,tactical
/// Several places in the game (UIAfterAction, XComHQPresentationLayer, UISoldierBondConfirmScree and UIMissionSummary)
/// request the auto-generation of photos for the photobooth. Such photos are coded to be taken when the user doesn't take
/// a photo manually at the end of a mission, when a soldier above Sergeant rank dies, when a soldier is promoted to Sergeant