Commit graph

35 commits

Author SHA1 Message Date
Kewin Kupilas
f2c52e61aa
Add "Lara's Home" menu entry (#1394)
* Add "Lara's Home" menu entry

* Minor things

* Move home_level into Strings.lua

* Lara's Home -> Home Level

---------

Co-authored-by: Sezz <sezzary@outlook.com>
2024-08-11 17:20:09 +01:00
Lwmte
9f38943005 Update scripts structure 2024-01-06 13:36:18 +01:00
Lwmte
f677a5071c
Split strings file (#1204)
* Initial Commit
* Rename
* Alphabetise system strings; minor formatting
* Fix missed rename
* Alphabetise user strings
* Newline
* Bug fix with default Strings.Lua file resulted in a crash.
* Rename in iterator

---------

Co-authored-by: Sezz <sezzary@outlook.com>
Co-authored-by: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
2023-08-31 23:14:17 +03: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
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
95ff7091a9
Sound engine enhancements (#1141)
* Finalize features

* Add descriptions

* Amplify loudness output

* fix compile error

* Add subtitle parser for voice track

* Update bass.lib

* Return nil instead of empty string if no subtitle is found

* Allow to use newlines in subtitles

* Additionally try to load subtitles from /subtitles subdirectory

* Don't stop ambience when Lara dies

* Add option for turning subtitles on or off

* Update TombEngine.vcxproj

* Parse newlines correctly in subtitles

* Add millisecond constant

* Align menu

* Minor formatting; remove newlines preventing tooltips

---------

Co-authored-by: Kubsy <kubadd475@gmail.com>
Co-authored-by: Sezz <sezzary@outlook.com>
2023-06-17 12:02:51 +01:00
Leif Melles
84a21c776b
Lua set level secrets (#862)
* Set Secrets for level
* Set NumberOfSecrets to TotalNumberOfSecrets
* Secrets for Level Display
* Get LevelSecrets with BitSet Count
* Change Short to Int
2022-11-23 14:31:32 +02:00
Lwmte
d74bb5ae4d Remove uppercase conversion 2022-11-16 10:26:31 +02:00
Lwmte
8b9f6b25ab Revert "Update ammo strings"
This reverts commit 3fc8fb3266.
2022-11-16 10:24:54 +02:00
Sezz
3fc8fb3266 Update ammo strings 2022-11-16 18:33:14 +11:00
Sezz
db6df48184 Revert "Update Strings.lua"
This reverts commit 4def16178b.
2022-11-15 17:28:34 +11:00
Stranger1992
4def16178b Update Strings.lua 2022-11-15 00:16:38 +00:00
Stranger1992
b1567b0792 Removed wrongly merged strings 2022-11-15 00:15:19 +00:00
Sezz
85f6f82915 Fix "Statistics" string in pause menu; update strings 2022-11-14 12:33:52 +11:00
Sezz
2e8e242fa0 Update strings 2022-11-08 16:52:09 +11:00
Sezz
2bba8dddad Add comment to Strings.lua 2022-11-08 16:49:12 +11:00
Sezz
0b37160dc1 Update strings 2022-11-08 11:46:45 +11:00
Sezz
82696e7ffd Update strings 2022-11-05 16:58:44 +11:00
Sezz
9f75122186 Update strings 2022-11-05 12:27:01 +11:00
Sezz
1162405860 Reformat strings 2022-11-05 00:57:31 +11:00
Sezz
c32be322ab Merge branch 'master' into very_experimental_input_stuff 2022-08-12 23:44:05 +10:00
Lwmte
e4f6db0a3e Add antialiasing (#645)
* Add FXAA
* Use existing luma function
* Fix order of rendering not to affect GUI by AA
* Update Renderer11Draw2D.cpp
* Add MSAA as medium and high quality AA levels
* Update configuration.h
* Update Changes.txt
* Update DX11_FinalPass.fx
* Reduce FXAA blurriness
2022-08-08 21:32:33 +03:00
Sezz
97152a5bd6 Merge branch 'ten_beta' into very_experimental_input_stuff 2022-08-05 14:12:16 +10:00
Lwmte
3992e68b33 Clean up scripts more 2022-08-04 20:06:28 +03:00
Sezz
f22cb6ef8c Update strings for later; comment out vehicle-related enum entries again because the enum length is tied to the controls menu 2022-07-14 00:11:03 +10:00
Raildex
84f93608bb Cubemap shadow (#558)
* Cubemap shadow WIP
* Fade out Point Light Shadow
* Fixed SpotLight Direction and Angle

Added Fadeout at the edges of Spot Light Cone

* Using Light.Out for Spot Light Projection Matrix
* Added Experimental Blob Shadows
* Fixed Crash with too many blob shadows.

Now using the 16 nearest spheres

* Remove long unused UNIT_SHADOW
* Fix merge
* Check cast shadows flag for dynamic shadows generation
* Make shadow spheres count customizable, add "shadows: all" setting
* Fix headers
* Fix copypaste error
* Fix shader compiling
* Format code, make subfunction for blobs rendering

Co-authored-by: Raildex <n@a>
Co-authored-by: Lwmte <3331699+Lwmte@users.noreply.github.com>
2022-06-29 17:54:48 +03:00
Lwmte
12663c7ce2 OIS input system (#556)
* Work

* Add ois.lib

* Add OIS headers/libs to project

* Fix small mistakes

* Update input.cpp

* Update input.cpp

* Update input.cpp

* Remove unnecessary event handlers as we are using direct polling

* Fix numpad controls not polling

* Enclose all input code under namespace, provide debug OIS lib variation

* Fix incorrect inventory call binding, add pause to control dialog

* Deselect by pushing inventory button as well, fix crossbow ammo string draw

* Demagic NUM_CONTROLS

* Verbose input init logging

* Calibrate and properly register movement analog axis input

* Fix crash when empty string is being displayed

* Initialize vibration interface, if it exists

* Register keyboard directional input as analog axis input as well

* Fix statistics exiting

* Fix weird UpdateInput call

* Copy current layout to configuration

* Fix issues with saving controls

* Register axis values for POVs too

* Register several POV directions at once

* Increase deadzone a bit

* Simplify enums

* Update input.cpp

* Move includes out of input.h

* Bump deadzone even further as it seems xbox controllers have massive axis errors

* Prevent event spamming in case OIS polling failed

* Destroy input system on exit, cosmetic changes

* Take deadzone into account when normalizing axis values

* Update TombEngine.vcxproj

* Resolve small precision loss in axis normalizing

* Clean up unused control constants and enums

* Update input.h

* Demagic InputActions enum

* Render pause menu header

* Introduce helper functions to modulate Lara turn rates and begin replacements

* Make turn directions explicit

* Conduct remaining replacements of turn rate modulations

* Update lara_helpers.cpp

* Add smoothstep function to math library

* Use scaled axis value for true analog input

* Update input.cpp

* Add Joey's camera rotation from old branch

* Fix camera not going back to previous position when stick is released

* Simplify ModulateLaraTurnRate()

* Widen look angle

* Avoid collisions with actions bound to non-directional axis

* Small tidying

* Remove unused header

* Remove copypasted code

* Mask flare animation

* Rename 5th and 6th axis to LT/RT

* Prototype force feedback support

* Add directional rumble support (probably XInput-only)

* Shake controller on startup if supports vibration

* Update OIS libs to support XInput FF

* Simplify ModulateLaraTurnRate()

* Update player modulation functions; simplify turning, leaning, and flexing in state functions; lara.h cleanup

* Update Win32ForceFeedback.h

* Fix crawl flex function

* Revert "Update Win32ForceFeedback.h"

This reverts commit aa7099ed5b.

* Update OIS libs

* Add options for thumbstick camera and vibration

* Make use of autotarget option

* Display NON-SCREAMING names in controls, add hack to cancel axis value on both right+left input events

* Remove useless control hacks for simultaneous directional input

* Delete ten_itemdata_generated.h

* Add scroll lock to bindable controls

* Update input.cpp

* Update input.cpp

* Make input device namings consistent

* Bring back IN_SELECT override

* Fix crashing on startup and some other bugs

* Add rumble to some in-game events

* Add some more vibration events, stop them when going to menus

* Some changes to rumble power

* Add rumble for rocket/grenade launchers and explosive damage

* Add rumble for screen shake effect

* Fix 2 mistakes in inventory strings

* Rumble for camera more precisely

* Fix debounce in binocular mode

* Update camera.cpp

* Add HK lasersight rumble

* Simplify ModulateLaraLean()

* Update input.cpp

* Fix crawl flex modulation(?)

* Add slight rumble to harpoon and crossbow fire

* Remove the confusing counteracting turn rate reset in favour of something simpler

* Simplify turn rate reset input checks; leanup

* Clamp turn rate axis coeff when airborne

* Remove empty line

* Simplify a function

* Cleanup

* Fix rumble being constant

* Use shorter rumble time for shooting guns

* Fix single arm shooting

* Fix leaning left with joystick; clamp crawl flex max; tweak walk lean max; cleanup

* Don't do too long splat and jump smash vibrations

* Cancel turn rate when exiting water, grabbing ledge, or doing a splat

* Rename function

* Move ModulateLaraTurnRateY() callsin crawl and crouch turn states

* Reset turn rate when performing crawl vault

* Convert all health decrease events to DoDamage calls

* Remove SpasmEffectCount and unify touching with DoDamage

* Give specific time delay before sprint jump is possible

* Don't rumble on zero damage

* Reorder input pipeline to prevent left+right collisions

* Rename shady global

* Rumble when breaking neck in swandive

* Update lara_jump.cpp

* Don't vibrate on soft splat

* Fix combine item text alignment

* Vibrate in settings only if setting was changed

* Pulse gamepad on critical health condition

* Don't get out of water into objects

* Add critical air constant

Co-authored-by: Sezz
2022-06-25 23:53:58 +10:00
Lwmte
003773b6ca Update scripts and make engine compile (unless we merge new sound enums) 2022-06-07 12:26:20 +03:00
Lwmte
e127534165 Squashed commit of the following:
Partially move inventory control from renderer
    Exit statistics with accept key as well
    Fix blinking
    Fix various remaining problems
    Add missing string
    Fix some menus
    Finalizing GUI rewrite
    Work
2022-06-07 03:59:02 +03:00
Stranger1992
0024722fde Fixed slight inconsistencies in String names 2022-05-31 21:31:28 +01:00
Stranger1992
1be460a557 @hispidence Why is there two torch strings? modified for now. 2022-05-10 22:09:48 +01:00
Stranger1992
bd9a8a0af4 Fixed "No String Found" for harpoon gun. 2022-05-10 21:53:31 +01:00
hispidence
1481984693 Cherry pick c219ce03af 2022-02-14 21:35:47 +00:00
hispidence
e2a40fe42e Fix up Gameflow.lua, Settings.lua and Strings.lua. 2022-02-13 20:38:55 +00:00
Lwmte
59263279fe Provide scripts file into repo 2021-12-01 15:31:39 +03:00