Merge branch 'develop_2_2_x' into frontline

qt_ui/widgets/QTopPanel.py

@@ -48,12 +48,14 @@ class QTopPanel(QFrame):
         self.passTurnButton.setIcon(CONST.ICONS["PassTurn"])
         self.passTurnButton.setProperty("style", "btn-primary")
         self.passTurnButton.clicked.connect(self.passTurn)
+        if not self.game:
+            self.passTurnButton.setEnabled(False)
 
         self.proceedButton = QPushButton("Take off")
         self.proceedButton.setIcon(CONST.ICONS["Proceed"])
         self.proceedButton.setProperty("style", "start-button")
         self.proceedButton.clicked.connect(self.launch_mission)
-        if self.game and self.game.turn == 0:
+        if not self.game or self.game.turn == 0:
             self.proceedButton.setEnabled(False)
 
         self.factionsInfos = QFactionsInfos(self.game)
@@ -101,6 +103,8 @@ class QTopPanel(QFrame):
         self.budgetBox.setGame(game)
         self.factionsInfos.setGame(game)
 
+        self.passTurnButton.setEnabled(True)
+
         if game and game.turn == 0:
             self.proceedButton.setEnabled(False)
         else:

qt_ui/windows/QLiberationWindow.py

@@ -244,11 +244,12 @@ class QLiberationWindow(QMainWindow):
                "<h4>Authors</h4>" + \
                "<p>DCS Liberation was originally developed by <b>shdwp</b>, DCS Liberation 2.0 is a partial rewrite based on this work by <b>Khopa</b>." \
                "<h4>Contributors</h4>" + \
-               "shdwp, Khopa, ColonelPanic, Wrycu, calvinmorrow, JohanAberg, Deus, root0fall, Captain Cody, steveveepee, pedromagueija, parithon, bwRavencl, davidp57" + \
+               "shdwp, Khopa, ColonelPanic, Roach, Wrycu, calvinmorrow, JohanAberg, Deus, root0fall, Captain Cody, steveveepee, pedromagueija, parithon, bwRavencl, davidp57" + \
                "<h4>Special Thanks  :</h4>" \
                "<b>rp-</b> <i>for the pydcs framework</i><br/>"\
                "<b>Grimes (mrSkortch)</b> & <b>Speed</b> <i>for the MIST framework</i><br/>"\
-               "<b>Ciribob </b> <i>for the JTACAutoLase.lua script</i><br/>"
+               "<b>Ciribob </b> <i>for the JTACAutoLase.lua script</i><br/>"\
+               "<b>Walder </b> <i>for the Skynet-IADS script</i><br/>"
         about = QMessageBox()
         about.setWindowTitle("About DCS Liberation")
         about.setIcon(QMessageBox.Icon.Information)

qt_ui/windows/mission/flight/waypoints/QFlightWaypointTab.py

@@ -1,4 +1,7 @@
+<<<<<<< HEAD
 import logging
+=======
+>>>>>>> develop_2_2_x
 from typing import Iterable, List, Optional
 
 from PySide2.QtCore import Signal
@@ -17,7 +20,10 @@ from gen.flights.flight import Flight, FlightType, FlightWaypoint
 from gen.flights.flightplan import (
     CustomFlightPlan,
     FlightPlanBuilder,
+<<<<<<< HEAD
     PlanningError,
+=======
+>>>>>>> develop_2_2_x
     StrikeFlightPlan,
 )
 from qt_ui.windows.mission.flight.waypoints.QFlightWaypointList import \