Skip to content

Commit 70afcda

Browse files
myk002myk002
committed
Merge remote-tracking branch 'upstream/master' into sort_soldiers
2 parents 4819d6b + 3c9294c commit 70afcda

49 files changed

Lines changed: 822 additions & 680 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile.am‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,6 @@ openxcom_SOURCES = \
324324
src/Geoscape/CraftErrorState.h \
325325
src/Geoscape/CraftPatrolState.cpp \
326326
src/Geoscape/CraftPatrolState.h \
327-
src/Geoscape/DefeatState.cpp \
328-
src/Geoscape/DefeatState.h \
329327
src/Geoscape/DogfightState.cpp \
330328
src/Geoscape/DogfightState.h \
331329
src/Geoscape/FundingState.cpp \
@@ -370,8 +368,6 @@ openxcom_SOURCES = \
370368
src/Geoscape/UfoDetectedState.h \
371369
src/Geoscape/UfoLostState.cpp \
372370
src/Geoscape/UfoLostState.h \
373-
src/Geoscape/VictoryState.cpp \
374-
src/Geoscape/VictoryState.h \
375371
src/Interface/ArrowButton.cpp \
376372
src/Interface/ArrowButton.h \
377373
src/Interface/Bar.cpp \
@@ -410,12 +406,12 @@ openxcom_SOURCES = \
410406
src/Menu/AbandonGameState.h \
411407
src/Menu/ConfirmLoadState.cpp \
412408
src/Menu/ConfirmLoadState.h \
409+
src/Menu/CutsceneState.cpp \
410+
src/Menu/CutsceneState.h \
413411
src/Menu/DeleteGameState.cpp \
414412
src/Menu/DeleteGameState.h \
415413
src/Menu/ErrorMessageState.cpp \
416414
src/Menu/ErrorMessageState.h \
417-
src/Menu/IntroState.cpp \
418-
src/Menu/IntroState.h \
419415
src/Menu/ListGamesState.cpp \
420416
src/Menu/ListGamesState.h \
421417
src/Menu/ListLoadOriginalState.cpp \
@@ -458,10 +454,14 @@ openxcom_SOURCES = \
458454
src/Menu/PauseState.h \
459455
src/Menu/SaveGameState.cpp \
460456
src/Menu/SaveGameState.h \
457+
src/Menu/SlideshowState.cpp \
458+
src/Menu/SlideshowState.h \
461459
src/Menu/StartState.cpp \
462460
src/Menu/StartState.h \
463461
src/Menu/TestState.cpp \
464462
src/Menu/TestState.h \
463+
src/Menu/VideoState.cpp \
464+
src/Menu/VideoState.h \
465465
src/Resource/ResourcePack.cpp \
466466
src/Resource/ResourcePack.h \
467467
src/Resource/XcomResourcePack.cpp \

‎README.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ at:
2323

2424
Do not use modded versions (e.g. with XcomUtil) as they may cause bugs and
2525
crashes. Copy the UFO subfolders to the UFO subdirectory in OpenXcom's data
26-
folder and/or the TFTD subfolders to the TFTD subdirectory in OpenXcom's data
27-
folder (see below for data folder locations).
26+
or user folder and/or the TFTD subfolders to the TFTD subdirectory in OpenXcom's
27+
data or user folder (see below for folder locations).
2828

2929
## Mods
3030

@@ -87,6 +87,10 @@ passing a commandline argument when running OpenXcom. For example:
8787

8888
openxcom -data "$HOME/bin/OpenXcom/usr/share/openxcom"
8989

90+
or, if you have a fully self-contained installation:
91+
92+
openxcom -data "$HOME/games/openxcom/data" -user "$HOME/games/openxcom/user" -config "$HOME/games/openxcom/config"
93+
9094
### Windows
9195

9296
User and Config folder:

‎bin/TFTD/README.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
Copy all the X-COM: Terror From the Deep subfolders to this directory!
22

3+
If you can't write to this directory, you can also create a TFTD folder in your
4+
user folder (where your OpenXcom savegames are) and copy your TFTD subfolders
5+
there.
6+
37
After the copy, this directory should contain at least the following items:
8+
ANIMS (optional -- not all TFTD versions have this directory)
49
FLOP_INT
510
GEODATA
611
GEOGRAPH

‎bin/UFO/README.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
Copy all the UFO: Enemy Unknown / X-COM: UFO Defense subfolders to this directory!
22

3+
If you can't write to this directory, you can also create a UFO folder in your
4+
user folder (where your OpenXcom savegames are) and copy your UFO subfolders
5+
there.
6+
37
After the copy, this directory should contain at least the following items:
48
GEODATA
59
GEOGRAPH

