Commit graph

142 commits

Author SHA1 Message Date
Lwmte
c519c0029f Remove unused shader, clean up scripts 2022-08-04 05:23:56 +03:00
hispidence
a966bd491e Add arg to show strings of timers in EventSequences and allow them to be paused. 2022-08-04 00:21:40 +01:00
hispidence
01acec248c Initial commit of EventSequence (essentially TRNG Organizers) 2022-08-03 20:25:01 +01:00
hispidence
1347bdfce9 Add remaining time display to Timer. 2022-08-01 20:41:06 +01:00
hispidence
5343a989ab Improved Timer docs 2022-07-29 21:14:56 +01:00
hispidence
7d07241843 Improve Timer.lua. Document Timer.lua and Util.lua. 2022-07-29 21:12:54 +01:00
hispidence
c793400c40 Remove obsolete todo and debug print. 2022-07-28 22:19:53 +01:00
hispidence
1a098e6b31 Add initial version of Timer.lua. 2022-07-28 22:18:20 +01: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
Stranger1992
4292d0ef39 Fog implemented in default Gameflow.lua
Syntax for fog =

```level.fog = Fog.New(Red Value , Green Value , Blue Value , Distance fog starts (in sectors) , Distance fog ends (in sectors)```
2022-07-05 16:05:33 +01: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
9f4e933e8d Constants.lua removed - not needed anymore in repo as its internal 2022-06-02 11:06:18 +01:00
Stranger1992
0024722fde Fixed slight inconsistencies in String names 2022-05-31 21:31:28 +01:00
MontyTRC89
45d61b5ba9 Possible fix for levels without statics 2022-05-28 05:54:28 +02:00
Lwmte
0ea0f74222 Change level file extension in script 2022-05-17 13:25:41 +03: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
Stranger1992
74c7e89487 Revert "Updated scripts to load .ten files instead of .TRC"
This reverts commit c4b044c0b6.
2022-05-10 20:07:38 +01:00
Stranger1992
c4b044c0b6 Updated scripts to load .ten files instead of .TRC 2022-05-10 13:04:38 +01:00
Sezz
153e0a3d05 Update animation bools and fix Settings.lua; use correct block in monkey idle state 2022-05-06 01:47:54 +10:00
Sezz
e42538aa8d Revert "Update animation bools and fix Settings.lua; use correct block in monkey idle state"
This reverts commit 8305a2581b.
2022-05-06 01:44:15 +10:00
Sezz
8305a2581b Update animation bools and fix Settings.lua; use correct block in monkey idle state 2022-05-05 19:50:52 +10:00
MontyTRC89
7587d3470c Merge branch 'state_cleaning_tier_2' into luarefactor
# Conflicts:
#	.gitignore
#	Common/Game/collision/collide_room.h
#	Common/Game/control/control.h
#	Common/Game/items.h
#	Common/Specific/phd_global.h
#	Common/Specific/trmath.h
#	Scripting/src/TEN/Flow/Animations/Animations.h
#	Scripting/src/TEN/Flow/FlowHandler.cpp
#	Scripts/Settings.lua
#	TR5Main/Game/Lara/lara.cpp
#	TR5Main/Game/Lara/lara_basic.cpp
#	TR5Main/Game/Lara/lara_cheat.cpp
#	TR5Main/Game/Lara/lara_collide.cpp
#	TR5Main/Game/Lara/lara_crawl.cpp
#	TR5Main/Game/Lara/lara_helpers.cpp
#	TR5Main/Game/Lara/lara_jump.cpp
#	TR5Main/Game/Lara/lara_monkey.cpp
#	TR5Main/Game/Lara/lara_swim.cpp
#	TR5Main/Game/Lara/lara_tests.cpp
#	TR5Main/Game/animation.cpp
#	TR5Main/Game/camera.cpp
#	TR5Main/Game/collision/collide_item.cpp
#	TR5Main/Game/collision/collide_room.cpp
#	TR5Main/Game/collision/floordata.cpp
#	TR5Main/Game/control/control.cpp
#	TR5Main/Game/control/los.cpp
#	TR5Main/Game/control/volume.cpp
#	TR5Main/Game/effects/hair.cpp
#	TR5Main/Game/gui.cpp
#	TR5Main/Game/health.cpp
#	TR5Main/Game/items.cpp
#	TR5Main/Game/room.cpp
#	TR5Main/Game/savegame.cpp
#	TR5Main/Renderer/ConstantBuffers/MiscBuffer.h
#	TR5Main/Renderer/RenderPipelineState/RenderPipelineState.cpp
#	TR5Main/Renderer/RenderPipelineState/RenderPipelineState.h
#	TR5Main/Renderer/Renderer11Draw.cpp
#	TR5Main/Renderer/Renderer11Frame.cpp
#	TR5Main/Renderer/Renderer11Helper.cpp
#	TR5Main/Renderer/Renderer11Lara.cpp
#	TR5Main/Renderer/Renderer11PostProcess.cpp
#	TR5Main/Renderer/Renderer11Settings.cpp
#	TR5Main/Renderer/Renderer11String.cpp
#	TR5Main/Renderer/RendererSprites.h
#	TR5Main/Scripting/GameLogicScript.cpp
#	TR5Main/Scripting/GameScriptAnimations.cpp
#	TR5Main/Scripting/GameScriptItemInfo.cpp
#	TR5Main/Scripting/GameScriptItemInfo.h
#	TR5Main/Scripting/GameScriptMeshInfo.cpp
#	TR5Main/Scripting/GameScriptPosition.cpp
#	TR5Main/Specific/input.cpp
#	TR5Main/Specific/level.cpp
#	TR5Main/Specific/savegame/flatbuffers/ten_savegame_generated.h
#	TR5Main/TombEngine.vcxproj.filters
#	common/game/collision/collide_item.h
2022-05-05 06:28:43 +02:00
Sezz
b975037b54 Disable overhang climbing in script 2022-04-15 17:40:51 +10:00
hispidence
e1f73b8daf Add Util script. 2022-04-02 17:52:39 +01:00
Sezz
395ec6052d Update animation enum; fix 180 jump roll inputs; fix kayak paddle hold inputs; cleanup 2022-04-02 15:50:40 +11:00
Sezz
682faf6375 Implement sprint jump functionality; fix tread left/right input bug 2022-04-02 00:30:22 +11:00
Sezz
c8d34bfccb Update animation script 2022-03-04 15:51:53 +11:00
Sezz
3c4b8428a2 Merge branch 'master' into state_cleaning_tier_2 2022-03-02 22:17:11 +11:00
hispidence
48e018f7fb Remove Enums.lua (it's now redundant), update Gameflow.lua and Settings.lua. 2022-02-14 23:10:29 +00:00
hispidence
1481984693 Cherry pick c219ce03af 2022-02-14 21:35:47 +00:00
Stranger1992
d00aa9b539 Spellcheck for Game Strings 2022-02-13 23:12:24 +00:00
hispidence
e2a40fe42e Fix up Gameflow.lua, Settings.lua and Strings.lua. 2022-02-13 20:38:55 +00:00
Lwmte
ad289af026 Update Settings.lua 2021-12-22 02:21:10 +03:00
Sezz
7c01d050a4 Address remaining PR #377 comments; fix pickups in crouch and crawl states; simplify step function 2021-12-10 22:31:34 +11:00
Sezz
ab42c8627b Remove unnecessary conditions in step tests; reset torso and head rotation before perorming a crawl vault 2021-12-02 23:45:19 +11:00
Sezz
03b0ea7027 Update Settings.lua 2021-12-02 19:24:24 +11:00
Lwmte
ca6d2eab59 Unify all crawl extra moves 2021-12-01 16:28:40 +03:00
Lwmte
59263279fe Provide scripts file into repo 2021-12-01 15:31:39 +03:00