lahm86
cdfb5942c1
tr2/data: fix Living Quarters flame deactivation
...
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
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
Run code linters / Run code linters (push) Has been cancelled
2025-04-26 19:55:58 +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
88f41c5a75
tr2/inventory: fix button mashing loading game instead of saving
...
Resolves #2863 .
2025-04-26 20:43:42 +03:00
Marcin Kurczewski
820fc307d2
audio: split into smaller functions
2025-04-26 19:19:31 +02:00
Marcin Kurczewski
3696e84925
audio: split into smaller functions
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
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
92ff6e12c7
game-strings: use OG JSON as a fallback in expansions
...
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
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
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
10b9bcc780
option: port sound settings dialog to ui
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
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
...
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
...
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
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
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
4fa521d956
tr2/shell: fix support for dual monitors
...
Addresses #2820 .
2025-04-22 23:50:14 +02:00
Marcin Kurczewski
8133f72e20
tr2/shell: improve moving window around
2025-04-22 22:39:20 +02:00
Marcin Kurczewski
0adefabf41
data: use HD assets
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
daf6dc3020
output: allow aspect-ratio specific images
2025-04-22 09:08:56 +02:00
Marcin Kurczewski
fbc26fcba6
docs: update logos
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
938dffddce
tr2/flares: fix thrown flares embedding in the ground
2025-04-21 12:16:44 +02:00
Marcin Kurczewski
0654940d6f
tr2/flares: fix flicker in 60 fps
...
Resolves #2806 . The OG mistakenly used the wrong arm (right instead of
left) to determine the flare light position in
`Lara_GetJointAbsPosition_I`. At 60 FPS, this mistake caused Lara's hand
position to appear significantly off from the expected location, which
coincidentally led to the flicker effect disappearing. While fixing the
bone did position Lara's hand correctly, it didn't bring back the
missing flicker at 60 FPS. In fact, it caused the flicker effect to
disappear at 30 FPS as well, making it static at both frame rates. It
turned out that although the game does randomize the position of the
flares' light source, it doesn't do so sufficiently. The primary cause
of the flickering was actually the randomness introduced by using the
incorrect bone. To restore the flicker effect to how it originally
appeared, I had to enhance the randomness of the flare's light position.
2025-04-21 10:38:36 +02:00
lahm86
cd67279fc7
tr2/objects/gondola: save gondola position
...
This updates gondola objects to have their positions saved in order to
be able to restore them correctly on load when they've been destroyed.
Legacy saves will ignore this.
Resolves #1612 .
2025-04-20 20:44:37 +01:00
Marcin Kurczewski
6e48174a92
config: fix assault course times reset on quit
...
Resolves #1578 .
2025-04-20 21:25:45 +02:00
lahm86
0c0ce5bcf6
tr2/objects/boat: fix initial water height test
...
This fixes the boat's initial water height test when Lara is climbing
on to avoid tinting it unnecessarily.
Resolves #2787 .
2025-04-20 19:41:03 +01:00
Marcin Kurczewski
f04a18f208
tr2/ui: port save/load dialog to ui
2025-04-20 17:07:49 +02:00
lahm86
e7fb4616e8
docs: update docs for hotkeys fix
...
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
Re #2797 , which was fixed in 0.6.
2025-04-20 15:06:28 +01: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
092fe1dc70
console/pos: show flipped room when applicable
...
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
If Lara is in a room and the flipmap is on, the console will now report
the flipped room's number when using the pos command.
Resolves #2487 .
2025-04-19 22:56:09 +01:00
lahm86
51af4233be
console/teleport: pass room numbers when known
...
This updates the teleporting logic to pass room number to Lara's
teleport function when they are already known, rather than finding
rooms by position in all cases. This may result in telporting to
positions (i.e. with no rooms) being less lenient when overlapping
rooms are involved.
Resolves #2486 .
2025-04-19 22:56:09 +01:00
lahm86
fa5a4f118b
objects/movable_block: fix angle resetting and snapping
...
This restores pushblock angles after performing collision tests, and
also snaps them to the grid on initialisation if a builder places them
at non 90 degree angles to avoid instead snapping during collision.
Resolves #2776 .
2025-04-19 19:03:30 +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
7bf7c2e6b5
ui2: port pause exit dialog
2025-04-18 10:53:35 +02:00
lahm86
ec2a0452ff
tr2/savegame: save and load current music
...
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 allows the current music track and position to be saved and
restored on load, similar to TR1X.
Resolves #2579 .
2025-04-17 19:34:35 +01:00
lahm86
0e24b65ae6
tr2/objects/waterfall: save waterfall flags
...
This updates waterfall objects to have their flags saved in order to be
able to restore them correctly on load. Legacy saves will ignore this.
Resolves #2686 .
2025-04-17 17:22:14 +01: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