Skip to content

Commit ca42f99

Browse files
myk002myk002
committed
Merge remote-tracking branch 'upstream/master' into loadout_copy_paste
Conflicts: src/Battlescape/InventoryState.cpp
2 parents 84bbf00 + 1810eee commit ca42f99

115 files changed

Lines changed: 1568 additions & 2426 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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ New features:
5252
- Dedicated auto-save and quick-save slots added.
5353
- Added ironman mode.
5454
- New loading screen with better error handling.
55+
- Adlib music emulation added, MIDI playback is no longer required.
5556

5657
Geoscape:
5758
- Automatically end dogfights if the UFO outpaces the fighter and the window is minimised.

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ if ( BUILD_PACKAGE )
132132
set ( CPACK_PACKAGE_VENDOR "The OpenXcom project" )
133133
set ( CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.txt" )
134134
if ( NOT APPLE )
135-
set ( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING" )
135+
set ( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.txt" )
136136
endif ()
137137
set ( CPACK_PACKAGE_CONTACT "The OpenXcom project (http://www.openxcom.org)" )
138138
include ( deb )

COPYING renamed to LICENSE.txt

Lines changed: 673 additions & 673 deletions
Large diffs are not rendered by default.

‎Run-Win64-Debug.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
@cd bin\Win64
1+
@cd bin\x64
22
@start Debug\OpenXcom.exe -data "..\data"

‎Run-Win64-Release.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
@cd bin\Win64
1+
@cd bin\x64
22
@start Release\OpenXcom.exe -data "..\data"

‎bin/data/Language/en-GB.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1311,10 +1311,10 @@ en-GB:
13111311
STR_BATTLEHAIRBLEACH_DESC: "Changes soldier Battlescape sprites to match their inventory look."
13121312
STR_DRAGSCROLLINVERT: "Invert drag-scrolling"
13131313
STR_DRAGSCROLLINVERT_DESC: "When enabled, dragging scrolls in the opposite direction to the mouse."
1314-
STR_BATTLESCAPE_SCALE: "Battlescape Resolution"
1315-
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."
1316-
STR_GEOSCAPE_SCALE: "Geoscape Resolution"
1317-
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."
1314+
STR_BATTLESCAPE_SCALE: "Battlescape Scale"
1315+
STR_BATTLESCAPE_SCALE_DESC: "Battlescape viewport scaling mode, based on a fixed resolution (stretched to fit), or a fixed zoom level (expanded to fill)."
1316+
STR_GEOSCAPE_SCALE: "Geoscape Scale"
1317+
STR_GEOSCAPESCALE_SCALE_DESC: "Geoscape viewport scaling mode, based on a fixed resolution (stretched to fit), or a fixed zoom level (expanded to fill)."
13181318
STR_1.5X: "1.5x Original"
13191319
STR_2X: "2x Original"
13201320
STR_THIRD_DISPLAY: "1/3 Display"

‎bin/data/Language/en-US.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1311,10 +1311,10 @@ en-US:
13111311
STR_BATTLEHAIRBLEACH_DESC: "Changes soldier Battlescape sprites to match their inventory look."
13121312
STR_DRAGSCROLLINVERT: "Invert drag-scrolling"
13131313
STR_DRAGSCROLLINVERT_DESC: "When enabled, dragging scrolls in the opposite direction to the mouse."
1314-
STR_BATTLESCAPE_SCALE: "Battlescape Resolution"
1315-
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."
1316-
STR_GEOSCAPE_SCALE: "Geoscape Resolution"
1317-
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."
1314+
STR_BATTLESCAPE_SCALE: "Battlescape Scale"
1315+
STR_BATTLESCAPE_SCALE_DESC: "Battlescape viewport scaling mode, based on a fixed resolution (stretched to fit), or a fixed zoom level (expanded to fill)."
1316+
STR_GEOSCAPE_SCALE: "Geoscape Scale"
1317+
STR_GEOSCAPESCALE_SCALE_DESC: "Geoscape viewport scaling mode, based on a fixed resolution (stretched to fit), or a fixed zoom level (expanded to fill)."
13181318
STR_1.5X: "1.5x Original"
13191319
STR_2X: "2x Original"
13201320
STR_THIRD_DISPLAY: "1/3 Display"

‎bin/data/Resources/Weapons/license.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Artwork (c) Niklas Jansson (http://androidarts.com/)
2+
3+
This artwork is licensed under a
4+
Creative Commons Attribution-ShareAlike 4.0 International License.
5+
6+
You should have received a copy of the license along with this
7+
work. If not, see <http://creativecommons.org/licenses/by-sa/4.0/>.

‎bin/data/Ruleset/Xcom1Ruleset.rul‎

Lines changed: 44 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -6800,8 +6800,6 @@ research:
68006800
dependencies:
68016801
- STR_CYDONIA_DEP
68026802
- name: STR_CYDONIA_DEP
6803-
cost: 0
6804-
points: 0
68056803
unlocks:
68066804
- STR_CYDONIA_OR_BUST
68076805
requires:
@@ -6817,6 +6815,7 @@ research:
68176815
needItem: true
68186816
- name: STR_EXAMINATION_ROOM
68196817
cost: 150
6818+
points: 30
68206819
needItem: true
68216820
- name: STR_FLYING_SUIT
68226821
cost: 330
@@ -6943,7 +6942,6 @@ research:
69436942
- STR_ALIEN_ORIGINS
69446943
- STR_LEADER_PLUS
69456944
- name: STR_LEADER_PLUS
6946-
cost: 0
69476945
requires:
69486946
- STR_ALIEN_ORIGINS
69496947
dependencies:
@@ -6969,6 +6967,7 @@ research:
69696967
needItem: true
69706968
- name: STR_UFO_POWER_SOURCE
69716969
cost: 450
6970+
points: 30
69726971
needItem: true
69736972
- name: STR_ULTIMATE_CRAFT
69746973
cost: 900
@@ -7282,6 +7281,7 @@ research:
72827281
lookup: STR_SECTOID
72837282
- name: STR_SECTOID_ENGINEER
72847283
cost: 192
7284+
points: 50
72857285
needItem: true
72867286
unlocks:
72877287
- STR_ALIEN_ORIGINS
@@ -7333,37 +7333,30 @@ research:
73337333
- STR_ALIEN_ORIGINS
73347334
- STR_PSI_LAB
73357335
- name: STR_PLASMA_CANNON_DEP1
7336-
cost: 0
73377336
dependencies:
73387337
- STR_HEAVY_PLASMA
73397338
- STR_HEAVY_PLASMA_CLIP
73407339
unlocks:
73417340
- STR_PLASMA_CANNON
73427341
- name: STR_PLASMA_CANNON_DEP2
7343-
cost: 0
73447342
dependencies:
73457343
- STR_PLASMA_RIFLE
73467344
- STR_PLASMA_RIFLE_CLIP
73477345
unlocks:
73487346
- STR_PLASMA_CANNON
73497347
- name: STR_SECTOID
7350-
cost: 0
73517348
points: 50
73527349
needItem: true
73537350
- name: STR_FLOATER
7354-
cost: 0
73557351
points: 50
73567352
needItem: true
73577353
- name: STR_SNAKEMAN
7358-
cost: 0
73597354
points: 50
73607355
needItem: true
73617356
- name: STR_MUTON
7362-
cost: 0
73637357
points: 50
73647358
needItem: true
73657359
- name: STR_ETHEREAL
7366-
cost: 0
73677360
points: 50
73687361
needItem: true
73697362
- name: STR_CYBERDISC_TERRORIST
@@ -7374,7 +7367,6 @@ research:
73747367
unlocks:
73757368
- STR_ALIEN_ORIGINS
73767369
- name: STR_CYBERDISC
7377-
cost: 0
73787370
points: 50
73797371
needItem: true
73807372
- name: STR_REAPER_TERRORIST
@@ -7385,7 +7377,6 @@ research:
73857377
unlocks:
73867378
- STR_ALIEN_ORIGINS
73877379
- name: STR_REAPER
7388-
cost: 0
73897380
points: 50
73907381
needItem: true
73917382
- name: STR_CHRYSSALID_TERRORIST
@@ -7396,7 +7387,6 @@ research:
73967387
unlocks:
73977388
- STR_ALIEN_ORIGINS
73987389
- name: STR_CHRYSSALID
7399-
cost: 170
74007390
points: 50
74017391
needItem: true
74027392
- name: STR_SILACOID_TERRORIST
@@ -7407,7 +7397,6 @@ research:
74077397
unlocks:
74087398
- STR_ALIEN_ORIGINS
74097399
- name: STR_SILACOID
7410-
cost: 170
74117400
points: 50
74127401
needItem: true
74137402
- name: STR_CELATID_TERRORIST
@@ -7429,115 +7418,87 @@ research:
74297418
unlocks:
74307419
- STR_ALIEN_ORIGINS
74317420
- name: STR_SECTOPOD
7432-
cost: 0
74337421
points: 50
74347422
needItem: true
74357423
- name: STR_ALIEN_RESEARCH
7436-
cost: 0
74377424
points: 50
74387425
needItem: true
74397426
- name: STR_ALIEN_HARVEST
7440-
cost: 0
74417427
points: 50
74427428
needItem: true
74437429
- name: STR_ALIEN_ABDUCTION
7444-
cost: 0
74457430
points: 50
74467431
needItem: true
74477432
- name: STR_ALIEN_INFILTRATION
7448-
cost: 0
74497433
points: 50
74507434
needItem: true
74517435
- name: STR_ALIEN_BASE
7452-
cost: 0
74537436
points: 50
74547437
needItem: true
74557438
- name: STR_ALIEN_TERROR
7456-
cost: 0
74577439
points: 50
74587440
needItem: true
74597441
- name: STR_ALIEN_RETALIATION
7460-
cost: 0
74617442
points: 50
74627443
needItem: true
74637444
- name: STR_ALIEN_SUPPLY
7464-
cost: 0
74657445
points: 50
74667446
needItem: true
74677447
- name: STR_SMALL_SCOUT
7468-
cost: 0
74697448
points: 50
74707449
needItem: true
74717450
- name: STR_MEDIUM_SCOUT
7472-
cost: 0
74737451
points: 50
74747452
needItem: true
74757453
- name: STR_LARGE_SCOUT
7476-
cost: 0
74777454
points: 50
74787455
needItem: true
74797456
- name: STR_HARVESTER
7480-
cost: 0
74817457
points: 50
74827458
needItem: true
74837459
- name: STR_ABDUCTOR
7484-
cost: 0
74857460
points: 50
74867461
needItem: true
74877462
- name: STR_TERROR_SHIP
7488-
cost: 0
74897463
points: 50
74907464
needItem: true
74917465
- name: STR_BATTLESHIP
7492-
cost: 0
74937466
points: 50
74947467
needItem: true
74957468
- name: STR_SUPPLY_SHIP
7496-
cost: 0
74977469
points: 50
74987470
needItem: true
74997471
- name: STR_SECTOID_AUTOPSY
7500-
cost: 0
75017472
points: 50
75027473
needItem: true
75037474
- name: STR_SNAKEMAN_AUTOPSY
7504-
cost: 0
75057475
points: 50
75067476
needItem: true
75077477
- name: STR_FLOATER_AUTOPSY
7508-
cost: 0
75097478
points: 50
75107479
needItem: true
75117480
- name: STR_MUTON_AUTOPSY
7512-
cost: 0
75137481
points: 50
75147482
needItem: true
75157483
- name: STR_ETHEREAL_AUTOPSY
7516-
cost: 0
75177484
points: 50
75187485
needItem: true
75197486
- name: STR_CYBERDISC_AUTOPSY
7520-
cost: 0
75217487
points: 50
75227488
needItem: true
75237489
- name: STR_CHRYSSALID_AUTOPSY
7524-
cost: 0
75257490
points: 50
75267491
needItem: true
75277492
- name: STR_REAPER_AUTOPSY
7528-
cost: 0
75297493
points: 50
75307494
needItem: true
75317495
- name: STR_CELATID_AUTOPSY
7532-
cost: 0
75337496
points: 50
75347497
needItem: true
75357498
- name: STR_SILACOID_AUTOPSY
7536-
cost: 0
75377499
points: 50
75387500
needItem: true
75397501
- name: STR_SECTOPOD_AUTOPSY
7540-
cost: 0
75417502
points: 50
75427503
needItem: true
75437504
manufacture:
@@ -9413,6 +9374,47 @@ MCDPatches:
94139374
TUFly: 2
94149375
- MCDIndex: 7
94159376
TUFly: 2
9377+
- type: POLAR
9378+
data:
9379+
- MCDIndex: 0
9380+
TUFly: 4
9381+
noFloor: true
9382+
- MCDIndex: 63
9383+
noFloor: true
9384+
- MCDIndex: 64
9385+
noFloor: true
9386+
- MCDIndex: 65
9387+
noFloor: true
9388+
- MCDIndex: 66
9389+
noFloor: true
9390+
- MCDIndex: 67
9391+
noFloor: true
9392+
- MCDIndex: 68
9393+
noFloor: true
9394+
- MCDIndex: 69
9395+
noFloor: true
9396+
- MCDIndex: 70
9397+
noFloor: true
9398+
- MCDIndex: 71
9399+
noFloor: true
9400+
- MCDIndex: 72
9401+
noFloor: true
9402+
- MCDIndex: 73
9403+
noFloor: true
9404+
- MCDIndex: 74
9405+
noFloor: true
9406+
- MCDIndex: 75
9407+
noFloor: true
9408+
- MCDIndex: 76
9409+
noFloor: true
9410+
- MCDIndex: 77
9411+
noFloor: true
9412+
- MCDIndex: 78
9413+
noFloor: true
9414+
- MCDIndex: 79
9415+
noFloor: true
9416+
- MCDIndex: 80
9417+
noFloor: true
94169418
extraSprites:
94179419
- type: Pathfinding
94189420
files:

‎docs/Makefile.am‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
EXTRA_DIST = \
22
Doxyfile \
3-
CMakeLists.txt \
4-
language_id.html
3+
CMakeLists.txt
54

65
if WITH_OPENXCOM_DOCS
76

87
install-data-am:
98
mkdir -p $(DESTDIR)$(docdir)/html/search
10-
$(INSTALL_DATA) $(srcdir)/*.html $(DESTDIR)$(docdir)/html/
119
$(INSTALL_DATA) html/*.html $(DESTDIR)$(docdir)/html/
1210
$(INSTALL_DATA) html/*.png $(DESTDIR)$(docdir)/html/
1311
$(INSTALL_DATA) html/*.css $(DESTDIR)$(docdir)/html/

0 commit comments

Comments
 (0)