weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop_2_3_x' into develop

Browse Source 
# Conflicts:
#	changelog.md
#	game/procurement.py
#	resources/factions/iraq_1991.json
This commit is contained in:
Khopa
2020-12-22 23:32:06 +01:00
parent 56d7993c8f 7c29ea836c
commit b0ad664ece
86 changed files with 494 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qt_ui/widgets/map/QMapObject.py
View File

@@ -47,7 +47,7 @@ class QMapObject(QGraphicsRectItem):
object_details_action.triggered.connect(self.on_click)
menu.addAction(object_details_action)
# Not all locations have valid objetives. Off-map spawns, for example,
# Not all locations have valid objectives. Off-map spawns, for example,
# have no mission types.
if list(self.mission_target.mission_types(for_player=True)):
new_package_action = QAction(f"New package")