Skip to content

Commit e669d20

Browse files
committed
Avoid conflict: src/Menu/LoadState.cpp
2 parents 59c605f + 6371c92 commit e669d20

134 files changed

Lines changed: 2737 additions & 1213 deletions

File tree

Some content is hidden

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

CHANGELOG.txt

Lines changed: 38 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,63 +2,90 @@ Version 1.0 (In progress)
22
-------------------------
33
New features:
44
General:
5-
- Rudimentary mod support has been added to the ruleset loading, including loading for extra strings, sounds and sprites.
5+
- Rudimentary mod support has been added to the ruleset loading, including:
6+
-- The ability to define extra strings, sounds and sprites.
7+
-- The starting date can now be set in the ruleset.
8+
-- Soldier stat caps are now acquired from the ruleset.
9+
-- Added support for custom images in the UFO craft preview window.
10+
-- Implemented a list weight value for items, which determines where they appear in buy/sell lists.
11+
-- Allow for resizing of UI surfaces through rulesets.
12+
-- Rulesets will now internally number themselves and offset IDs by 1000 to avoid conflicts intelligently.
613
- Begun development on loading TFTD content, specifically .BDY files.
14+
- Various translation updates, including: Polish, Romanian.
715
- Updated soldier names: Italian
816
- New soldier names: Belgian, Dutch, Indian, Polynesian, Slovakian.
9-
- Stat caps are now acquired from the ruleset.
1017
- New Battle will now load available terrains from the ruleset instead of having them hardcoded.
1118
- New Battle now allows unlimited items to be assigned to the craft.
1219
- New Battle only assigns mixed alien races for the Final Base Assualt mission.
1320

1421
Geoscape:
1522
- Automatically end dogfights if the UFO outpaces the fighter and the window is minimised.
23+
- When areas don't have mission data set, they will now fall back to data for an area that does.
24+
- Psionic training at any time option added: allows adding/removing soldiers from psionic training at your discretion rather than on a monthly basis, and updates their progress daily.*
1625

1726
Battlescape:
1827
- Inventory: Control-click an item to attempt to swap it between the ground and your soldier's inventory.
1928
- Inventory: Added ability to define paper dolls for non-player units.
20-
- Path preview has new graphics, which can display flying unit paths.
21-
- Path preview now displays yellow when you can move to a spot but are unable to perform auto shot (or the type of shot you have on reserve) with your remaining TUs.
29+
- Alt-click can now be used as an alternative to right-clicking.
2230
- Various soldier weapon display changes:
2331
-- When using two two-handed weapons, display the one currently in use.
2432
-- Display soldier hands in front of rifles.
2533
-- If holding a pistol and a two-handed weapon, display both while firing.
2634
- Factored height into the throwing calculation.
2735
- Plasma tanks and sectopods now play the correct firing sounds.
28-
- New option added, "2012 item recovery". dead aliens will not drop items.
36+
- 2012 item recovery option added: only captured aliens drop intact weapons.*
37+
- Path preview option updated: displays yellow when you can move to a spot but are unable to perform auto shot (or the type of shot you have on reserve) with your remaining TUs.
38+
- Path preview option updated: can now be set to show arrows, remaining TUs, or both.*
39+
40+
* These features are disabled by default but can be enabled in the advanced options menu or by editing your configuration file.
2941

3042
Bugfixes:
3143

3244
General:
33-
- Fixed classic mouse option, option removed, now default behaviour.
45+
- Fixed "classic mouse behaviour" and made it the default. (You should no longer be able to hold down the left mouse button and drag it down a list, incrementing several items)
3446
- Various Linux and OS X-related fixes.
3547
- Renamable fields no longer accept blank strings. (ie. no more bases, interceptors, or soldiers named "")
3648

3749
Geoscape:
3850
- To avoid lawsuits, sacked soldiers no longer take their armour with them.
39-
- Crashed and landed UFOs no longer display a heading, when that information is available.
51+
- Crashed and landed UFOs no longer display a heading, even if that information is available.
4052
- If a base is lost and a craft from that base is following a UFO but running low on fuel, do not prompt the player to return the craft to the lost base.
4153
- Fighters no longer get quicker shots due to a bug that made them move in and out of their maximum weapon range when changing behaviours rapidly.
42-
- Game now starts with GMGEO1.
54+
- UFOs should no longer escape dogfights too quickly.
55+
- When the game starts, play the "GMGEO1" music track, instead of choosing randomly.
56+
- When only one item remains to research and is added to the active projects, properly clear it from the "new projects" menu.
4357

