2.1.5 #187
Merged
2.1.5 #187
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When the mission is aborted the pending mission is still in the event list, which is part of the game option. That event has a reference to the operation, which in turn contains all the mission generator objects. Two of these objects are the radio/TACAN allocators, which use a generator to track the next free channel. Generators cannot be picked, so because these are transitively part of the game object the game cannot be saved. Aside from the briefing generator, none of those objects are actually needed outside the generation function itself, so just make them locals instead. This probably needs a larger refactor at some point. It doesn't look like we need so many calls into the operation type (it has an initialize, a prepare, and a generate, and it doesn't seem to need anything but the last one). The only reason breifinggen needs to remain a part of the class is because the briefing title and description are filled in from the derived class, where title and description should probably be overridden properties instead. I'm also not sure if we need to make the event list a part of game at all, and also don't think that the mission needs to be one of these events.
walterroach
added a commit
to walterroach/dcs_liberation
that referenced
this pull request
Nov 22, 2020
commit 939b6c4 Author: walterroach <[email protected]> Date: Sat Nov 21 17:19:54 2020 -0600 refactoring commit f6e0dbb Author: walterroach <[email protected]> Date: Sat Nov 21 17:00:22 2020 -0600 operation refactoring commit 8889e35 Merge: 316f731 398fa1e Author: walterroach <[email protected]> Date: Sat Nov 21 12:50:44 2020 -0600 Merge branch 'develop' into frontline commit 316f731 Merge: 708b615 f0480b0 Author: walterroach <[email protected]> Date: Sat Nov 21 11:19:31 2020 -0600 Merge branch 'develop' into frontline commit 708b615 Author: walterroach <[email protected]> Date: Sat Nov 21 11:18:30 2020 -0600 Merge conflict commit 866ff78 Merge: 007dcf5 d394d01 Author: walterroach <[email protected]> Date: Sat Nov 21 11:15:36 2020 -0600 Merge branch 'develop_2_2_x' into frontline commit 007dcf5 Author: walterroach <[email protected]> Date: Fri Nov 20 21:01:45 2020 -0600 remove dead code commit 9a640bf Author: walterroach <[email protected]> Date: Fri Nov 20 20:38:32 2020 -0600 inherent resolve frontlines commit edd02d9 Merge: 2b6227f f8b2dbe Author: walterroach <[email protected]> Date: Fri Nov 20 20:32:50 2020 -0600 Merge branch 'develop' into frontline commit 2b6227f Author: walterroach <[email protected]> Date: Fri Nov 20 20:29:30 2020 -0600 remove dead code commit d394d01 Author: Ignacio Muñoz Fernandez <[email protected]> Date: Fri Nov 20 15:11:12 2020 +0100 fix: conditional value at passTurn on QTopPanel commit 70d982b Author: Ignacio Muñoz Fernandez <[email protected]> Date: Fri Nov 20 15:10:08 2020 +0100 fix: Pass Turn and Take Off Buttons when no game is loaded commit c3b028e Author: Ignacio Muñoz Fernandez <[email protected]> Date: Fri Nov 20 12:47:35 2020 +0100 fix: fixes dcs-liberation#325 for version 2.2.x commit 206d09f Author: Dan Albert <[email protected]> Date: Fri Nov 20 00:18:00 2020 -0800 Maybe correct fishbed radios. Maybe fixes dcs-liberation#377 commit 87248fe Author: Khopa <[email protected]> Date: Thu Nov 19 21:55:11 2020 +0100 Changelog update commit b7634a8 Author: Khopa <[email protected]> Date: Thu Nov 19 21:54:33 2020 +0100 About dialog update commit 434755a Author: walterroach <[email protected]> Date: Thu Nov 19 14:23:43 2020 -0600 Update README.md commit 3eb2529 Author: walterroach <[email protected]> Date: Thu Nov 19 13:20:05 2020 -0600 Fix dcs-liberation#402 commit e6e4cca Author: Khopa <[email protected]> Date: Mon Nov 16 23:57:12 2020 +0100 Made it possible to setup custom liveries in faction files. commit 8d57bbc Author: Khopa <[email protected]> Date: Thu Nov 19 20:17:11 2020 +0100 Changelog update 2.2.1 commit 483db56 Author: Khopa <[email protected]> Date: Thu Nov 19 00:34:01 2020 +0100 Added F-14A support commit 63d5862 Author: Khopa <[email protected]> Date: Wed Nov 18 21:51:47 2020 +0100 Pydcs module update commit 365b379 Author: Dan Albert <[email protected]> Date: Thu Nov 19 00:42:54 2020 -0800 Update changelog for 2.2.1. commit fd473f0 Author: Dan Albert <[email protected]> Date: Thu Nov 19 00:29:05 2020 -0800 Fix custom waypoints. Like with deleting waypoints, these will degrade the flight plan to the 2.1 behavior. Ascend/descend points aren't in use any more, so I removed those. commit a816877 Author: Dan Albert <[email protected]> Date: Wed Nov 18 23:40:18 2020 -0800 Allow deleting waypoints. In almost every case this leaves us with a flight plan we can't reason about, so it gets degraded to `CustomFlightPlan`. The exception is when deleting a target point when there are other target points remaining. This probably gets people using this feature back to what they want though, which is essentially the 2.1 behavior. Fixes dcs-liberation#393 commit 2d56ae1 Author: Dan Albert <[email protected]> Date: Wed Nov 18 22:03:33 2020 -0800 Avoid cases where empty flights could be created. Fixes dcs-liberation#373 commit 216adcc Author: Dan Albert <[email protected]> Date: Wed Nov 18 21:26:14 2020 -0800 Add infor about delayed flights to the start page. Fixes dcs-liberation#398 commit 8d485d5 Author: Dan Albert <[email protected]> Date: Wed Nov 18 19:33:54 2020 -0800 Delay player CV flight when their settings say so. Fixes dcs-liberation#375 This also fixes a problem where we're spawning non-cold start planes in an uncontrolled state. The ME won't let us do this, so we probably shouldn't be doing that. commit fa549fc Author: Dan Albert <[email protected]> Date: Wed Nov 18 19:27:03 2020 -0800 Don't delay player flights with short delays. Not much point in delaying humans 8 seconds. Fixes dcs-liberation#397 commit b7d1606 Author: Dan Albert <[email protected]> Date: Mon Nov 16 19:15:11 2020 -0800 Further improve split/join positioning. (cherry picked from commit dc235f3) commit d05897e Author: walterroach <[email protected]> Date: Sun Nov 15 22:50:14 2020 -0600 Change default CAS loadout for Viggen Reported that AI can't hit the broad side of a barn with the rockets. commit 1d98432 Author: walterroach <[email protected]> Date: Sun Nov 15 22:06:05 2020 -0600 Briefing tweak Fixes frontline info repeating when player has no vehicles. commit 21cd764 Author: Dan Albert <[email protected]> Date: Sun Nov 15 18:28:40 2020 -0800 Improve hold/split/join point positioning. This also removes ascend/descend waypoints. They don't seem to be helping at all. The AI already gets an implicit ascend waypoint (they won't go to waypoint one until they've climbed sufficiently), and forcing unnecessary sharp turns toward the possibly mispredicted ascent direction can mess with the AI. It's also yet another variable to contend with when planning hold points, and hold points do essentially the same thing. Fixes dcs-liberation#352. commit dfc31df Author: Khopa <[email protected]> Date: Sun Nov 15 16:14:18 2020 +0100 Changelog update (cherry picked from commit 8ffbf32) commit 2e067aa Author: Khopa <[email protected]> Date: Sun Nov 15 15:57:36 2020 +0100 Added full persian gulf map by Plob commit 78cd60f Author: Khopa <[email protected]> Date: Sun Nov 15 15:49:51 2020 +0100 Added factions made by Discord user HerrTom commit 96c401e Author: Dan Albert <[email protected]> Date: Sat Nov 14 13:01:11 2020 -0800 Fix pyinstaller spec for release. final and buildnumber are optional files. Move them into resources to avoid naming them explicitly. (cherry picked from commit fae9650) commit fad132d Author: Dan Albert <[email protected]> Date: Sat Nov 14 12:37:22 2020 -0800 Fix versioning for release builds. (cherry picked from commit 9019cbf) commit 696710b Merge: f873592 41445c3 Author: Khopa <[email protected]> Date: Sat Nov 14 21:40:07 2020 +0100 Merge remote-tracking branch 'khopa/master' into develop_2_2_x commit f873592 Author: Khopa <[email protected]> Date: Sat Nov 14 21:32:27 2020 +0100 Version string 2.2.0 commit 16cfc4e Author: Khopa <[email protected]> Date: Sat Nov 14 21:29:03 2020 +0100 Changelog update for 2.2.0 commit 3987274 Author: Khopa <[email protected]> Date: Sat Nov 14 21:24:15 2020 +0100 Pulled latest pydcs version commit 73a97f9 Author: Khopa <[email protected]> Date: Sat Nov 14 20:16:13 2020 +0100 Added High Digit Sams mods pydcs export extensions, maybe for later use. commit 41445c3 Merge: 7dd3367 2a3bf98 Author: C. Perreau <[email protected]> Date: Mon Oct 5 19:45:30 2020 +0200 Merge pull request dcs-liberation#187 from Khopa/develop_2_1_x 2.1.5 commit 2a3bf98 Author: Khopa <[email protected]> Date: Mon Oct 5 19:33:48 2020 +0200 Fixed EPLRS cherry pick merge. commit 819d775 Author: Khopa <[email protected]> Date: Sun Oct 4 14:11:28 2020 +0200 EPLRS for 2.1.5 commit efbc6fe Author: Khopa <[email protected]> Date: Sat Oct 3 16:18:12 2020 +0200 Enable EPLRS for ground units that can use it. commit 262ba6c Author: Khopa <[email protected]> Date: Mon Oct 5 19:28:55 2020 +0200 Chery picked another fix for this release, so updated changelog commit c41ecb6 Author: Khopa <[email protected]> Date: Sun Oct 4 14:27:13 2020 +0200 Fix aircrafts landing point commit f5c32c6 Author: Khopa <[email protected]> Date: Mon Oct 5 19:26:07 2020 +0200 Version 2.1.5 commit a1886e3 Author: Dan Albert <[email protected]> Date: Sun Oct 4 12:48:35 2020 -0700 Fix save issues after aborting mission. When the mission is aborted the pending mission is still in the event list, which is part of the game option. That event has a reference to the operation, which in turn contains all the mission generator objects. Two of these objects are the radio/TACAN allocators, which use a generator to track the next free channel. Generators cannot be picked, so because these are transitively part of the game object the game cannot be saved. Aside from the briefing generator, none of those objects are actually needed outside the generation function itself, so just make them locals instead. This probably needs a larger refactor at some point. It doesn't look like we need so many calls into the operation type (it has an initialize, a prepare, and a generate, and it doesn't seem to need anything but the last one). The only reason breifinggen needs to remain a part of the class is because the briefing title and description are filled in from the derived class, where title and description should probably be overridden properties instead. I'm also not sure if we need to make the event list a part of game at all, and also don't think that the mission needs to be one of these events.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
2.1.5 release !