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

..

battle_of_britain.json

Battle of britain campaign migrated to new miz format.

2020-11-28 18:03:55 +01:00

battle_of_britain.miz

Battle of britain campaign migrated to new miz format.

2020-11-28 18:03:55 +01:00

black_sea.json

Add the Black Sea campaign.

2020-12-11 01:15:28 -08:00

black_sea.miz

Add off-map spawns to the Black Sea campaign.

2020-12-14 22:36:57 -08:00

desert_war.json

Migrated desert war to new miz format

2020-11-28 19:19:33 +01:00

desert_war.miz

Flesh out Desert War IADS, add carriers.

2020-12-28 13:16:39 -08:00

dunkirk.json

Dunkirk campaign migrated to the new miz format.

2020-11-28 17:41:20 +01:00

dunkirk.miz

Battle of britain campaign migrated to new miz format.

2020-11-28 18:03:55 +01:00

emirates.json

Reworked emirates campaign

2020-12-23 21:58:39 +01:00

emirates.miz

Reworked emirates campaign

2020-12-23 21:58:39 +01:00

full_caucasus.json

Caucasus full single miz campaign

2020-11-24 17:06:59 -06:00

full_caucasus.miz

Fix broken Full Caucasus Map frontline

2020-12-16 09:06:51 -06:00

golan_heights_lite.json

Golan heights battle scenario fully migrated to miz format

2020-12-20 22:39:15 +01:00

golan_heights_lite.miz

Golan heights battle scenario fully migrated to miz format

2020-12-20 22:39:15 +01:00

golan_heights.json

Golan heights battle scenario fully migrated to miz format

2020-12-20 22:39:15 +01:00

golan_heights.miz

Golan heights battle scenario fully migrated to miz format

2020-12-20 22:39:15 +01:00

inherent_resolve.json

Add a new miz file based campaign generator.

2020-11-19 16:55:21 -08:00

inherent_resolve.miz

Adjust IADS for Inherent Resolve.

2020-11-29 17:52:57 -08:00

invasion_from_turkey.json

Migrated invasion from turkey campaign to new miz format.

2020-12-12 00:51:46 +01:00

invasion_from_turkey.miz

Fixed invasion_from_turkey inverted setup.

2020-12-12 14:25:12 +01:00

invasion_of_iran_[lite].json

Migrated invasion of iran lite campaign to new miz format.

2020-11-29 15:00:56 +01:00

invasion_of_iran_lite.miz

Invasion of iran lite campaign update.

2020-12-10 23:19:51 +01:00

invasion_of_iran.json

Migrated invasion of iran campaign to miz format.

2020-11-30 23:12:01 +01:00

invasion_of_iran.miz

Migrated invasion of iran campaign to miz format.

2020-11-30 23:12:01 +01:00

normandy_full.miz

Made normandy campaign less cluttered

2020-12-12 15:22:35 +01:00

normandy_small.json

Migrated normandy small to new miz format.

2020-12-01 00:36:49 +01:00

normandy_small.miz

Normandy campaigns and terrain update

2020-12-11 22:04:33 +01:00

normandy.json

Normandy campaigns and terrain update

2020-12-11 22:04:33 +01:00

normandy.miz

Made normandy campaign less cluttered

2020-12-12 15:22:35 +01:00

north_caucasus.json

Improved campaign selection screen in new game wizard.

2020-11-08 23:24:10 +01:00

north_nevada.json

Improved campaign selection screen in new game wizard.

2020-11-08 23:24:10 +01:00

persian_gulf_full_map.json

Updated Persian Gulf Full Map in new miz format by Plob.

2020-12-15 20:19:36 +01:00

persian_gulf_full_map.miz

Updated Persian Gulf Full Map in new miz format by Plob.

2020-12-15 20:19:36 +01:00

russia_small.json

Migrated campaign "Russia Small" to the new campaign format.

2020-11-26 00:10:11 +01:00

russia_small.miz

Fix russia_small campaign not being invertable

2020-12-12 13:23:32 +01:00

syria_full_map_remastered.json

Replaced previous Syria full map by the new version by Hawkmoon

2020-12-16 20:49:03 +01:00

syria_full_map_remastered.miz

Move more SAMs off runways in Syria Full.

2020-12-19 12:22:27 -08:00

syrian_civil_war.json

Syrian civil war description updated

2020-12-21 13:55:33 +01:00

syrian_civil_war.miz

Syria terrain update + syrian civil war reworked in miz format

2020-12-21 03:19:17 +01:00

western_georgia.json

Improved campaign selection screen in new game wizard.

2020-11-08 23:24:10 +01:00