4458
Battlescape:
59+
- Alien soldiers now reserve less TUs for reaction fire, and commanders reserve more.
60+
- Stop turning when a new enemy is spotted, but ensure units will always face their targets when shooting.
61+
- Re-wrote the reaction fire code to implement fixes and changes, including:
62+
-- Better handling of reaction fire against the last alien in the battle.
63+
-- Reaction shots should only be snap shots, not auto.
64+
-- Firing will trigger a reaction check.
65+
-- Hitting an alien with a non-melee weapon will cause it to face you.
66+
-- When two units spot each other at the same time, no reaction fire will occur.
67+
- Aliens have night vision again, as per the original game, spotting soldiers within 20 tiles regardless of light.
68+
- XCOM soldiers should now always spot aliens within 18 tiles, regardless of light, and 20 tiles in good light.
4569
- Inventory: Allow scrolling of items on the ground when only two tiles of empty space remain, instead of just one.
4670
- When ending a turn, the game will now close doors before setting off explosions.
4771
- When returning a mind controlled alien to alien control, return their lighting to normal.
4872
- Corrected how gravity applies to Reapers.
4973
- Check tiles above explosions for whether items or units need to fall.
50-
- Fixed silacoid ability, and made them immune to fire, so that they don't roast themselves.
74+
- Fixed silacoid attack ability, and made them immune to fire, so that they don't roast themselves.
5175
- Fixed some celatid sprites.
5276
- Stop displaying the PSI button after a psi-capable unit dies.
77+
- Clear waypoints and top displaying the LAUNCH button if the turn is ended while setting waypoints for the blaster launcher.
5378
- Fixed a crash on loading the battlescape.
5479
- Fixed line of sight errors for certain walls.
5580
- Fixed a crash bug relating to automatically ending battles.
5681
- Tank inventories will no longer open during the cydonia phase two transition.
5782
- Properly reset the turn counter for phase two of Cydonia.
5883
- Improved attribution of grenade kills.
5984
- Fixed issues with shooting blaster bombs directly into walls not damaging nearby units.
60-
- Fixed "Sticky" run mode bug.
61-
- Mind controlled aliens no longer count as friendly units when aborting a mission (for scoring purposes).
85+
- Fixed a bug that caused run mode to "stick" after pressing Control while the Strafe setting option was enabled.
86+
- Fixed a bug that caused grenades primed above "0" to still instantly explode when Instant Grenades option was enabled.
87+
- When aborting a mission, mind controlled aliens no longer count as friendly units for scoring purposes.
88+
- Soldiers now panic in a way that's more consistent with the original game.
6289
- All buttons disabled while projectiles are in-flight to disable cheating.
6390
- Instant grenade behaviour fixed.
6491
- Clip recovery fixed.

Makefile.am

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ desktop_DATA = res/linux/openxcom.desktop
2525

2626
pkgdata_DATA = bin/data/README.txt
2727

28-
resourcesdir = $(pkgdatadir)/data/Resources/Pathfinding
29-
resources_DATA = \
28+
pathfindingdir = $(pkgdatadir)/data/Resources/Pathfinding/
29+
pathfinding_DATA = \
3030
bin/data/Resources/Pathfinding/Pathfinding_dir_00.png \
3131
bin/data/Resources/Pathfinding/Pathfinding_dir_01.png \
3232
bin/data/Resources/Pathfinding/Pathfinding_dir_02.png \
@@ -52,6 +52,10 @@ resources_DATA = \
5252
bin/data/Resources/Pathfinding/Pathfinding_dir_22.png \
5353
bin/data/Resources/Pathfinding/Pathfinding_dir_23.png
5454

