Skip to content

[pull] master from OpenApoc:master - #89

Open
pull[bot] wants to merge 372 commits into
sparkstar:masterfrom
OpenApoc:master
Open

pull[bot] wants to merge 372 commits into
sparkstar:masterfrom
OpenApoc:master

Conversation

@pull

@pull pull Bot commented May 19, 2024 •

Copy link
Copy Markdown

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull Bot added the ⤵️ pull label May 19, 2024
FilmBoy84 and others added 29 commits November 26, 2024 16:03
Fix facilities list not populated when opened
Fix scientist reassignment on lab deletion
Add the first iteration of moving portals - see #429 for all the other stuff that is still to be implemented
…vehicle-with-no-tile-object-crash-#1109

FIX - setPosition called on vehicle with no tile object crash #1109
Recheck mission end on brainsucker spawn
This seems to be needed to newer MSVC, likely we were relying on transitive includes previously?
Check for alien containment at base only
Fix no manual pickup with CallExistingFerry option
Updates clang-format and clang-tidy used in the linter to version 18.x

Also cleans the clang-tidy config - lots of old options that aren't valid anymore, so easier to pretty much reset from scratch
Think this was a work-in-progress that somehow got committed?
The previous linter was fragile around removing files or figuring out what git refs to use, so just format Everything and fail if there's any changes made.
As strings.h is included by pretty much everything, we want that as svelte as possible
FilmBoy84 and others added 30 commits September 10, 2026 11:15
Battle: land falling units on the floor they cross and enforce the jump rules (#1581)
STANDART_MOVE_TU_COST, ICON_STANDART, and AGENT_MOVEMENT_TYPE_STANDART(_LARGE)
have carried a misspelling of STANDARD since 2016-2017. Pure identifier
rename, no behavioural change.

Fixes #1677
findTileToLandOn returned the search's own starting tile on failure,
which is indistinguishable from a genuine radius-0 success whenever a
UFO is drifting directly above ground it can actually land on. The
caller mistook that valid answer for "nothing found" and hopped away
instead of landing, so a UFO could loop forever even with landable
ground right beneath it the whole time.

Return an out-of-map sentinel on failure instead, and have the caller
test that sentinel rather than comparing against the vehicle's own
position. Also skip pathfinding when the found tile is the vehicle's
own tile, since routing there produced a self-referencing path the
mission could never mark finished. Keep the bounded retry/self-destruct
handoff as a backstop for the case where no landing tile exists at all.

Fixes #1666
City: land crashing ufos instead of looping when the landing search succeeds (#1666)
Rename the STANDART typo to STANDARD in battle unit identifiers (#1677)
Scans local ./data/cd.iso, Steam appid 7660 libraries, GOG's registry
entry (Windows only), and mounted/extracted volumes for a plausible
X-COM: Apocalypse data source. Runs silently on startup when the
current CD path is missing or invalid, prefilling it when exactly one
candidate is found or prompting a picker for several. Adds a manual
"Autodetect" button to the Paths tab that reruns the scan on demand
and always shows the picker.

Closes #1645
fix(framework): iterate a copy of stageCommands in the main loop
…detect

Launcher: add CD/ISO autodetection
…fire

Battlescape: optional gravlift line of fire and sight (#1330)
…ension-gate

City: end attack missions when the target leaves the city (#1325)
Battle: force the mission-end recheck on unit drop and retreat (#647)
…-hotkeys

Battle: assign the current selection to a squad with ctrl+1-6 (#601)
…covery

City: dispatch every idle rescue craft per organisation update (#1008)
…ng-term-bias

Organisations: add the original's ally ripple and event-gated long-term relations (#1457)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants