Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move TR1 FMV player to libtrx and update TR2 to use it #1730

Merged
merged 2 commits into from
Oct 21, 2024
Merged

Move TR1 FMV player to libtrx and update TR2 to use it #1730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ce4fc4
video: create
rr- Oct 19, 2024
fb21aed
tr2/fmv: use ffmpeg backend
rr- Oct 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions docs/tr2/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
## [Unreleased](https://github.com/LostArtefacts/TRX/compare/tr2-0.5...develop) - ××××-××-××
- fixed `/give` not working with weapons (regression from 0.5)
- fixed the camera being cut off after using the gong hammer in Ice Palace (#1580)
- fixed the audio not being in sync when Lara strikes the gong in Ice Palace (#1725)
- improved FMV mode appearance - removed black scanlines (#1729)
- improved FMV mode behavior - stopped switching screen resolutions (#1729)
- improved switch object names
- Switch Type 1 renamed to "Airlock Switch"
- Switch Type 2 renamed to "Small Switch"
- Switch Type 3 renamed to "Switch Button"
- Switch Type 4 renamed to "Lever/Switch"
- Switch Type 5 renamed to "Underwater Lever/Switch"
- fixed `/give` not working with weapons (regression from 0.5)
- fixed the camera being cut off after using the gong hammer in Ice Palace (#1580)
- fixed the audio not being in sync when Lara strikes the gong in Ice Palace (#1725)

## [0.5](https://github.com/LostArtefacts/TRX/compare/afaf12a...tr2-0.5) - 2024-10-08
- added `/sfx` command
Expand Down
116 changes: 58 additions & 58 deletions docs/tr2/progress.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 26 additions & 26 deletions docs/tr2/progress.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4165,32 +4165,32 @@ typedef enum {
0x00457C79 0x001A + int32_t __fastcall Math_SinImpl(int16_t angle);
0x00457C93 0x002C + uint32_t __fastcall Math_Sqrt(uint32_t n);

0x00458D00 0x0006 * int __cdecl Player_PlayFrame(LPVOID, LPVOID, LPVOID, DWORD, LPCRECT, DWORD, DWORD, DWORD);
0x00458D06 0x0006 * int __cdecl Movie_GetTotalFrames(LPVOID);
0x00458D0C 0x0006 * int __cdecl Movie_GetCurrentFrame(LPVOID);
0x00458D12 0x0006 * int __cdecl Player_StartTimer(LPVOID);
0x00458D18 0x0006 * int __cdecl Player_InitMoviePlayback(LPVOID, LPVOID, LPVOID);
0x00458D1E 0x0006 * int __cdecl Movie_SetSyncAdjust(LPVOID, LPVOID, DWORD);
0x00458D24 0x0006 * int __cdecl Player_InitSound(LPVOID, DWORD, DWORD, BOOL, DWORD, DWORD, DWORD, DWORD, DWORD);
0x00458D2A 0x0006 * int __cdecl Movie_GetSoundChannels(LPVOID);
0x00458D30 0x0006 * int __cdecl Movie_GetSoundRate(LPVOID);
0x00458D36 0x0006 * int __cdecl Movie_GetSoundPrecision(LPVOID);
0x00458D3C 0x0006 * int __cdecl Player_GetDSErrorCode(void);
0x00458D42 0x0006 * int __cdecl Player_InitSoundSystem(HWND);
0x00458D48 0x0006 * int __cdecl Player_BlankScreen(DWORD, DWORD, DWORD, DWORD);
0x00458D4E 0x0006 * int __cdecl Player_InitPlaybackMode(HWND, LPVOID, DWORD, DWORD);
0x00458D54 0x0006 * int __cdecl Player_InitVideo(LPVOID, LPVOID, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD);
0x00458D5A 0x0006 * int __cdecl Movie_GetXSize(LPVOID);
0x00458D60 0x0006 * int __cdecl Movie_GetYSize(LPVOID);
0x00458D66 0x0006 * int __cdecl Movie_GetFormat(LPVOID);
0x00458D6C 0x0006 * int __cdecl Player_InitMovie(LPVOID, DWORD, DWORD, LPCTSTR, DWORD);
0x00458D72 0x0006 * int __cdecl Player_PassInDirectDrawObject(LPDIRECTDRAW3);
0x00458D78 0x0006 * int __cdecl Player_ReturnPlaybackMode(BOOL);
0x00458D7E 0x0006 * int __cdecl Player_ShutDownSoundSystem(void);
0x00458D84 0x0006 * int __cdecl Player_ShutDownMovie(LPVOID);
0x00458D8A 0x0006 * int __cdecl Player_ShutDownVideo(LPVOID);
0x00458D90 0x0006 * int __cdecl Player_ShutDownSound(LPVOID);
0x00458D96 0x0006 * int __cdecl Player_StopTimer(LPVOID);
0x00458D00 0x0006 + int __cdecl Player_PlayFrame(LPVOID, LPVOID, LPVOID, DWORD, LPCRECT, DWORD, DWORD, DWORD);
0x00458D06 0x0006 + int __cdecl Movie_GetTotalFrames(LPVOID);
0x00458D0C 0x0006 + int __cdecl Movie_GetCurrentFrame(LPVOID);
0x00458D12 0x0006 + int __cdecl Player_StartTimer(LPVOID);
0x00458D18 0x0006 + int __cdecl Player_InitMoviePlayback(LPVOID, LPVOID, LPVOID);
0x00458D1E 0x0006 + int __cdecl Movie_SetSyncAdjust(LPVOID, LPVOID, DWORD);
0x00458D24 0x0006 + int __cdecl Player_InitSound(LPVOID, DWORD, DWORD, BOOL, DWORD, DWORD, DWORD, DWORD, DWORD);
0x00458D2A 0x0006 + int __cdecl Movie_GetSoundChannels(LPVOID);
0x00458D30 0x0006 + int __cdecl Movie_GetSoundRate(LPVOID);
0x00458D36 0x0006 + int __cdecl Movie_GetSoundPrecision(LPVOID);
0x00458D3C 0x0006 + int __cdecl Player_GetDSErrorCode(void);
0x00458D42 0x0006 + int __cdecl Player_InitSoundSystem(HWND);
0x00458D48 0x0006 + int __cdecl Player_BlankScreen(DWORD, DWORD, DWORD, DWORD);
0x00458D4E 0x0006 + int __cdecl Player_InitPlaybackMode(HWND, LPVOID, DWORD, DWORD);
0x00458D54 0x0006 + int __cdecl Player_InitVideo(LPVOID, LPVOID, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD);
0x00458D5A 0x0006 + int __cdecl Movie_GetXSize(LPVOID);
0x00458D60 0x0006 + int __cdecl Movie_GetYSize(LPVOID);
0x00458D66 0x0006 + int __cdecl Movie_GetFormat(LPVOID);
0x00458D6C 0x0006 + int __cdecl Player_InitMovie(LPVOID, DWORD, DWORD, LPCTSTR, DWORD);
0x00458D72 0x0006 + int __cdecl Player_PassInDirectDrawObject(LPDIRECTDRAW3);
0x00458D78 0x0006 + int __cdecl Player_ReturnPlaybackMode(BOOL);
0x00458D7E 0x0006 + int __cdecl Player_ShutDownSoundSystem(void);
0x00458D84 0x0006 + int __cdecl Player_ShutDownMovie(LPVOID);
0x00458D8A 0x0006 + int __cdecl Player_ShutDownVideo(LPVOID);
0x00458D90 0x0006 + int __cdecl Player_ShutDownSound(LPVOID);
0x00458D96 0x0006 + int __cdecl Player_StopTimer(LPVOID);


# VARIABLES
Expand Down
Loading
Loading