weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,307 Commits 14 Branches 10 Tags
Commit Graph

589 Commits

Author SHA1 Message Date
Dan Albert
ef73f712ec More Python 3.10 compat. 2021-11-21 11:28:51 -08:00
Dan Albert
4a7dae9cc2 Upgrade to PySide6. 
PySide2 renamed to PySide6 for Qt 6 support. It doesn't seem like
PySide2 is getting a 3.10 wheel, so upgrade to Qt 6 to prep for that.
 2021-11-20 19:26:18 -08:00
MetalStormGhost
a94db0ec43
Add a new base banner for FARPs. 2021-11-18 16:58:46 -08:00
Dan Albert
d31f0e22e3 Show the status of each flight in the UI. 
https://github.com/dcs-liberation/dcs_liberation/issues/1704
 2021-11-07 11:27:50 -08:00
Dan Albert
a23e7fe83d Restore missing income multiplier labels. 
Fixes https://github.com/dcs-liberation/dcs_liberation/issues/1712
 2021-11-06 16:19:27 -07:00
Dan Albert
5923ba21de Tell Qt that we actually want text to fit. 
Why isn't this the default?

Fixes https://github.com/dcs-liberation/dcs_liberation/issues/1670
 2021-11-03 19:23:54 -07:00
Dan Albert
de0b267568 Shut down the sim update thread on quit. 
Otherwise the update thread just sits there waiting forever...
 2021-11-02 23:59:08 -07:00
Dan Albert
03430a4df5 Update the UI to show sim state. 
https://github.com/dcs-liberation/dcs_liberation/issues/1704
 2021-11-02 23:34:51 -07:00
Dan Albert
87bf3110c8 Add play/pause features to the sim. 
There's no UI feedback for this yet other than the log messages.

https://github.com/dcs-liberation/dcs_liberation/issues/1704
 2021-11-02 23:34:51 -07:00
Dan Albert
14769c0350 Fix type errors with Flight.start_type in the UI. 
Also reorders the enum so that iteration shows the order we want in the
UI by default.

Fixes https://github.com/dcs-liberation/dcs_liberation/issues/1672
 2021-10-23 12:19:20 -07:00
Dan Albert
b728fcc2d6 Clean up mission result handling. 2021-10-22 14:36:51 -07:00
Dan Albert
be69d17345 Move Flight and its related components out of gen. 2021-10-22 11:30:28 -07:00
Dan Albert
a2140b915f Flip main/detail text boldness. 
Emphasize the main item text and leave the fine print as fine print.
 2021-10-21 22:27:35 -07:00
Dan Albert
6dae5b98d5 Fix carrier option not taking effect this turn. 
This really shouldn't need to happen but I don't feel like rewriting the
culling code right now. There's no reason for these to be persisted to
the Game at all, we should be generating these once they're needed.
 2021-10-21 20:05:07 -07:00
Dan Albert
626740366b Port the mission generator settings to auto. 
Done now. Not porting the cheat menu because it contains non-settings
elements as well.
 2021-10-21 19:54:58 -07:00
Dan Albert
a618f00662 Port the campaign management page to auto. 
Also fixes the oversight in the previous commit where float options were
not saved when changed.
 2021-10-21 19:16:47 -07:00
Dan Albert
7bec4c62f7 Generate settings pages automatically. 
This adds metadata to settings fields that can be used to automatically
generate the settings window. For now I have replaced the Difficulty
page. Will follow up to replace the others.
 2021-10-21 18:30:56 -07:00
Johan Aberg
17011820de
Fix crash if log window is open when entering mission. 
Use signal to append text to LogWindow to avoid crash from crossing thread boundaries.
Change modal flag to enable interacting with LogWindow while the mission is running

Fixes https://github.com/dcs-liberation/dcs_liberation/issues/1493
 2021-10-19 17:04:16 -07:00
Dan Albert
d5eaa4d091 Add a preferred_start_date for campaigns. 
Fixes https://github.com/dcs-liberation/dcs_liberation/issues/1079
 2021-10-17 17:37:23 -07:00
Dan Albert
bbeb80fc48 Give aircraft purchase the majority of the window. 
This makes long squadron names more likely to fit. I also added a
horizontal scroll bar for the cases when this still isn't enough space
and made the vertical scroll bar only appear when necessary. Typically
aircraft purchase menus are neither wide enough for long enough to need
either scroll bar.

Fixes https://github.com/dcs-liberation/dcs_liberation/issues/1592
 2021-10-17 13:28:02 -07:00
Dan Albert
35b30a01ed Fix flight resizing when switching aircraft. 
No idea why we were only resetting this if the max was >= 2. Instead,
always reset the flight to the default size when switching aircraft. The
default for anything capable of a two-ship is two, but limit based on
the airframe's group size limit and the number of aircraft available.

Fixes https://github.com/dcs-liberation/dcs_liberation/issues/1593
 2021-10-14 21:03:55 -07:00
Khopa
e84e36fd22 Merge remote-tracking branch 'khopa/develop' into helipads 
# Conflicts:
#	changelog.md
 2021-09-08 21:56:45 +02:00
Dan Albert
18336f58d3 Minor cleanup of notification system. 2021-09-05 21:15:32 -07:00
Dan Albert
a192e4c872 Allow showing the enemy aircraft inventory. 2021-09-03 13:56:03 -07:00
Dan Albert
16d397db1c Fix unit info menus for aircraft. 
Fixes https://github.com/dcs-liberation/dcs_liberation/issues/1586
 2021-09-01 19:22:37 -07:00
