Commit graph

131 commits

Author SHA1 Message Date
lahm86
cdfb5942c1 tr2/data: fix Living Quarters flame deactivation
Some checks are pending
Run code linters / Run code linters (push) Waiting to run
Publish a pre-release / TR2 (Linux) (push) Waiting to run
Publish a pre-release / TR2 (Windows) (push) Waiting to run
Publish a pre-release / TR2 (Mac) (push) Waiting to run
Publish a pre-release / Create a prerelease (push) Blocked by required conditions
Publish a pre-release / TR1 (Linux) (push) Waiting to run
Publish a pre-release / TR1 (Windows) (push) Waiting to run
Publish a pre-release / TR1 (Mac) (push) Waiting to run
Resolves #2851.
2025-04-27 15:03:53 +01:00
Marcin Kurczewski
10b9bcc780 option: port sound settings dialog to ui
Some checks are pending
Run code linters / Run code linters (push) Waiting to run
Publish a pre-release / Create a prerelease (push) Blocked by required conditions
Publish a pre-release / TR2 (Windows) (push) Waiting to run
Publish a pre-release / TR2 (Mac) (push) Waiting to run
Publish a pre-release / TR1 (Linux) (push) Waiting to run
Publish a pre-release / TR1 (Windows) (push) Waiting to run
Publish a pre-release / TR1 (Mac) (push) Waiting to run
Publish a pre-release / TR2 (Linux) (push) Waiting to run
2025-04-26 10:31:36 +03:00
lahm86
f590c9243c graphic_settings: add scroll wraparound option
This makes the scroll wraparound option available in both games'
graphics dialogs. TR1's dialog is also updated to allow scrolling until
such times as it's moved to the new UI framework.

Resolves #2834.
2025-04-23 20:43:21 +01:00
Marcin Kurczewski
0adefabf41 data: use HD assets
Some checks are pending
Run code linters / Run code linters (push) Waiting to run
Publish a pre-release / TR1 (Linux) (push) Waiting to run
Publish a pre-release / TR1 (Windows) (push) Waiting to run
Publish a pre-release / TR1 (Mac) (push) Waiting to run
Publish a pre-release / TR2 (Linux) (push) Waiting to run
Publish a pre-release / TR2 (Windows) (push) Waiting to run
Publish a pre-release / TR2 (Mac) (push) Waiting to run
Publish a pre-release / Create a prerelease (push) Blocked by required conditions
2025-04-22 16:14:32 +02:00
Marcin Kurczewski
953f30205e build: offload binary assets to TRX-data 2025-04-22 12:37:43 +02:00
Marcin Kurczewski
fbc26fcba6 docs: update logos
Some checks are pending
Run code linters / Run code linters (push) Waiting to run
Publish a pre-release / Build TR1 (push) Waiting to run
Publish a pre-release / Build TR2 (push) Waiting to run
Publish a pre-release / Create a prerelease (push) Blocked by required conditions
2025-04-21 18:38:40 +02:00
Marcin Kurczewski
f23a777f64 ui: move select level dialog to libtrx 2025-04-20 17:07:49 +02:00
Marcin Kurczewski
f04a18f208 tr2/ui: port save/load dialog to ui 2025-04-20 17:07:49 +02:00
lahm86
5f7bab0dd9 tr2/data: add missing 8 bit textures
This restores 8-bit textures for those injections in TR2 where models
are replaced or inserted.

Resolves #2792.
2025-04-20 13:04:22 +01:00
lahm86
70fe64c991 tr2/ui/graphic_settings: add further controls to graphics dialog
This makes several visual/rendering options available in TR2's graphic
dialog, including adding support for enum types.
2025-04-19 07:54:36 +01:00
Marcin Kurczewski
e3240b166c ui2: port controls dialog 2025-04-18 10:53:35 +02:00
Marcin Kurczewski
238fd19e4f ui2: port examine item dialog 2025-04-18 10:53:35 +02:00
lahm86
10f1bc6fbd tr2/data: fix invalid portals in The Deck
This disables the visibility portal from room 17 to room 104 (and vice
versa) in The Deck to avoid Lara seeing or targeting enemies in the
disconnected rooms.

Resolves #2393.
2025-04-17 17:21:24 +01:00
lahm86
94b78af2fb tr2/data: fix default mesh on Bartoli in cutscene 4
Some checks are pending
Run code linters / Run code linters (push) Waiting to run
Publish a pre-release / Build TR1 (push) Has been skipped
Publish a pre-release / Build TR2 (push) Has been skipped
Publish a pre-release / Create a prerelease (push) Has been skipped
This injects a fix to hide the default mesh that appears on Bartoli in
the Temple of Xian cutsene.

Resolves #2558.
2025-04-16 22:19:39 +01:00
lahm86
772308b359 tr2/data: fix boat explosion showing default mesh
This injects an object to represent the boat exploding when it crosses
mines, and safeguards the code to ensure the object is present to avoid
showing the default mesh.

