Conflicts resolved by union, not by picking a side: - AGENTS.md keeps the stronger visual-review rule (README updated with every visual change; a stale section is a defect). - render_screenshots.sh keeps the absolute engine path from main and adds -thirdperson from this branch - both were needed and neither alone worked. - Screenshots/README.md now lists six shots, retail and third-person both embedded; the known-issues tables merged, with the animation defect and unproven camera collision added to main's rows. - visual_targets.json carries both expectations. - Architecture docs: ADR-8 (realistic buildings) and ADR-9 (third-person body) both present and in numeric order; ADR-8 was mis-placed before the Quality Requirements heading in the combined document by an earlier edit, now fixed. - Binary conflicts resolved to main's content, since the retail trim only exists there. Checks: 82 tool tests, prettier clean, six embeds resolve.
Game
The Unreal project lives at Game/GigLine/GigLine.uproject once created. Nothing here yet.
What gets committed
Config/— engine and project settings, including the quality presets used for release checksSource/— C++ modulesContent/—0.1.0map, materials, meshes; LFS-trackedGigLine.uproject
What does not
Binaries/, Intermediate/, Saved/, DerivedDataCache/ — all generated. .gitignore covers them; do not add exceptions.
Engine
Installed outside the repository. Its path and exact version are recorded in ../Docs/toolchain.md. Nothing in this directory may assume a machine-specific engine path; the documented build procedure is ../Docs/build.md.