55+
bulletspritedir = $(pkgdatadir)/data/Resources/BulletSprites/
56+
bulletsprite_DATA = \
57+
bin/data/Resources/BulletSprites/BulletSprites.png
58+
5559
rulesetdir = $(pkgdatadir)/data/Ruleset
5660
ruleset_DATA = bin/data/Ruleset/Xcom1Ruleset.rul
5761

@@ -118,6 +122,7 @@ name_DATA = \
118122

119123
shaderdir = $(pkgdatadir)/data/Shaders
120124
shader_DATA = \
125+
bin/data/Shaders/Raw.OpenGL.shader \
121126
bin/data/Shaders/CRT-interlaced.OpenGL.shader \
122127
bin/data/Shaders/CRT.OpenGL.shader \
123128
bin/data/Shaders/CRT-simple.OpenGL.shader \
@@ -237,14 +242,14 @@ openxcom_SOURCES = \
237242
src/Battlescape/BattleState.h \
238243
src/Battlescape/BriefingState.cpp \
239244
src/Battlescape/BriefingState.h \
240-
src/Battlescape/BulletSprite.cpp \
241-
src/Battlescape/BulletSprite.h \
242245
src/Battlescape/Camera.cpp \
243246
src/Battlescape/Camera.h \
244247
src/Battlescape/CannotReequipState.cpp \
245248
src/Battlescape/CannotReequipState.h \
246249
src/Battlescape/DebriefingState.cpp \
247250
src/Battlescape/DebriefingState.h \
251+
src/Battlescape/EndBattleBState.cpp \
252+
src/Battlescape/EndBattleBState.h \
248253
src/Battlescape/ExplosionBState.cpp \
249254
src/Battlescape/ExplosionBState.h \
250255
src/Battlescape/Explosion.cpp \
@@ -700,7 +705,8 @@ EXTRA_DIST = \
700705
$(pkgdata_DATA) \
701706
$(language_DATA) \
702707
$(name_DATA) \
703-
$(resources_DATA) \
708+
$(pathfinding_DATA) \
709+
$(bulletsprite_DATA) \
704710
$(ruleset_DATA) \
705711
$(shader_DATA) \
706712
$(desktop_DATA) \

bin/data/Language/Bulgarian.lng

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2379,6 +2379,10 @@ STR_ALLOWPSIONICCAPTURE
23792379
Allow psi-capture
23802380
STR_ALLOWPSIONICCAPTURE_DESC
23812381
Mind-controlling all remaining aliens results in victory, and they count as live captures.
2382+
STR_ANYTIMEPSITRAINING
2383+
Psionic training at any time
2384+
STR_ANYTIMEPSITRAINING_DESC
2385+
You can at any time send soldiers into (or removed from) psionic training. Remember, initial training takes from 30 to 60 days.
23822386
STR_NOT_ENOUGH_SPACE
23832387
Not Enough Space!
23842388
STR_WEAPONSELFDESTRUCTION

bin/data/Language/Czech.lng

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2386,6 +2386,10 @@ STR_ALLOWPSIONICCAPTURE
23862386
Povolit psionická zajmutí
23872387
STR_ALLOWPSIONICCAPTURE_DESC
23882388
Psionické ovládnutí zbývajících cizáků ukončí úspěšně misi. Ovládnutí cizáci jsou zajmuti živí.
2389+
STR_ANYTIMEPSITRAINING
2390+
Psionic training at any time
2391+
STR_ANYTIMEPSITRAINING_DESC
2392+
You can at any time send soldiers into (or removed from) psionic training. Remember, initial training takes from 30 to 60 days.
23892393
STR_NOT_ENOUGH_SPACE
23902394
Nedostatek místa.
23912395
STR_WEAPONSELFDESTRUCTION

bin/data/Language/Danish.lng

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2375,6 +2375,10 @@ STR_ALLOWPSIONICCAPTURE
23752375
Allow psi-capture
23762376
STR_ALLOWPSIONICCAPTURE_DESC
23772377
Mind-controlling all remaining aliens results in victory, and they count as live captures.
2378+
STR_ANYTIMEPSITRAINING
2379+
Psionic training at any time
2380+
STR_ANYTIMEPSITRAINING_DESC
2381+
You can at any time send soldiers into (or removed from) psionic training. Remember, initial training takes from 30 to 60 days.
23782382
STR_NOT_ENOUGH_SPACE
23792383
Not Enough Space!
23802384
STR_WEAPONSELFDESTRUCTION

bin/data/Language/English.lng

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2383,6 +2383,10 @@ STR_ALLOWPSIONICCAPTURE
23832383
Allow psi-capture
23842384
STR_ALLOWPSIONICCAPTURE_DESC
23852385
Mind-controlling all remaining aliens results in victory, and they count as live captures.
2386+
STR_ANYTIMEPSITRAINING
2387+
Psionic training at any time
2388+
STR_ANYTIMEPSITRAINING_DESC
2389+
You can at any time send soldiers into (or removed from) psionic training. Remember, initial training takes from 30 to 60 days.
23862390
STR_NOT_ENOUGH_SPACE
23872391
Not Enough Space!
23882392
STR_WEAPONSELFDESTRUCTION

bin/data/Language/EnglishUk.lng

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2383,6 +2383,10 @@ STR_ALLOWPSIONICCAPTURE
23832383
Allow psi-capture
23842384
STR_ALLOWPSIONICCAPTURE_DESC
23852385
Mind-controlling all remaining aliens results in victory, and they count as live captures.
2386+
STR_ANYTIMEPSITRAINING
2387+
Psionic training at any time
2388+
STR_ANYTIMEPSITRAINING_DESC
2389+
You can at any time send soldiers into (or removed from) psionic training. Remember, initial training takes from 30 to 60 days.
23862390
STR_NOT_ENOUGH_SPACE
23872391
Not Enough Space!
23882392
STR_WEAPONSELFDESTRUCTION

bin/data/Language/French.lng

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2379,6 +2379,10 @@ STR_ALLOWPSIONICCAPTURE
23792379
Victoire par psi-captures
23802380
STR_ALLOWPSIONICCAPTURE_DESC
23812381
Autoriser la victoire par psi-capture. Les aliens sont considérés comme capturés vivants.
2382+
STR_ANYTIMEPSITRAINING
2383+
Psionic training at any time
2384+
STR_ANYTIMEPSITRAINING_DESC
2385+
You can at any time send soldiers into (or removed from) psionic training. Remember, initial training takes from 30 to 60 days.
23822386
STR_NOT_ENOUGH_SPACE
23832387
Not Enough Space!
23842388
STR_WEAPONSELFDESTRUCTION

bin/data/Language/German.lng

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2379,6 +2379,10 @@ STR_ALLOWPSIONICCAPTURE
23792379
Aktiviere Gefangennahme durch PSI-Gedankenkontrolle
23802380
STR_ALLOWPSIONICCAPTURE_DESC
23812381
Übernahme eines Aliens durch Gedankenkontrolle über das Missionsende hinaus zählt als Gefangennahme.{NEWLINE}Wenn nur noch durch den Spieler kontrollierte Aliens übrig sind gilt die Mission als gewonnen.
2382+
STR_ANYTIMEPSITRAINING
2383+
Psionic training at any time
2384+
STR_ANYTIMEPSITRAINING_DESC
2385+
You can at any time send soldiers into (or removed from) psionic training. Remember, initial training takes from 30 to 60 days.
23822386
STR_NOT_ENOUGH_SPACE
23832387
Not Enough Space!
23842388
STR_WEAPONSELFDESTRUCTION

bin/data/Language/Hungarian.lng

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2377,6 +2377,10 @@ STR_ALLOWPSIONICCAPTURE
23772377
Psi-elfogás engedélyezése
23782378
STR_ALLOWPSIONICCAPTURE_DESC
23792379
Az összes megmaradt élő idegen elmekontroll alá vonása a csata győzelmét eredményezi, és mindegyik élve elfogott idegennek számít.
2380+
STR_ANYTIMEPSITRAINING
2381+
Psionic training at any time
2382+
STR_ANYTIMEPSITRAINING_DESC
2383+
You can at any time send soldiers into (or removed from) psionic training. Remember, initial training takes from 30 to 60 days.
23802384
STR_NOT_ENOUGH_SPACE
23812385
Not Enough Space!
23822386
STR_WEAPONSELFDESTRUCTION

0 commit comments

Comments
 (0)