Commit graph

122 commits

Author SHA1 Message Date
hispidence
2c2d49cc5d Update scripts in accordance with #701 and #735 2022-09-13 21:28:38 +01:00
Sezz
9c8da1c712 Merge branch 'master' into very_experimental_input_stuff 2022-09-13 13:57:39 +10:00
hispidence
74ce2183be Update Timer doc to give warning about names. 2022-09-08 19:25:22 +01:00
hispidence
d83ae45ba1 Update starter scripts 2022-09-07 21:12:02 +01:00
hispidence
cabbe2f85b Update Timer and EventSequence to work with new subtables system. 2022-09-07 19:45:35 +01:00
hispidence
5ffe5bf067 Rename TEN folder to Engine 2022-09-06 21:50:06 +01:00
hispidence
c3fa145316 Update New_Level.lua 2022-09-03 16:56:21 +01:00
hispidence
e16a98a8aa Merge branch 'master' into lua_1.0.2 2022-09-03 16:54:42 +01:00
hispidence
0a8a2ec5ba Move "first-party" scripts into TEN folder. 2022-09-03 12:25:05 +01:00
hispidence
fe8b5d0025 Timer and EventSequence no longer require you to call Timer.UpdateAll 2022-08-20 17:05:25 +01:00
Sezz
e5343570fd Merge branch 'master' into very_experimental_input_stuff 2022-08-16 20:42:18 +10:00
Lwmte
8a460e29c2 Clean up scripts 2022-08-16 13:21:57 +03:00
Sezz
c32be322ab Merge branch 'master' into very_experimental_input_stuff 2022-08-12 23:44:05 +10:00
hispidence
9686f80b29 Add documentation for EventSequence and update autogenerated docs. 2022-08-11 22:49:31 +01:00
hispidence
99d26b5492 Merge remote-tracking branch 'origin/master' into lua_improvements1 2022-08-09 23:09:10 +01:00
hispidence
d61697e9f2 Uncap levelFarView and remove regular game farView. 2022-08-09 22:59:27 +01:00
hispidence
3ee432c423 Fix up version name so it doesn't conflict with the LDoc version. Modify .css to enable SOME syntax highlighting. 2022-08-08 23:31:09 +01:00
hispidence
2477c3efcf Improve timer, fixing #643 and adding display formatting options. 2022-08-08 21:42:04 +01:00
hispidence
b7e323e462 Improve TestLevel.lua. 2022-08-08 21:38:02 +01: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
27e7c49b25 Merge branch 'master' into very_experimental_input_stuff 2022-08-08 00:52:33 +10:00
hispidence
a45fd03c1b Remove bit of old debug code that prevented all further objects being loaded. 2022-08-07 00:55:40 +01:00
hispidence
c42faee592 EventSequence can now loop 2022-08-06 21:46:17 +01:00
hispidence
ece1b39e65 EventSequence fix; now works with loads/saves. 2022-08-06 20:38:45 +01:00
Lwmte
010676983b Update Gameflow.lua 2022-08-06 17:38:35 +03:00
Lwmte
012ea61321 Update test level script with example functions and annotate them 2022-08-06 17:28:02 +03:00
Lwmte
e89ddf4452 Change key check lua command names to more consistent ones 2022-08-06 16:59:43 +03:00
Sezz
97152a5bd6 Merge branch 'ten_beta' into very_experimental_input_stuff 2022-08-05 14:12:16 +10:00
hispidence
570759de0d Merge remote-tracking branch 'origin/ten_beta' into lua_funcs 2022-08-04 20:46:33 +01:00
Lwmte
3992e68b33 Clean up scripts more 2022-08-04 20:06:28 +03:00
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