Resolves #1605.
2025-04-16 22:19:39 +01:00
lahm86
71b1ce78d2 tr2/data: fix various softlocks
This fixes softlocks in Temple of Xian, Floating Islands and Vegas.

Resolves #2042.
Resolves #2590.
Resolves #1851.
2025-04-14 18:09:27 +01:00
lahm86
bc7be80ab8 tr2/data: fix silent Cold War shark
This injects animation commands for the shark in Cold War for its
biting SFX.

Resolves  #2678.
2025-04-13 18:06:50 +01:00
lahm86
b851487296 data: fix pickup mesh scales
This fixes the pickup mesh scales for the keys in Folly and
miscellaneous pickups in The Golden Mask.

Resolves #2652.
2025-04-13 18:06:50 +01:00
Marcin Kurczewski
454d133db7 tr2/option: add fov to the graphic options
Resolves #2728.
2025-04-13 09:08:11 +02:00
Marcin Kurczewski
72c67d7973 config: add/improve enable_legal option
Resolves #2740. Resolves #2741.
2025-04-12 22:33:59 +02:00
Marcin Kurczewski
e93ed2b6ce tr2: make water color customizable like in TR1X
Tackles #1619. While does not offer a simple toggle for the PS1 style,
it is now possible to edit the game flow file by hand with those
settings.
2025-04-12 15:05:10 +02:00
lahm86
adf2703305 tr2/objects/bird_guardian: remove hard-coded end level behaviour
Some checks are pending
Run code linters / Run code linters (push) Waiting to run
Publish a pre-release / Build TR1 (push) Has been skipped
Publish a pre-release / Build TR2 (push) Has been skipped
Publish a pre-release / Create a prerelease (push) Has been skipped
This removes the hard-coded end level behaviour of the bird guardian in
TR2. For OG, an injection is provided to add a command to the death
animation to yield the same result; custom levels can modify the object
accordingly externally.

Resolves #1583.
2025-04-12 08:41:07 +01:00
lahm86
36ab43f0b3 tr2/option_passport: add new game options
Some checks are pending
Run code linters / Run code linters (push) Waiting to run
Publish a pre-release / Build TR1 (push) Has been skipped
Publish a pre-release / Build TR2 (push) Has been skipped
Publish a pre-release / Create a prerelease (push) Has been skipped
This adds NG+, Japanese, and Japanese NG+ options (as well as regular
NG) to the new game page in the passport.

Resolves #2731.
2025-04-11 21:30:11 +01:00
Marcin Kurczewski
98acd91c5a tr2/options: add graphic options dialog
Resolves #1615.
2025-04-11 08:25:16 +02:00
lahm86
4350fa2d10 stats/types: move statistic types to TRX
This moves the various statistic structs to TRX and updates naming and
types such that both games match as far as possible.
2025-04-08 20:47:40 +01:00
lahm86
0d80ca8f8f tr2/savegame: implement BSON saves
Some checks are pending
Run code linters / Run code linters (push) Waiting to run
Publish a pre-release / Build TR1 (push) Has been skipped
Publish a pre-release / Build TR2 (push) Has been skipped
Publish a pre-release / Create a prerelease (push) Has been skipped
This implements BSON save games, similar to TR1, and opts for it to be
used in place of legacy for writing. Saves will also be stored in a
separate saves directory.
2025-04-06 20:56:25 +01:00
lahm86
b670eaa16a tr2/data: create images directory
This updates the game flows to look in a dedicated images directory in
order to tidy up the main data folder. Default images provided as PNG
to avoid users having to copy manually.
2025-03-30 12:34:54 +01:00
lahm86
f396ef4514 tr2: add support for The Golden Mask
This implements support for the Golden Mask by providing relevant game
flow files, command line handling, and object alias setup on launch.

Resolves #1554.
Resolves #1604.
Resolves #1621.
Resolves #2667.
2025-03-24 14:46:21 +00:00
lahm86
3d47493af6 tr2/game_flow: implement bonus level support
This implements bonus level handling the game flow for TR2, similar to
TR1.

