Khopa cf583bcd55 Merge branch 'master' into develop ...

# Conflicts:
#	changelog.md
#	game/db.py
#	game/game.py
#	game/income.py
#	game/theater/theatergroundobject.py
#	game/version.py
#	qt_ui/windows/finances/QFinancesMenu.py

2021-01-05 19:50:29 +01:00

..

__init__.py

Move theater into game.

2020-11-17 18:11:33 -08:00

base.py

Merge branch 'master' into develop

2021-01-05 19:50:29 +01:00

conflicttheater.py

Add basic intel window.

2020-12-25 16:04:54 -08:00

controlpoint.py

Fix new game creation.

2021-01-01 16:15:43 -08:00

landmap.py

Constrain front lines better.

2020-12-24 13:50:29 -08:00

missiontarget.py

Move theater into game.

2020-11-17 18:11:33 -08:00

start_generator.py

Support groups for SAM templates.

2020-12-24 16:09:42 -08:00

theatergroundobject.py

Don't show repaired TGOs as dead.

2020-12-26 16:21:31 -08:00