Commit graph

8102 commits

Author SHA1 Message Date
Kubsy
fba0dd384d Update Resources.rc 2023-07-20 11:40:44 +01:00
Kubsy
1a53d3a1b4 Update Resources.rc 2023-07-20 11:39:58 +01:00
Sezz
f9447bad7d Merge branch 'develop' into better_look_camera 2023-07-20 18:55:05 +10:00
Sezz
f005686017 Merge branch 'develop' into Adngel-Floor-Data-Flag-Debug-Mode 2023-07-20 18:53:06 +10:00
Sezz
6d533cb325 Update lara_one_gun.cpp 2023-07-20 18:52:19 +10:00
Sezz
c875221d06 Minor formatting of recent renderer merge 2023-07-20 18:49:49 +10:00
Sezz
1d82d14e55 Tone down label colours 2023-07-20 18:24:56 +10:00
Sezz
4dd8317daa Merge branch 'Adngel-Floor-Data-Flag-Debug-Mode' of https://github.com/MontyTRC89/TombEngine into Adngel-Floor-Data-Flag-Debug-Mode 2023-07-20 18:19:12 +10:00
Sezz
8ef20e9350 Update sector debug 2023-07-20 18:17:55 +10:00
Adngel
50a65c2d7c Simplification_1
Removed the temporal local variables sending the content directly to the function parametters.
2023-07-19 19:32:09 +02:00
Jakub
18e57c701f
Update Changes.txt 2023-07-19 16:26:30 +01:00
Jakub
f69a0cbfcb
Renderer fixes for 1.1.0 (#1158)
* Cleaned DX log spam

(cherry picked from commit b56d7c0f79)

* Fixed more DX log spam; WIP cycle detection in rooms collector;

(cherry picked from commit 081b2c2e4d)

* Fixed black debris and statics drawing

* Fixed norml mapping; Added log for pixel shader compilation;

* Added unpack of normal maps from XY to XYZ

(cherry picked from commit 0534022875)

* Fixed Lara shadows

* Fixed caustics

(cherry picked from commit 2ae74ca33a)

* Fixed spots and suns

(cherry picked from commit 8c3a1b6102)

* Re-enable shader optimizations for release build

* Update Renderer11Frame.cpp

* fixed laser effect in Blending.hlsli

* Fixed spot shadow direction;
Increased shadow map bit per pixel

* Fixed specular for spot lights

* Fixed sun bulbs specular

* Fixed specular appearing outside spot light cone

---------

Co-authored-by: MontyTRC89 <montyhammet@hotmail.it>
Co-authored-by: Lwmte <3331699+Lwmte@users.noreply.github.com>
Co-authored-by: Nemoel-Tomo <tomo_669@hotmail.com>
2023-07-19 14:56:34 +01:00
Sezz
3a9889b479 Organise function 2023-07-19 20:24:43 +10:00
Sezz
2cddb578ad Rename step function 2023-07-19 18:24:33 +10:00
Sezz
6af1d9e92e Simplify step interpolation 2023-07-19 18:06:35 +10:00
Sezz
929b966ac6 Update lara_helpers.cpp 2023-07-19 17:44:02 +10:00
Sezz
6d508ce1ba Update lara_helpers.cpp 2023-07-19 15:36:41 +10:00
Sezz
c127e1faa6 Simplify flex reset 2023-07-19 15:21:31 +10:00
Sezz
308eb01a5e Move zoom control 2023-07-19 15:20:45 +10:00
Sezz
2a4658fa81 Address another potential bit overflow 2023-07-19 12:48:20 +10:00
Sezz
a43bc60822 Fix bit overflow 2023-07-19 12:45:16 +10:00
Adngel
57dbfedc5b Added Floating Text replacing the Spheres.
- Added a function AddDebugString, it calls the AddString to draw a floating text, but before it checks with if the required Debugpage is being renderer. (To make it more similar to the other Debug drawing methods).

- Changed the DrawNearbyTileFlags function to draw text labels with the flags names instead of geometry shapes.
2023-07-18 17:49:30 +02:00
Jakub
4b2a42067a
Update Changes.txt 2023-07-18 16:45:17 +01:00
Sezz
c7e1ca9781 Simplify 2023-07-18 23:44:50 +10:00
Sezz
548546f4d4 Rename lambda 2023-07-18 23:28:04 +10:00
Sezz
1f3ad795a9 Fully fix optics 2023-07-18 23:27:12 +10:00
Adngel
ba4318ef43 Merge branch 'develop' into Adngel-Floor-Data-Flag-Debug-Mode 2023-07-18 15:16:28 +02:00
Sezz
0e4f6d22ad Merge branch 'develop' into better_look_camera 2023-07-18 21:43:04 +10:00
Sezz
3191f9ce3d Avoid using IN_JUMP 2023-07-18 21:11:15 +10:00
Sezz
fc440e1582 Demagic constants 2023-07-18 20:36:50 +10:00
Sezz
4abdc98306 Use StepLeft and StepRight to zoom 2023-07-18 20:23:27 +10:00
Sezz
c7fc8c1139 Use references 2023-07-18 20:19:09 +10:00
Sezz
98e312528f Mostly fix optics 2023-07-18 19:55:00 +10:00
Sezz
cae120e5eb Simplify bindings 2023-07-18 17:42:21 +10:00
Sezz
21813578f3 Merge branch 'develop' into better_look_camera 2023-07-18 17:28:10 +10:00
Lwmte
fd11122536
Object handler (#1162)
* Initial commit

* Don't write anim number to savegame if underlying object ID is nonexistent

* Add more safeguards for more cases of unsafe access in savegame function

* Use proper naming convention

* Update Setup.h

---------

Co-authored-by: Sezz <sezzary@outlook.com>
2023-07-18 16:31:37 +10:00
Sezz
895b5db0b2 Uncomment script actions; last-minute ordering 2023-07-18 16:13:59 +10:00
Sezz
9c0523dea4
Bindable vehicle actions (#1161)
* Introduce bindable vehicle actions

* Update key names

* Convert C strings to vectors

* Update names

* Update names

* Merge branch 'develop' into sezz_bindable_vehicle_actions

* Improve boat and kayak dismounts

* Update .gitignore

* Update action strings

* Update macro

* Use simpler vector names

* Remove kayak action bits

* Fix skidoo firing

* Update configuration.cpp

* Resize config bindings vector when necessary
2023-07-18 15:53:29 +10:00
Sezz
a55b3a7c73 Update savegame 2023-07-18 15:41:08 +10:00
Sezz
30c1b14294 Partial optics handling refactor 2023-07-18 15:24:24 +10:00
Sezz
71a71f043a Adjust camera distance; demagic values 2023-07-18 13:37:03 +10:00
Sezz
b971a9e3fd Merge branch 'master' into better_look_camera 2023-07-18 13:22:42 +10:00
Sezz
0118a6c02d Merge branch 'develop' into better_look_camera 2023-07-18 02:10:29 +10:00
Sezz
fd77ff88f8 Handle key binding reset in engine version upgrades 2023-07-17 16:19:34 +10:00
Kubsy
3893951c63 Update Changes.txt 2023-07-16 18:22:06 +01:00
Jakub
be8efe6feb
Cosmetic changes and fix to harpoon bolts and rockets (#1131)
* Cosmetic changes to visible bolts and gunshells

- fixed the harpoon bug when shooting vertically
- added specific constants for harpoon and for arrows, so that they can be later refractored for lua costumization
- added splash for rockets when entering water
- added sound effect when shooting harpoons from the UPV

* Update upv.cpp

- Corrected sound for FireUPVHarpoon: now the Dry sound is played on surface and the Wet sound is played underwater

* Fix formatting; use std::optional

* Remove newline

* Remove commented block

* Fix projectile type

* Fix harpoon shattering on room collision

* Fix UPV firing sound

---------

Co-authored-by: Gian C <30839164+Gancian@users.noreply.github.com>
Co-authored-by: Sezz <sezzary@outlook.com>
Co-authored-by: Lwmte <3331699+Lwmte@users.noreply.github.com>
2023-07-16 17:51:47 +01:00
Lwmte
5cc5e5eb2d Update Changes.txt 2023-07-15 22:23:03 +02:00
Kubsy
aa821b6969 Update Changes.txt 2023-07-15 14:43:10 +01:00
Sezz
c1b674be8d
Dehardcode quick actions and menu actions (#1154)
* Hotkey progress

* Fix scrolling; fix x64 compiler errors

* Dehardcode item hotkeys

* Move player quick actions to more appropriate file

* Get weapon scrolling to work

* Move SayNo action

* Update gui.cpp

* Add menu controls screen

* Dehardcode more menu actions

* Simplify

* Move helper functions

* Simplify

* Use std::string for key names; fix crouch action

* Fix lean reset

* Update lara_helpers.cpp

* Fix binding application

* Update gui.cpp

* Update gui.cpp

* Reorder input actions; update script enum

* Update gui.cpp

* Fix menu highlight error

* Fix default xbone bindings

* Simplify action string categories

* Commit to tentative Light action; prepare more vehicle action code

* Move medipack code to subfunction

* Move medipack code to subfunction

* Update lara_helpers.cpp

* Remove flare no

* Add missing comma

* Rename Light back to Flare

* Rename Option to Inventory

* Update lara_helpers.cpp

* Update lara_helpers.cpp

* Update strings

* Fix typo

* Fix medipack functionality

* Update arrow positioning and make arrows flash

* Update input strings and defaults

* Update action order

* Remove include

* Add arrow string constants

* Update Renderer11DrawMenu.cpp

* Update Renderer11DrawMenu.cpp

* Update Renderer11DrawMenu.cpp

* Address PR comments

* Update lara_helpers.cpp

* Use consistent line spacing

* Update Renderer11DrawMenu.cpp

---------

Co-authored-by: Lwmte <3331699+Lwmte@users.noreply.github.com>
2023-07-15 14:28:19 +01:00
Lwmte
b5eb8088fa Fix mesh initialization for meshswap cases 2023-07-15 10:33:04 +02:00