Resolves #2668.
2025-03-22 17:25:22 +00:00
lahm86
e45f331ec5 tr2/game_flow: remove secret count from game flow
This removes the need the control around setting secret counts in the
game flow, which is now redundant.
2025-03-21 18:16:38 +00:00
Marcin Kurczewski
39a4279a2e tr1/output: render room sprites using new approach 2025-03-20 18:16:02 +01:00
Marcin Kurczewski
2f7a1aa46d gfx/gl: extract common shader code
Some checks are pending
Run code linters / Run code linters (push) Waiting to run
Publish a pre-release / Build TR1 (push) Has been skipped
Publish a pre-release / Build TR2 (push) Has been skipped
Publish a pre-release / Create a prerelease (push) Has been skipped
2025-03-20 14:20:02 +01:00
Marcin Kurczewski
57c7146f32 gfx/gl: remove opengl 2.1 support
According to GitHub comments, it was not working anyway.
2025-03-20 14:20:02 +01:00
lahm86
64fb3d2955 tr2/game_flow: specify savegame format in game flow
This allows defining the savegame format string in the game flow.
2025-03-17 06:41:04 +00:00
lahm86
0b231c2afa tr2/game_flow: specify title background in game flow
This allows the title background picture path to be defined in the game
flow.
2025-03-17 06:41:04 +00:00
lahm86
5eef83b912 tr2/data: fix pickup mesh scaling and rotations
This fixes scaling on various pickup model meshes, and in the case of
the Barkhang prayer wheel, restores base animation data. It also fixes
default rotations on some models so they appear correctly in the
inventory.

Resolves #1831.
Resolves #1832.
Part of #1894.
2025-03-15 16:29:38 +00:00
lahm86
969039bac5 tr2/data: fix seaweed collision in Living Quarters
Some checks are pending
Run code linters / Run code linters (push) Waiting to run
Publish a pre-release / Build TR1 (push) Has been skipped
Publish a pre-release / Build TR2 (push) Has been skipped
Publish a pre-release / Create a prerelease (push) Has been skipped
This fixes the seaweed collision in Living Quarters, which can prevent
Lara from climbing out of the water in certain places.

Resolves #2197.
2025-03-14 22:01:33 +00:00
lahm86
37e83b9638 tr2/data: add camera shutter SFX to cutscenes
Some checks are pending
Run code linters / Run code linters (push) Waiting to run
Publish a pre-release / Build TR1 (push) Has been skipped
Publish a pre-release / Build TR2 (push) Has been skipped
Publish a pre-release / Create a prerelease (push) Has been skipped
This injects the camera shutter SFX for photo mode in cutscenes.

Resolves #2280.
2025-03-14 09:53:31 +00:00
lahm86
dfbec724eb tr2/data: fix missing enemy SFX
This restores SFX details for the gunman and stick goon in the
underwater levels.

Resolves #2293.
2025-03-14 09:53:31 +00:00
lahm86
0245db179d tr2/game_flow: specify SFX file in game flow
Some checks are pending
Run code linters / Run code linters (push) Waiting to run
Publish a pre-release / Build TR1 (push) Has been skipped
Publish a pre-release / Build TR2 (push) Has been skipped
Publish a pre-release / Create a prerelease (push) Has been skipped
This removes the hardcoded reference to main.sfx, and allows it to be
defined globally in the game flow, and per level.

Resolves #2615.
2025-03-13 20:44:34 +00:00
Marcin Kurczewski
888ffaee07 tr2: add quadrilateral interpolation 2025-03-12 22:43:20 +01:00
Marcin Kurczewski
98a3928701 cmd/pos: improve formatting; enable in tr1 cutscenes 2025-03-11 23:07:35 +01:00
Marcin Kurczewski
4eb4cbd34b cmd/pos: use proper prefix for demos and cutscenes 2025-03-11 23:07:35 +01:00
Marcin Kurczewski
0e85a3d155 tr2: add accented fonts
Resolves #2356.
2025-03-11 21:10:32 +01:00
lahm86
655bd311fb data: rebuild injection files
Some checks are pending
Run code linters / Run code linters (push) Waiting to run
Publish a pre-release / Build TR1 (push) Has been skipped
Publish a pre-release / Build TR2 (push) Has been skipped
Publish a pre-release / Create a prerelease (push) Has been skipped
This replaces all injection files with those built in the new
chunk/zlibbed format. Qualopec and Mines enemy texture fixes have also
been merged into their respective level file injections.
2025-03-11 18:11:52 +00:00
Marcin Kurczewski
c2a930a1cb tr2/shell: add -l argument support 2025-03-11 13:50:03 +01:00
Marcin Kurczewski
cf9c0c9557 tr1/output: add quadrilateral interpolation
Resolves #354
2025-03-10 23:18:52 +01:00
Marcin Kurczewski
d91f0afeef output: move rhw multiplication to the shader 2025-03-10 23:18:52 +01:00
Marcin Kurczewski
843f96305d tr2/game-flow: fix carrying final level stats
Resolves #2480 where the final level statistics were not being added to
the overall cumulative stats. TR1 was not affected by this problem
because it records the current statistics in the resume/start
information for the current level, unlike TR2, which continues to store
these statistics in a separate structure.
2025-02-10 18:09:23 +01:00
Marcin Kurczewski
360c1cde6a game-flow: fix setting the NG+ flag
Resolves #2474. The check for the last level only happens in the
`level_complete` event, which will be followed with an exit to title
anyway.
2025-02-10 10:55:31 +01:00