‎bin/common/Ruleset/soldierNames.rul‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# pull in all *.nam files in the SoldierName virtual directory by default
2+
# mods can override with specific files if desired
3+
soldierNames:
4+
- SoldierName/

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1176,8 +1176,9 @@ en-GB:
11761176
STR_PSISTRENGTHEVAL: "Psi-Strength Evaluation"
11771177
STR_PSISTRENGTHEVAL_DESC: "Evaluates the psionic strength of all soldiers after the appropriate research has been completed."
11781178
STR_REMOVE_SELECTED: "Remove Selected"
1179-
STR_LIVE_ALIENS: "Live Aliens"
1180-
STR_DEAD_ALIENS: "Dead Aliens"
1179+
STR_LIVE_ALIENS: "Live{NEWLINE}Specimens"
1180+
STR_DEAD_ALIENS: "Rejected{NEWLINE}Specimens"
1181+
STR_UNDER_INTERROGATION: "Being{NEWLINE}Studied"
11811182
STR_CONTAINMENT_EXCEEDED: "ALIEN CONTAINMENT LIMITS EXCEEDED!{SMALLLINE}Insufficient containment space at {0}. You must remove excess aliens from containment (who will then die)."
11821183
STR_MANAGE_CONTAINMENT: "Manage Alien Containment"
11831184
STR_STORAGE_EXCEEDED: "STORAGE SPACE EXCEEDED!{SMALLLINE}Insufficient storage space at {0}. You must sell off excess items."

‎bin/standard/xcom1/Language/en-US.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1176,8 +1176,9 @@ en-US:
11761176
STR_PSISTRENGTHEVAL: "Psi-Strength Evaluation"
11771177
STR_PSISTRENGTHEVAL_DESC: "Evaluates the psionic strength of all soldiers after the appropriate research has been completed."
11781178
STR_REMOVE_SELECTED: "Remove Selected"
1179-
STR_LIVE_ALIENS: "Live Aliens"
1180-
STR_DEAD_ALIENS: "Dead Aliens"
1179+
STR_LIVE_ALIENS: "Live{NEWLINE}Specimens"
1180+
STR_DEAD_ALIENS: "Rejected{NEWLINE}Specimens"
1181+
STR_UNDER_INTERROGATION: "Being{NEWLINE}Studied"
11811182
STR_CONTAINMENT_EXCEEDED: "ALIEN CONTAINMENT LIMITS EXCEEDED!{SMALLLINE}Insufficient containment space at {0}. You must remove excess aliens from containment (who will then die)."
11821183
STR_MANAGE_CONTAINMENT: "Manage Alien Containment"
11831184
STR_STORAGE_EXCEEDED: "STORAGE SPACE EXCEEDED!{SMALLLINE}Insufficient storage space at {0}. You must sell off excess items."

‎bin/standard/xcom1/alienDeployments.rul‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1223,8 +1223,8 @@ alienDeployments:
12231223
shade: 15
12241224
race: STR_SECTOID
12251225
nextStage: STR_MARS_THE_FINAL_ASSAULT
1226-
noRetreat: true
12271226
finalDestination: true
1227+
loseCutscene: losegame
12281228
briefing:
12291229
textOffset: -16
12301230
palette: 6
@@ -1380,13 +1380,13 @@ alienDeployments:
13801380
- UBASE
13811381
shade: 5
13821382
race: STR_MIXED
1383-
noRetreat: true
1384-
finalMission: true
1383+
winCutscene: wingame
1384+
loseCutscene: losegame
13851385
briefing:
13861386
textOffset: -16
13871387
palette: 6
13881388
music: GMNEWMAR
13891389
showTarget: false
13901390
showCraft: false
13911391
background: BACK01.SCR
1392-
script: BOSSBATTLE
1392+
script: BOSSBATTLE

‎bin/standard/xcom1/cutscenes.rul‎

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,50 @@
11
cutscenes:
22
- type: intro
3+
useUfoAudioSequence: true
34
videos:
4-
- UFOINTRO/UFOINT.FLI
5+
- UFOINTRO/UFOINT.FLI
6+
- type: wingame
7+
slideshow:
8+
transitionSeconds: 30
9+
musicId: "GMWIN"
10+
slides:
11+
- imagePath: "UFOINTRO/PICT1.LBM"
12+
caption: STR_VICTORY_1
13+
captionSize: [195, 56]
14+
captionPos: [5, 0]
15+
captionColor: 249
16+
- imagePath: "UFOINTRO/PICT2.LBM"
17+
caption: STR_VICTORY_2
18+
captionSize: [232, 64]
19+
captionPos: [88, 136]
20+
captionColor: 249
21+
- imagePath: "UFOINTRO/PICT3.LBM"
22+
caption: STR_VICTORY_3
23+
captionSize: [254, 48]
24+
captionPos: [66, 152]
25+
captionColor: 249
26+
- imagePath: "UFOINTRO/PICT6.LBM"
27+
caption: STR_VICTORY_4
28+
captionSize: [300, 200]
29+
captionPos: [5, 0]
30+
captionColor: 249
31+
- imagePath: "UFOINTRO/PICT7.LBM"
32+
caption: STR_VICTORY_5
33+
captionSize: [310, 42]
34+
captionPos: [5, 158]
35+
captionColor: 249
36+
- type: losegame
37+
slideshow:
38+
transitionSeconds: 30
39+
musicId: "GMLOSE"
40+
slides:
41+
- imagePath: "UFOINTRO/PICT4.LBM"
42+
caption: STR_GAME_OVER_1
43+
captionSize: [190, 104]
44+
captionPos: [0, 0]
45+
captionColor: 249
46+
- imagePath: "UFOINTRO/PICT5.LBM"
47+
caption: STR_GAME_OVER_2
48+
captionSize: [200, 34]
49+
captionPos: [32, 0]
50+
captionColor: 249

‎bin/standard/xcom1/font.rul‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
fontName: Font.dat
2+

0 commit comments

Comments
 (0)