Khopa 7667a4f8c0 Merge branch 'develop' into helipads ...

# Conflicts:
#	game/game.py
#	resources/campaigns/golan_heights_lite.miz

2021-06-26 18:00:36 +02:00

..

airfield

Helipad : fixed errors after merge of develop features.

2021-06-20 18:20:40 +02:00

ground_forces

Fix purchase groups.

2021-06-19 10:33:35 -07:00

intel

Add a wrapper type for ground unit info.

2021-06-17 22:09:17 -07:00

DepartingConvoysMenu.py

Fix unit type mismatch.

2021-06-22 22:54:40 -07:00

NewUnitTransferDialog.py

Fix another unit type mismatch.

2021-06-23 20:01:38 -07:00

QBaseMenu2.py

Fixes #1310 (#1325)

2021-06-23 17:09:17 -04:00

QBaseMenuTabs.py

Don't show ground unit menu at carriers.

2021-06-18 19:39:42 -07:00

QRecruitBehaviour.py

Allow shift/ctrl click to buy/sell multiple units.

2021-06-19 10:36:33 -07:00