Commit graph

5169 commits

Author SHA1 Message Date
Marcin Kurczewski
6d5bdd89a3 ui: improve modal sizing
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-28 11:46:57 +02:00
lahm86
a859d668f9 lara: test alignment position height validity in TR1
Some checks are pending
Run code linters / Run code linters (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 / Create a prerelease (push) Blocked by required conditions
Publish a pre-release / TR1 (Linux) (push) Waiting to run
Publish a pre-release / TR2 (Mac) (push) Waiting to run
This applies a fix introduced in TR2 to TR1 so that Lara doesn't become
clamped under a steeply sloped ceiling if picking up an item there.

Resolves #2879.
2025-04-27 21:53:55 +01:00
lahm86
e03c65ca0f lara/common: move Lara_AlignPosition to TRX
This merges Lara_AlignPosition (Item_AlignPosition) into TRX.
2025-04-27 18:57:03 +01:00
lahm86
ff86b5e712 tr2/objects: use common OBJECT_BOUNDS
This updates all relevant TR2 objects to use OBJECT_BOUNDS rather than
an arbitrary array of values for testing bounds. The approach is
equivalent to TR1. Lara_TestPosition has also been moved to TRX, and
kept in Lara's module rather than in items.c, as it's only used by
Lara.
2025-04-27 18:57:03 +01:00
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
lahm86
8b78a7f001 room: fix abyss height check
As Lara's position is stored as int32, we need to use the same in the
abyss height check function, otherwise internal casting yields invalid
results.

Resolves #2874.
2025-04-27 13:30:38 +01:00
Marcin Kurczewski
2cd998673f
Merge branch 'stable' into develop
Some checks are pending
Publish a pre-release / TR2 (Windows) (push) Waiting to run
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 (Mac) (push) Waiting to run
Publish a pre-release / Create a prerelease (push) Blocked by required conditions
2025-04-26 19:57:08 +02:00
Marcin Kurczewski
1f89b14a46
docs/tr2: release 1.0.2
Some checks failed
Run code linters / Run code linters (push) Has been cancelled
2025-04-26 19:55:58 +02:00
Marcin Kurczewski
9c0c0160df
game-strings: fix memory leak 2025-04-26 19:54:03 +02:00
Marcin Kurczewski
3e4017d338
game-strings: fix crash with -l/--level 2025-04-26 19:54:02 +02:00
Marcin Kurczewski
0c5b5dbb7b
tr2/inventory: fix button mashing loading game instead of saving
Resolves #2863.
2025-04-26 19:53:58 +02:00
Marcin Kurczewski
a7269bbe8a game-strings: fix memory leak 2025-04-26 20:53:15 +03:00
Marcin Kurczewski
f27d0435a9 game-strings: fix crash with -l/--level 2025-04-26 20:53:15 +03:00
Marcin Kurczewski
88f41c5a75 tr2/inventory: fix button mashing loading game instead of saving
Resolves #2863.
2025-04-26 20:43:42 +03:00
Marcin Kurczewski
d97edaf1eb
audio: fix clicks in sample decoding
Resolves #2846.
2025-04-26 19:19:32 +02:00
Marcin Kurczewski
820fc307d2
audio: split into smaller functions 2025-04-26 19:19:31 +02:00
Marcin Kurczewski
24b81007ba
audio: fix wrong benchmark times
The decoder benchmark was formatting the wrong variable and produced
meaningless results in the logs.
2025-04-26 19:19:28 +02:00
Marcin Kurczewski
0ba717edd5 audio: fix clicks in sample decoding
Resolves #2846.
2025-04-26 20:17:21 +03:00
Marcin Kurczewski
3696e84925 audio: split into smaller functions 2025-04-26 20:17:21 +03:00
Marcin Kurczewski
e439371c66 audio: fix wrong benchmark times
The decoder benchmark was formatting the wrong variable and produced
meaningless results in the logs.
2025-04-26 20:17:21 +03:00
Marcin Kurczewski
864589bf0a
game-strings: use OG JSON as a fallback in expansions
Resolves #2847.
2025-04-26 19:05:01 +02:00
lahm86
5a50de02ed
door: move door module to TRX
This moves the door module fully to TRX as the logic is identical in
both games.
2025-04-26 19:04:13 +02:00
lahm86
d6fc167749
tr2/objects/door: prevent Lara voiding in closed doors
This uses the same approach as TR1 to avoid Lara voiding in closing/
closed doors that are not placed on portals.

Resolves #2848.
2025-04-26 19:03:52 +02:00
Marcin Kurczewski
2f2f0c6842
tr2/viewport: fix screenshots at wrong resolution
Resolves #2845.
2025-04-26 19:03:16 +02:00
lahm86
4035fe6411
items: replace items by index rather than room
Carried items use NO_ROOM so were not included when replacing guns
with ammo. This ensures everything is checked when replacing IDs.

Resolves #2850.
Resolves #2856.
2025-04-26 19:03:09 +02:00
Marcin Kurczewski
e32a4c270f
docs: fix formatting and mistyped option name 2025-04-26 19:02:57 +02:00
Marcin Kurczewski
92ff6e12c7 game-strings: use OG JSON as a fallback in expansions
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
Resolves #2847.
2025-04-26 17:55:25 +03:00
Marcin Kurczewski
73da4c2945 shell: do not create logs with --help 2025-04-26 17:53:26 +03:00
Marcin Kurczewski
dc41197cd6 shell: improve support for CLI options
- Adds documentation
- Adds a --help switch
- Tidies short/long option form conventions
2025-04-26 17:53:26 +03:00
lahm86
890c7f76bb door: move door module to TRX
This moves the door module fully to TRX as the logic is identical in
both games.
2025-04-26 12:39:42 +01:00
lahm86
83ac9514cb tr2/objects/door: prevent Lara voiding in closed doors
This uses the same approach as TR1 to avoid Lara voiding in closing/
closed doors that are not placed on portals.

Resovles #2848.
2025-04-26 12:39:42 +01:00
Marcin Kurczewski
96b86b1605
docs/tr2: fix changelog merge mistake 2025-04-26 13:18:45 +02:00
Marcin Kurczewski
607ac811f0 tr2/viewport: fix screenshots at wrong resolution
Resolves #2845.
2025-04-26 14:07:54 +03:00
lahm86
15b758c57d items: replace items by index rather than room
Carried items use NO_ROOM so were not included when replacing guns
with ammo. This ensures everything is checked when replacing IDs.

Resolves #2850.
Resolves #2856.
2025-04-26 11:34:52 +01:00
Marcin Kurczewski
eec8f16d5f tools: download GM assets too 2025-04-26 13:06:08 +03:00
Marcin Kurczewski
2536ff55c1 docs: fix formatting and mistyped option name 2025-04-26 12:26:50 +03: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
Marcin Kurczewski
c00d0627cf
tr2: release 1.0.1
Some checks failed
Publish a pre-release / TR1 (Linux) (push) Has been cancelled
Publish a pre-release / TR1 (Windows) (push) Has been cancelled
Publish a pre-release / TR1 (Mac) (push) Has been cancelled
Publish a pre-release / TR2 (Linux) (push) Has been cancelled
Publish a pre-release / TR2 (Windows) (push) Has been cancelled
Publish a pre-release / TR2 (Mac) (push) Has been cancelled
Run code linters / Run code linters (push) Has been cancelled
Publish a pre-release / Create a prerelease (push) Has been cancelled
2025-04-24 23:37:15 +02:00
Marcin Kurczewski
a6ebaf5c38
docs/tr2: release 1.0.1 2025-04-24 23:37:10 +02:00
Marcin Kurczewski
3acab0dc34 tr2/ui: improve graphic settings dialog sizing
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
Resolves #2841.
2025-04-24 10:36:15 +03:00
lahm86
c590824944 game: prioritize save over load
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
This matches OG behaviour where save is preferred over load when both
inputs are detected on the same frame.

Resolves #2833.
2025-04-23 21:43:08 +01: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
lahm86
3030d694a5 tr2/shell: reload background image on aspect change
Resolves #2832.
2025-04-23 20:40:01 +01:00
lahm86
4d36177247 tr2/shell: fix PSX FOV option not being applied immediately
Resolves  #2831.
2025-04-23 20:40:01 +01:00
lahm86
b935707b5b tr2/option_controls: fix selected layout not saving
Resolves #2830.
2025-04-23 20:40:01 +01:00
Marcin Kurczewski
4d5040d15c misc: fix build warnings
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-23 11:37:52 +02:00
Marcin Kurczewski
e22bf087f6
tr2: release 1.0
Some checks failed
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
Run code linters / Run code linters (push) Has been cancelled
2025-04-23 07:41:34 +02:00
Marcin Kurczewski
c7b5932b94
docs/tr2: release 1.0 2025-04-23 07:41:29 +02:00
Marcin Kurczewski
69b08d55ca tr2/shell: center offscreen window on game launch
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 23:50:14 +02:00
Marcin Kurczewski
169ee7603f tr2/shell: allow negative window x,y 2025-04-22 23:50:14 +02:00