Dan Albert
8a60fa5c83 Fix errors when changing task or aircraft type. 
Fixes https://github.com/dcs-liberation/dcs_liberation/issues/1587
 2021-09-01 17:14:51 -07:00
Dan Albert
1a4be911c0 Implement ferry flights for squadron transfers. 
Fixes https://github.com/dcs-liberation/dcs_liberation/issues/1145
 2021-08-31 23:03:27 -07:00
Dan Albert
f9f0b429b6 Set the flight airfields based on the Squadron. 2021-08-31 22:14:00 -07:00
Dan Albert
a404792bd2 Reset the max flight size when changing squadrons. 2021-08-31 22:10:23 -07:00
Dan Albert
c2e5cba061 Implement manual squadron transfers. 
Lightly tested but seems to work fine.

https://github.com/dcs-liberation/dcs_liberation/issues/1145
 2021-08-29 16:21:54 -07:00
Dan Albert
cd15de6d42 Add an uncaught exception handler. 2021-08-29 16:21:54 -07:00
Dan Albert
380d6bf47a Fix weird wrong default campaign field bug. 
I tried fixing this using setField after registering it, but it does
nothing. I suspect this is because the page hasn't been registered with
the wizard yet so it's setting the field for the wrong wizard.
 2021-08-29 02:17:10 -07:00
Dan Albert
4715773bba Store the owning coalition in ControlPoint. 
This is needed fairly often, and we have a lot of Game being passed
around to ControlPoint methods specifically to support this. Just store
the owning Coalition directly in the ControlPoint to clean up. I haven't
cleaned up *every* API here, but did that aircraft allocations as an
example.
 2021-08-28 16:40:55 -07:00
C. Perreau
707d13a65c
Merge branch 'develop' into helipads 2021-08-16 12:20:43 +02:00
Dan Albert
4423288a53 Assign aircraft to squadrons rather than bases. 
This is needed to support the upcoming squadron transfers, since
squadrons need to bring their aircraft with them.

https://github.com/dcs-liberation/dcs_liberation/issues/1145
 2021-08-15 17:42:56 -07:00
Dan Albert
9768fb3493 Add base selection UI to startup. 
https://github.com/dcs-liberation/dcs_liberation/issues/1145
 2021-08-14 21:46:27 -07:00
Dan Albert
90ad1f4a61 Change squadrons to operate out of a single base. 
https://github.com/dcs-liberation/dcs_liberation/issues/1145

Currently this is fixed at the start of the campaign. The squadron
locations are defined by the campaign file.

Follow up work:

* Track aircraft ownership per-squadron rather than per-airbase.
* UI for relocating squadrons.
* Ferry missions for squadrons that are relocating.
* Auto-relocation (probably only for retreat handling).

Fixes https://github.com/dcs-liberation/dcs_liberation/issues/1138
 2021-08-14 21:46:27 -07:00
Dan Albert
d2e22ef8bf More campaign loader cleanup. 2021-08-14 13:39:27 -07:00
Magnus Wolffelt
103675e5bb
Make some paths cross-platform compatible (#1543) 
* Make some paths cross-platform compatible

* Fix lint error for Path
 2021-08-14 21:45:23 +02:00
RndName
b5b0d82a1a
Open all files with utf-8 encoding 
- will not be used for binary read/writes (rb,wb)!
- prevents a bug where units with special characters in the unit name can not be tracked anymore as there will be a name mismatch due to wrong encoding
 2021-08-14 13:10:43 +02:00
RndName
adeebbc422
Enable sell button according to available aircraft 
also added a tooltip which gives the user the hint that maybe the aircraft is assigned to mission and therefore the button is disabled
 2021-08-12 22:06:48 +02:00
Dan Albert
88d52003b3 Allow using yaml for campaign definitions. 
JSON continues to be supported as well. No additional work needed here,
just needed to allow both.
 2021-08-10 18:21:52 -07:00
Dan Albert
91daabc9d2 Fixup auto-assignable tasks when limits change. 
The air wing config was fixing the main `mission_types` field, but the
`auto_assignable_mission_types` property had already been set. Update
that field whenever the `mission_types` are changed.

Fixes https://github.com/dcs-liberation/dcs_liberation/issues/1515
 2021-08-07 14:04:32 -07:00
Kangwook Lee
def5454e5f Add battle damage assessment option 2021-08-07 13:11:10 -07:00
Kangwook Lee
74e6226d13 Fix typo 2021-08-07 13:03:13 -07:00
Khopa
71143536bf Merge branch 'develop' into helipads 
# Conflicts:
#	game/game.py
#	game/operation/operation.py
#	game/theater/conflicttheater.py
#	game/theater/controlpoint.py
#	gen/groundobjectsgen.py
#	resources/campaigns/golan_heights_lite.miz
 2021-08-02 19:34:05 +02:00
Kangwook Lee
5cbf8db272 Add QLogsWindow 2021-08-01 15:42:14 -07:00
RndName
67fa4a8910
fix generation of empty transfer during cp capture 
when a cp capture happens and the next cp has pending unit deliveries then they will be redeployed to the newly captured cp. The redeploy was drecreasing the num of pending unit deliveries for the old cp but was not removing them completly from the dict when all were removed
 2021-07-25 15:24:16 +02:00
Dan Albert
0eb8ec70d9 Make opfor airwing configurable. 2021-07-18 16:09:20 -07:00
Dan Albert
270f87f193 Add per-aircraft tabs to air wing configuration. 2021-07-18 15:49:58 -07:00