Commit graph

9399 commits

Author SHA1 Message Date
Sezz
bab278f9df Rename file and namespace 2024-03-28 19:27:02 +11:00
Sezz
feeac00746 Use Vector3i for spot camera positions 2024-03-28 19:04:13 +11:00
Sezz
4564084997 Update spotcam.cpp 2024-03-28 18:37:31 +11:00
Sezz
5d635d93b0 Update lara.cpp 2024-03-27 19:41:07 +11:00
Sezz
8e55fe316e Update comments 2024-03-27 16:42:43 +11:00
Sezz
d9d89b4139 Add comment 2024-03-27 16:40:37 +11:00
Sezz
e17543c497 Update comments 2024-03-27 16:38:55 +11:00
Sezz
181c9cdc56 Merge branch 'develop' into sezz_point_collision_class 2024-03-27 16:33:04 +11:00
Sezz
fbb6236e40 Convert CollisionType to enum class 2024-03-27 16:29:21 +11:00
Sezz
1ae94fcffc Update TombEngine.vcxproj 2024-03-26 23:17:26 +11:00
Sezz
bb0cc0d491 Update comments 2024-03-26 16:05:48 +11:00
Sezz
1d0916a768 Remove caps from laser cylinder 2024-03-26 15:48:58 +11:00
Sezz
bb74da582e Use newer light function for laser beam 2024-03-26 15:45:50 +11:00
Sezz
31b01122a6 Fix tabulation 2024-03-26 15:12:30 +11:00
Lwmte
982eb38f15 Update Objects.ObjID.html 2024-03-25 23:38:05 +01:00
Nemoel-Tomo
3bc9d08f17 Bugfix. single laserbeams were active before they were triggered. 2024-03-25 22:45:25 +01:00
Jakub
370f4269a2 Merge branch 'develop' of https://github.com/MontyTRC89/TombEngine into develop 2024-03-25 21:25:14 +00:00
Jakub
f74158a326 fix incorrect laser noiseValue calculation 2024-03-25 21:25:03 +00:00
Kubsy
d2ff29cf4d
Update Changes.txt 2024-03-25 20:55:51 +00:00
Nemoel-Tomo
ffd9c21d50
Single Laser tr3 - Tripwire (#1336)
* first try of the TR3 laserbeams - nothing to see

* update laser; thickness with ocb

* fixed collision

* SLOT-change.  NEWSlot ID #426

replaced ID_TRIPWIRE with ID_LASER_BEAM

* Rename files

* Rename functions

* Cleanup

* Simplify laser beam

* Cleanup

* Construct laser beam cylinder

* changed shader

* Set beam radius with OCB

* fixed shader for laserbeam

* fixed shader for single laserbeam; finished code

* Update TombEngine.sln

Win32 restored on lines 18 and 19

* update ObjectsIDs.h

* moved laser effects into SpriteEffects.hlsli

---------

Co-authored-by: Sezz <sezzary@outlook.com>
2024-03-25 20:50:21 +00:00
Lwmte
c8cbb73ed9 Expose static mesh hit points to lua API, cleanup script code a bit 2024-03-25 20:31:31 +01:00
Lwmte
6c9f644cd3 Added GetMeshCount script function 2024-03-24 13:38:55 +01:00
Sezz
8cac8807aa Remove useless includes; add NO_VALUE constant 2024-03-24 17:10:58 +11:00
Kubsy
d2e3f596fe
Update Changes.txt 2024-03-22 22:57:53 +00:00
Nemoel-Tomo
50ea54dd95
EmberEmitter (#1335)
* EmberEmitter - nothing to see right now!!!

* update

* added object tint to ember color, renamed ID_HIGH_OBJECT2 to ID_EMBER_EMITTER

* added color black (0,0,0)

* added the color grey

* Rename file

* Fix formatting

* More formatting

* Use namespace

* Convert legacy math

* adjustable size with ocb

* fixed random color variation

* Formatting

---------

Co-authored-by: Sezz <sezzary@outlook.com>
2024-03-22 22:56:29 +00:00
Sezz
bf3d5849ac Fix target highlighter crash 2024-03-21 20:39:04 +11:00
Lwmte
5383dc0056
Hub system (#1333)
* Work in progress

* Work in progress 2

* Work

* Fix Lara meshswaps appearing

* Update control.cpp

* Work

* Update lara_initialise.cpp

* Solve some problems with default weapon and holsters

* Implement actual resetHub script command, add comments and safeguards

* Update Changes.txt

* Update Changes.txt

* Additional refactors

* Add logging for hub system

* Add savegame verification, correct size writing method

* Transfer vehicles between levels

* Log vehicle transfer

* Update lara_initialise.cpp

* Move all vehicle transfer code to InitializeLaraLevelJump

* Also move health initialization to appropriate function

* Put all static fields into SaveGame class

* Formatting

* Fix pelvis pistol

* Partially fix hub vehicle loading

* WIP

* Introduce a hack for reinitializing vehicles on a hub

* Fix holsters again

* Update lara_initialise.cpp

* Better way to preserve crawl state on leveljump

* Update lara_initialise.cpp

* Update savegame.cpp

* Add IsOnHub

* Fix disappearing Lara

* Update lara_initialise.cpp

* Move inventory objects init to subfunction

* Fix issues with LevelVars reset and default soundtrack on hub restore

* Update lara_initialise.cpp

* Formatting

---------

Co-authored-by: Sezz <sezzary@outlook.com>
2024-03-21 09:06:50 +00:00
Adngel
4beded7cad Dragon pickups OCB 1
- deleted the collision of the bones corpse
- now if Dragon dies for Dagger, the pickups will be received to Lara instead of spawn on the floor.
2024-03-19 11:47:34 +01:00
Adngel
9d1102222d Update Dragon.cpp
- Changed dagger pickup animation.
- Changed smoke render shader
2024-03-19 11:14:55 +01:00
Adngel
b65bbd4b82 Update Bartoli.cpp
Fixed the default time to spawn the 3rd sphere before Marco dies for finishing his animation.
2024-03-18 23:55:20 +01:00
Sezz
f12353633a Have target highlights expand from origin instead of closing in on origin when spawning 2024-03-19 01:39:56 +11:00
Sezz
7c0a72f4fe Allow source files with identical names to exist in different directories 2024-03-19 01:35:01 +11:00
Sezz
2366bcbd1d Update comment; rename methods 2024-03-10 15:49:42 +11:00
Sezz
118c6d6105 Fix final bug; remove debug code 2024-03-10 15:05:02 +11:00
Sezz
4fc4450c4b Tidy up HUD methods 2024-03-10 13:31:24 +11:00
Sezz
067cc73dce Remove legacy math struct 2024-03-07 16:26:56 +11:00
MontyTRC89
c44e4d40be Clock reset on window focus change, inventory and pause menu 2024-03-07 06:16:12 +01:00
MontyTRC89
96d08f41e7 Fixed lag logic 2024-03-06 14:50:16 +01:00
MontyTRC89
f9589155d5 Fixed horizon flickering 2024-03-05 09:53:12 +01:00
MontyTRC89
e84ddfa36d First experiment with 60 fps 2024-03-05 09:25:26 +01:00
Lwmte
9f99115003 Update Changes.txt 2024-02-26 03:23:11 +01:00
Lwmte
9fc85346ac Update Changes.txt 2024-02-26 03:20:15 +01:00
Lwmte
a479606481 Fixed #1246 2024-02-26 03:18:20 +01:00
Sezz
389ba72c44 Remove debug code 2024-02-23 21:56:33 +11:00
Sezz
4ee1dda75f Remove last remnants of GetCollision() and related structs; remove old collision functions 2024-02-23 20:41:22 +11:00
Sezz
5a1b1c89bd Remove GetCollision() overload 2024-02-23 18:12:27 +11:00
Sezz
f38968b23b Merge branch 'develop' into sezz_point_collision_class 2024-02-23 13:57:11 +11:00
Sezz
ab40e95ae9 Fix legacy slide angles 2024-02-19 16:51:37 +11:00
Sezz
3549107013 Improve HUD element appearance 2024-02-19 16:31:59 +11:00
Lwmte
fcd22caafb Display missing string ID instead of "string not found" message 2024-02-18 18:36:31 +01:00