Khopa 71143536bf Merge branch 'develop' into helipads ...

# Conflicts:
#	game/game.py
#	game/operation/operation.py
#	game/theater/conflicttheater.py
#	game/theater/controlpoint.py
#	gen/groundobjectsgen.py
#	resources/campaigns/golan_heights_lite.miz

2021-08-02 19:34:05 +02:00

..

airfield

Merge branch 'develop' into helipads

2021-08-02 19:34:05 +02:00

ground_forces

replan opfor mission on sell or buy of tgos

2021-07-07 14:12:20 -07:00

intel

Add a wrapper type for ground unit info.

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

DepartingConvoysMenu.py

Factor out Coalition from Game.

2021-07-13 14:29:40 -07:00

NewUnitTransferDialog.py

Fix another unit type mismatch.

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

QBaseMenu2.py

Fix budget mismatch in the UI.

2021-07-14 17:33:01 -07:00

QBaseMenuTabs.py

Don't show ground unit menu at carriers.

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

QRecruitBehaviour.py

fix generation of empty transfer during cp capture

2021-07-25 15:24:16 +02:00