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

..

basemenu

Addresses review comments.

2021-01-05 09:42:05 +00:00

finances

Adjust income based on control point type.

2020-12-26 15:08:57 -08:00

groundobject

Merge branch 'master' into develop

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

infos

feat: added timestamp to information widget log items

2020-11-26 15:48:16 -08:00

mission

Add date-based loadout restriction.

2021-01-04 15:13:40 -08:00

newgame

Merge branch 'master' into develop

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

preferences

Fix bad import of THEMES.

2020-10-10 14:11:44 -07:00

settings

Add date-based loadout restriction.

2021-01-04 15:13:40 -08:00

stats

Stats view now has a tab for vehicles forces. Display waypoint coordinates in waypoint tab.

2019-10-19 13:12:21 +02:00

GameUpdateSignal.py

Cleanup debriefing signals.

2020-12-06 20:20:08 -08:00

intel.py

Flesh out intel displays.

2020-12-25 16:08:10 -08:00

QDebriefingWindow.py

Cleanup debriefing signals.

2020-12-06 20:20:08 -08:00

QLiberationWindow.py

Improve threat zone display options.

2020-12-22 13:57:05 -08:00

QWaitingForMissionResultWindow.py

Log time taken in turn processing.

2020-12-24 00:53:36 -08:00