walterroach
7438c30885
Merge pull request #430 from walterroach/develop_test
...
Update pydcs submodule
2020-11-22 18:59:35 -06:00
walterroach
fac43ba20b
update submodule
2020-11-22 18:46:18 -06:00
walterroach
c2eb243026
Fix bug #400
...
arg position
2020-11-22 17:43:19 -06:00
Khopa
2adaee8671
Added Soviet Union 1943
2020-11-23 00:15:44 +01:00
walterroach
57edc5678c
Merge branch 'develop' of https://github.com/Khopa/dcs_liberation into develop
2020-11-22 16:41:59 -06:00
walterroach
730130b19e
Set AGL altitude on target waypoints
2020-11-22 16:41:53 -06:00
Dan Albert
17b0cee507
Add unrestricted SATNAV support to factions.
...
Enabled for bluefor modern, since they ought to have GPS but seemingly
don't.
This change does nothing until https://github.com/pydcs/dcs/pull/102
lands and we update to it.
2020-11-22 13:28:05 -08:00
Dan Albert
2557383946
Fix type of default map visibility setting.
...
The UI sets these to the proper enum types; only the default is wrong.
Fix the default and clean up the associated code.
Note that this does minorly break save compatibility and alters default
behavior, since previously we were ignoring the default option. Ignoring
the default looks unintentional since there is no explicit "don't force
this option" setting in the UI.
Existing saves can be fixed simply by changing this option to something
else and then back.
2020-11-22 13:28:05 -08:00
walterroach
29d3b5dfc6
Add missing P-47 icons
2020-11-22 02:12:41 -06:00
Dan Albert
f6fad30852
Add unit name -> Liberation object map.
...
Generated units are added to this during mission generation so we can
map destroyed units back to the data that generated them. Currently only
implemented for aircraft as a proof of concept.
2020-11-21 21:01:46 -08:00
walterroach
d5a081a15f
Merge pull request #422 from walterroach/groundwar
...
Operation refactor and conflictgen cleanup
2020-11-21 21:00:51 -06:00
walterroach
6147e9ac96
mypy cleanup
2020-11-21 19:31:30 -06:00
walterroach
b32ca4f92f
merge
2020-11-21 18:57:15 -06:00
walterroach
b57dd51f86
Merge branch 'develop' into frontline
2020-11-21 18:55:56 -06:00
walterroach
fc6ca162af
Merge branch 'develop_2_2_x' into develop
2020-11-21 18:24:36 -06:00
walterroach
58ba9e9d1d
bad arg
2020-11-21 18:17:35 -06:00
walterroach
939b6c468d
refactoring
2020-11-21 17:19:54 -06:00
Dan Albert
bf7df6721a
Fix turn 0.
...
`Game.initialize_turn` doesn't run on turn zero, so we have to set up
the unit order events when we create the `Game`.
2020-11-21 15:00:49 -08:00
walterroach
f6e0dbbb6a
operation refactoring
2020-11-21 17:00:22 -06:00
Dan Albert
851c2d88a9
Factor out Lua generation.
2020-11-21 14:55:00 -08:00
Dan Albert
200c13dc31
Remove dead code.
2020-11-21 13:27:19 -08:00
walterroach
8889e35f9e
Merge branch 'develop' into frontline
2020-11-21 12:50:44 -06:00
Khopa
398fa1e73d
Fixed warehouse building not generating any rewards
2020-11-21 18:31:12 +01:00
walterroach
316f73138c
Merge branch 'develop' into frontline
2020-11-21 11:19:31 -06:00
walterroach
708b615ad7
Merge conflict
2020-11-21 11:18:30 -06:00
walterroach
866ff78518
Merge branch 'develop_2_2_x' into frontline
2020-11-21 11:15:36 -06:00
Khopa
f0480b033f
Removed debug print
2020-11-21 17:30:31 +01:00
Khopa
4d19548736
Changelog update / consistency with 2.X branch.
2020-11-21 17:05:33 +01:00
Khopa
fcf45554ef
Fixed culling display and added setting to include/exclude carriers from culling area.
2020-11-21 17:01:50 +01:00
Khopa
799b0fae94
Merge branch 'develop' of https://github.com/khopa/dcs_liberation into develop
2020-11-21 14:46:01 +01:00
Dan Albert
0d95716545
Correct type annotations.
2020-11-20 21:40:31 -08:00
walterroach
8c5b808eba
inherent resolve frontlines
2020-11-20 20:28:59 -08:00
walterroach
007dcf548e
remove dead code
2020-11-20 21:02:11 -06:00
walterroach
9a640bf7eb
inherent resolve frontlines
2020-11-20 20:38:32 -06:00
walterroach
edd02d9dd6
Merge branch 'develop' into frontline
2020-11-20 20:32:50 -06:00
Dan Albert
75edbb62f1
Clean up available parking code a bit.
...
Moved more into the `ControlPoint`.
2020-11-20 18:31:19 -08:00
walterroach
2b6227f3b1
remove dead code
2020-11-20 20:29:30 -06:00
Dan Albert
c4b8a41742
Move calculation of aircraft amounts into game.
...
The planner needs to know how much space is still expected to be
available next turn.
2020-11-20 18:25:03 -08:00
Dan Albert
f8b2dbe283
Move unit delivery ownership out of the UI.
...
Breaks save compat, but we need to have this knowledge outside the UI so
we can know whether or not we can ferry aircraft to the airfield without
overflowing parking.
2020-11-20 18:04:27 -08:00
Dan Albert
20091292f4
Remove dead code.
2020-11-20 17:37:20 -08:00
Dan Albert
a594f45aae
Pick divert airfields when planning.
...
https://github.com/Khopa/dcs_liberation/issues/342
2020-11-20 17:29:58 -08:00
Ignacio Muñoz Fernandez
d394d01ea8
fix: conditional value at passTurn on QTopPanel
2020-11-20 17:12:13 -08:00
Ignacio Muñoz Fernandez
70d982b0ed
fix: Pass Turn and Take Off Buttons when no game is loaded
2020-11-20 17:12:13 -08:00
Dan Albert
ae68a35a1a
Remove save compat since it's breaking anyway.
...
Removal of old paths/names for things that no longer exist.
2020-11-20 17:06:01 -08:00
Dan Albert
a9fcfe60f4
Add arrival/divert airfield selection.
...
Breaks save compat because it adds new fields to `Flight` that have no
constant default. Removing all of our other save compat at the same
time.
Note that player flights with a divert point will have a nav point for
their actual landing point. This is because we place the divert point
last, and DCS won't let us have a land point anywhere but the final
waypoint. It would allow a LandingReFuAr point, but they're only
generated for player flights anyway so it doesn't really matter.
Fixes https://github.com/Khopa/dcs_liberation/issues/342
2020-11-20 16:16:00 -08:00
Ignacio Muñoz Fernandez
c3b028ef4b
fix: fixes #325 for version 2.2.x
2020-11-20 03:50:58 -08:00
C. Perreau
833399f068
Merge pull request #409 from kavinsky/fix/issue-325
...
fix: fixes #325 Budget calculation for both factions
2020-11-20 12:44:16 +01:00
Ignacio Muñoz Fernandez
5695cf4ac5
fix: fixes #325 Budget calculation and enemy reinforcement calculation now takes into account the destroyed buildings
2020-11-20 12:38:06 +01:00
Ignacio Muñoz Fernandez
1553e5efd5
chore: syntax cleaning and redundant variable cleanup
2020-11-20 02:57:23 -08:00
Ignacio Muñoz Fernandez
0f1b396dd2
chore: variable name changes
2020-11-20 02:57:23 -08:00