Khopa f31861441b Merge branch 'develop' into helipads ...

# Conflicts:
#	game/data/weapons.py
#	game/db.py
#	game/theater/conflicttheater.py
#	resources/factions/france_1995.json
#	resources/factions/insurgents.json
#	resources/factions/iraq_1991.json
#	resources/factions/syria_1967_with_ww2_weapons.json
#	resources/factions/syria_2011.json

2021-05-21 13:58:22 +02:00

..

data

Replace JSOW fallbacks with walleyes.

2021-05-20 19:58:26 -07:00

event

Stop counting neutral base captures in status.

2021-04-26 17:54:32 -07:00

factions

Add AEW&C aircraft to the faction aircraft list.

2021-05-13 21:44:07 -07:00

infos

Ran black reformater on 2.4x branch

2021-02-22 20:55:51 +01:00

models

Remove unused file.

2021-04-25 20:30:55 -07:00

operation

Add a spectator slot.

2021-05-20 21:46:20 -07:00

plugins

Ran black reformater on 2.4x branch

2021-02-22 20:55:51 +01:00

theater

Merge branch 'develop' into helipads

2021-05-21 13:58:22 +02:00

__init__.py

Refactor game and ground object generation.

2020-11-05 16:09:34 -08:00

db.py

Stop awarding income for FOB structures.

2021-05-20 18:59:03 -07:00

debriefing.py

Let map objects be Strike targets.

2021-05-14 17:18:03 -07:00

game.py

Set up bullseye early, create waypoints.

2021-05-20 18:29:35 -07:00

helipad.py

Helicopter flights can be planned from FOBs

2021-05-21 00:34:51 +02:00

income.py

Ran black reformater on 2.4x branch

2021-02-22 20:55:51 +01:00

inventory.py

Ran black reformater on 2.4x branch

2021-02-22 20:55:51 +01:00

navmesh.py

Increase size of navmesh to avoid planning issues.

2021-03-13 13:41:57 -08:00

persistency.py

Ran black reformater on 2.4x branch

2021-02-22 20:55:51 +01:00

point_with_heading.py

Blacken.

2021-02-12 20:10:45 -08:00

procurement.py

Fix swapped list order for purchase priorities.

2021-05-18 19:54:39 -07:00

profiling.py

Add logged_duration context manager for profiling.

2021-05-08 18:06:55 -07:00

scenery_group.py

Let map objects be Strike targets.

2021-05-14 17:18:03 -07:00

settings.py

Remove fallback for old non-convoy behavior.

2021-05-18 19:21:43 -07:00

threatzones.py

Stop projecting threat zones from front lines.

2021-04-22 18:20:26 -07:00

transfers.py

Clean up front line code.

2021-05-08 16:46:02 -07:00

unitdelivery.py

Connect networks to enable multi-mode transfers.

2021-04-25 17:02:18 -07:00

unitmap.py

Let map objects be Strike targets.

2021-05-14 17:18:03 -07:00

utils.py

Add shipping lane support to campaign files.

2021-04-24 21:33:21 -07:00

version.py

Add support for AAA objectives.

2021-05-18 17:29:42 -07:00

weather.py

Add support for DCS 2.7 weather generation.

2021-04-17 15:06:17 -07:00