Commit graph

8102 commits

Author SHA1 Message Date
Lwmte
219b3d78e4
Single flare pickup (#1115)
* Add ability to pick up a single inactive flare as an inventory item

* Fix incorrect pickup of an active flare in a mass pickup

* Fix remaining cases of picking up inactive flare as ordinary item

* Fix some conditions that break flare pickup from a crawl state

* Attempt to fix active flare not picked up in crawl state

* Remove unreachable state checks
2023-05-25 20:17:14 +01:00
Kubsy
e2e02faa16 Update Changes.txt 2023-05-25 12:24:05 +01:00
Sezz
9fd79f0842 Update names 2023-05-25 16:32:08 +10:00
Sezz
5edef6fa80 Make zip line constants local 2023-05-25 16:27:42 +10:00
Sezz
0aef0d2a10 Rename zip line files 2023-05-25 15:41:13 +10:00
Sezz
1db1435d71 Move zip line code to namespace; organise constants; remove AnimateItem() call; use forward decls 2023-05-25 15:37:42 +10:00
Sezz
feab414448 Make player align smoothly to zip line 2023-05-25 15:29:31 +10:00
Sezz
2078d0d0b2 Use references in zip line code; call IsHeld() 2023-05-25 15:06:39 +10:00
Sezz
366ead88f2 Remove default alpha values from math methods 2023-05-25 14:54:49 +10:00
Sezz
8db97e3b8b Adjust fake epsilon default in EulerAngles class 2023-05-25 14:37:59 +10:00
Sezz
8263989599 Fix zipline player lean angle bounds 2023-05-25 14:34:42 +10:00
Lwmte
f2cab33e2f Fix player lean not resetting in idle state, invert zipline condition to simplify code 2023-05-25 01:48:34 +02:00
Lwmte
9ae025ffa2 Refactor classic rollingball code, fix #1108 2023-05-25 01:18:04 +02:00
Kubsy
4f8e606207 delete zipline changelog because they don't work fully 2023-05-24 18:39:14 +01:00
MontyTRC89
92497bef82 Merge branch 'develop' into renderer_fixes_and_features 2023-05-24 14:50:38 +02:00
MontyTRC89
bbfa9f0a7e Merge branch 'develop' into renderer_fixes_and_features
# Conflicts:
#	TombEngine/Renderer/Renderer11.cpp
#	TombEngine/Renderer/Renderer11Draw.cpp
#	TombEngine/TombEngine.vcxproj.user
2023-05-24 14:50:14 +02:00
Lwmte
322d5820b3 Fade flare in instead of flashing in 2023-05-24 09:15:35 +02:00
Sezz
ed7d8bb4dc Add comments 2023-05-24 14:46:27 +10:00
Sezz
188926baa6 Make flare constants as local as possible; define more constants 2023-05-24 14:29:30 +10:00
Lwmte
c7c425466c Fix zipline not working properly 2023-05-23 22:16:41 +02:00
Lwmte
45dbb5bd98 Fix warning MSB8004 2023-05-23 21:45:37 +02:00
Lwmte
5ff674f749 Fix grenade firing angle 2023-05-23 21:36:19 +02:00
Lwmte
926d827f0e Throw flare a bit earlier than actual death 2023-05-23 21:28:39 +02:00
Lwmte
afbb2146f9 Fix flare brightness 2023-05-23 21:13:31 +02:00
Lwmte
8ff5aa39c2 Automatically delete debug info from release build folder 2023-05-23 08:32:30 +02:00
hispidence
96138df360 Remove leading '\\' from regex to fix it. 2023-05-22 23:43:24 +01:00
hispidence
05a5a47458 Re-add lua53.dll since they seem to work without problems across the board. Remove duplicate Lua copy step. 2023-05-22 22:36:47 +01:00
Lwmte
9b70c11bdd Auto-search for asset path in surrounding directories, fix node script loading 2023-05-22 03:36:49 +02:00
Lwmte
d9e7766a68 Move both x86 and x64 binaries to /Bin subdirectory 2023-05-22 00:56:21 +02:00
Kubsy
f376fba435 Update Changes.txt 2023-05-21 16:20:58 +01:00
Lwmte
4d63d92364
x64 version (#1113)
* Sort out compiler errors (excluding external libraries)

* Add TODO comment

* Use empty() method

* Fix wrong casts

* Fix new warnings

* Fix merge error

* Revert "Merge branch 'develop' into sezz_x64"

This reverts commit f695769189, reversing
changes made to 54c5e0c70d.

* Revert "Revert "Merge branch 'develop' into sezz_x64""

This reverts commit e1128c41f8.

* Update all libraries with x86 versions, organize lib directories, update x64 config

* Show app bitness in a log file

* Fix text rendering by uncommenting ToWString helper function

* Ship dlls and automatically replace them when switching between x86/x64

* Update TombEngine.vcxproj

* Adjust ammo struct; remove unneeded line

* Update broken x64 config for release mode

* Fix more project config inconsistencies

* Update TombEngine.vcxproj

* Remove unnecessary casts

* Tabs not spaces

* Update TombEngine.vcxproj.user

* Revert "Update TombEngine.vcxproj.user"

This reverts commit c168943ed0.

* Add x64 lua53.lib, remove DLLs.

---------

Co-authored-by: Sezz <sezzary@outlook.com>
Co-authored-by: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Co-authored-by: hispidence <squidshirehimself@gmail.com>
2023-05-21 16:01:27 +01:00
hispidence
0226d577ce
Merge pull request #1109 from MontyTRC89/assetDir
Game dir arg
2023-05-20 21:02:19 +01:00
hispidence
1346728ce0 Merge remote-tracking branch 'origin/develop' into assetDir 2023-05-20 18:24:32 +01:00
Lwmte
20c18471f3 Restore old Troye fix for flare undraw with proper comment 2023-05-20 14:47:30 +02:00
MontyTRC89
ced0c3249c Merge branch 'develop' into renderer_fixes_and_features
# Conflicts:
#	TombEngine/Renderer/Renderer11DrawEffect.cpp
#	TombEngine/Shaders/Blending.hlsli
#	TombEngine/Shaders/DX11_Sprites.fx
2023-05-20 05:58:28 +02:00
Lwmte
ea5afc4e91 Remove VS2022 project which is now unused 2023-05-20 02:50:52 +02:00
Sezz
36c643dd5d Merge branch 'develop' into sezz_sprites_in_2d_space 2023-05-19 14:45:53 +10:00
Lwmte
f204245799 Update Changes.txt 2023-05-19 03:10:29 +02:00
Lwmte
d425789163 Turn on thumbstick camera and vibration when defaulting to XInput device 2023-05-19 03:06:47 +02:00
Kubsy
cdd0abbc3c Update Changes.txt 2023-05-18 22:17:41 +01:00
Kubsy
77fd785e10 Update Changes.txt 2023-05-18 16:57:15 +01:00
Nemoel-Tomo
e4d4a61ed7
Fix tr5 laser barriers (#1093)
* finished lights

* Fix formatting

* Formatting

* Update itemdata.h

* test

* import light branch

* fixed error

* finished laser initialising

effects are missing

* hide nullmesh

* import Laser visuals fro richardtrle, import develop

* fix lasers. still a lot of work to do

* update

* Lasers use model color now

* Formatting

* Revert "Formatting"

This reverts commit cdf44035b0.

* Revert "Revert "Formatting""

This reverts commit 0e4e56709b.

* Fix global

* Names

* Simplify vertex position storage

* fixed lasers

* Update shaders

* bugfix

* Laser fade in, light distortion

* finished lasers, sound

* updating shaders for upper and lower fading

* Capitalize variable

* Update control.cpp

* Update control.cpp

* Rename laser barrier object ID

* Rename variables; use references; fix formatting

* Fix shader code formatting

* Update laser barriers

* Newline

* Remove unnecessary global, rename cbuffer field

* Add bool member variables; demagic numbers

* Edit comments

* -

* removed 3 latest commits from sezz bc laser was not working correctly anymore

laser should flicker if lLara collides. else it should slowly change between 0.8 and 1.0. collision was not working anymore, please do not change anything anymore :) :)

* calculate laser barrier vertex every loop

* Bring back reverted changes

* Use references as per conventions; make function static; rename function

* Rename file

* Remove deeply archaic TR5 garbage; maybe fix drift

* Organise

* Rotate barriers correctly; make variable names clearer

* Initialize barrier height only once; don't snap to floor upon init

* Update vertex generation; add methods

* Move bounding box update code

* Make beam counts adapt to ceiling height; use floats

* Small formatting fixes

* removed barrier.IsActive from renderer

* Remove global variable

---------

Co-authored-by: Sezz <sezzary@outlook.com>
Co-authored-by: Lwmte <3331699+Lwmte@users.noreply.github.com>
2023-05-18 16:26:55 +01:00
Sezz
84f0215d8c Formatting 2023-05-18 15:19:23 +10:00
MontyTRC89
0787565116 Optimizations 2023-05-18 05:49:20 +02:00
MontyTRC89
88d9dea7b4 Fixed Pascal Case in RenderView;
Fixed formatting things;
Fixed sprites;
2023-05-16 06:27:44 +02:00
MontyTRC89
41c0155df0 Fof bulbs like TR5 2023-05-15 16:15:28 +02:00
hispidence
cbd45c9de3 Merge remote-tracking branch 'origin/develop' into assetDir 2023-05-13 19:00:11 +01:00
hispidence
961270ac8d Rename assetvars to gamevars, make some better function names. 2023-05-13 17:31:13 +01:00
hispidence
83eba4942d Apply assetDir stuff to Log, Shaders and Textures folders 2023-05-13 15:37:21 +01:00
MontyTRC89
ed54001b97 Removed noise 2023-05-11 16:58:06 +02:00