Commit graph

101 commits

Author SHA1 Message Date
MontyTRC89
4f3ea36bc1 Temporarly hack for solving invisible Lara in some cases with HUB system 2024-10-13 05:52:52 +02:00
MontyTRC89
061d152207 Fixed rolling ball interpolation 2024-09-29 06:16:13 +02:00
MontyTRC89
1695caa602 Interpolation disable by default on CreateItem();
Interpolation enabled in renderer always after the first frame;
2024-09-06 06:07:12 +02:00
MontyTRC89
3a345e9ccb Merge branch 'develop' into develop_60fps
# Conflicts:
#	TombEngine/Game/control/control.cpp
#	TombEngine/Game/gui.cpp
#	TombEngine/Renderer/RendererDrawMenu.cpp
#	TombEngine/Scripting/Internal/TEN/Flow/FlowHandler.cpp
2024-08-16 10:19:51 +02:00
Stranger1992
e4b3124a68 Rename hair objects to distinguish between the two
ID_HAIR -> SINGLE_BRAID_HAIR
ID_HAIR2 -> DUAL_PIGTAIL_HAIR
2024-08-16 00:09:13 +01:00
Sezz
e3c1ccf5c2 Integrate GetWaterSurface(), GetWaterDepth() and GetWaterHeight() into PointCollisionData 2024-08-16 02:12:41 +10:00
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
TokyoSU
b9b99af3d2
Seal Mutant Port (#1392)
* begin mutant crawler import

* progress.

* Update MutantCrawler.cpp

* Done seal mutant.

- Changed how ThrowPoison color worked.
The old function didn't really reflect the correct color.

* Update CHANGELOG.md

* Improve ThrowSealMutantGas

* Add ID_SEAL_MUTANT scripting ID

* Update ObjectIDs.h

* Remove IsLaraCrouching()

* Use correct data types for poison effect

* Use references, not pointers

* Use proper spacing

* Use const

* Remove magic numbers, ordering, const, etc

* Remove pointless CreatureBiteInfo constructor; remove global constants;; etc

* Formatting, cleanup

* Replace GetRandomControl() usage

* Comment

* Update CHANGELOG.md

* rename variable

* demagic numbers

* Define constants

* Remove anim data checks

* Update poison gas spawn function

* Update tr3_flamethrower.cpp

* Update SealMutant.cpp

* Update seal mutant

* Update seal light

* Update SealMutant.cpp

* Minor changes

* Update sealMutant

* Update effects.h

* Update flamethrower to have lara as target too.

* Revert feffects from int to uchar

* Cleanup

---------

Co-authored-by: Kubsy <kubadd475@gmail.com>
Co-authored-by: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Co-authored-by: Sezz <sezzary@outlook.com>
Co-authored-by: Jakub <80340234+Jakub768@users.noreply.github.com>
Co-authored-by: Jakub <kubabilinski03@gmail.com>
2024-08-11 16:48:52 +01:00
Stranger1992
f804c794f8 Fixed an error in the KeyClearAll() function that prevented it from being displayed in the Lua API 2024-07-03 15:49:38 +01:00
MontyTRC89
d5ed115d50 Fixed wrong positions for transparent faces in moveable items 2024-05-16 11:49:58 +02:00
Sezz
715df20e1f Fix crosshair angle interpolation 2024-05-11 01:51:48 +10:00
Sezz
fa697cc26e Update lens flare Lua API 2024-05-10 22:20:04 +10:00
MontyTRC89
1bd1832037 WIP solution for variable monitor refresh rates 2024-05-09 05:42:36 +02:00
Sezz
d49dd998be Merge branch 'develop' into develop_60fps 2024-05-08 14:11:51 +10:00
Sezz
e7889d2b88 Update colour objects 2024-05-08 14:10:45 +10:00
Sezz
2eb2ff877d Starfield and lens flare cleanup 2024-05-08 13:47:47 +10:00
Lwmte
83b6258de0 Merge branch 'develop' into develop_60fps 2024-05-03 10:16:48 +03:00
Lwmte
57cf323d73 Add autodelete parameter to ShowString 2024-05-03 10:16:32 +03:00
MontyTRC89
b03480e926 Merge branch 'develop' into develop_60fps
# Conflicts:
#	TombEngine/Game/control/control.cpp
2024-04-28 06:36:13 +02:00
MontyTRC89
1d30d43aac Added color to lens flare;
Added LUA api for starfield and lens flare;
2024-04-28 06:31:59 +02:00
Lwmte
29a5fc7411
UseItem event (#1357)
* Implement UseItem event, refactor item usage a bit

* Decopypaste medipack hotkey usage code

* Prevent small and large medipacks from being used simultaneously; tidy up UseItem()

---------

Co-authored-by: Sezz <sezzary@outlook.com>
2024-04-26 10:43:10 +01:00
Lwmte
809d54d811 Update docs 2024-04-24 00:32:32 +02:00
Lwmte
d53b3cf03d Add timeout for Moveable:Enable(), delete output.xml on build, update ldoc version label 2024-04-19 23:39:58 +02:00
Stranger1992
3890f0d224 Update Lua API parameters correctly 2024-04-13 02:05:43 +01:00
Stranger1992
1a94a53c56 Update moveable Lua API 2024-04-13 01:58:58 +01:00
Lwmte
266f1b5b6a
Use real bounding box tests for GetCollidedObjects (#1343)
* Initial commit

* Use DX bboxes for item collision tests

* Update collide_item.cpp

* Update collide_item.cpp

* Update collide_item.cpp

* Code cleanup

* More code cleanup and optimizations

* Remove obsolete radius argument for GetCollidedObjects, mode code cleanups

* Fix ITEM_INVISIBLE typos

* Restore custom radius where needed

* Restore custom radius for polerope

* Function cleanup

* Simplify function

* Remove CollidedItems and CollidedMeshes globals

* Use custom radius for pickups and explosion

* Add changelog, shuffle function order

* Simplify

* fix syntax error

* Rename local variable

* Update collide_item.cpp

---------

Co-authored-by: Sezz <sezzary@outlook.com>
Co-authored-by: Jakub <kubabilinski03@gmail.com>
2024-04-12 23:34:30 +10:00
MontyTRC89
2e5867407e Fixed wrong alpha test in alpha blended faces 2024-04-10 06:08:47 +02:00
Lwmte
b8b76cd9c9 Update Flow.html 2024-04-06 08:24:22 +02:00
Lwmte
86f9cb86c7 Add GetFlipMapStatus function 2024-04-06 08:16:07 +02:00
Sezz
369a6dd539 Additionally replace NO_JOINT with NO_VALUE 2024-03-31 23:19:37 +11:00
Sezz
9a98ce04c1 Reorganise script VolumeObject.cpp according to standards 2024-03-31 02:02:48 +11:00
Lwmte
982eb38f15 Update Objects.ObjID.html 2024-03-25 23:38:05 +01: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
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
Lwmte
3c4b6fcf3c
Ldoc portable compiler (#1330)
* Add portable ldoc compiler and build event

* Remove broken ldoc compiler

* Remove unneeded file, remove timestamp

* Update documentation
2024-02-13 17:02:25 +00:00
Stranger1992
a77ada8f45 Add Lua API generator and regenerated docs 2024-02-11 22:28:56 +00:00
hispidence
ba648e1383 Fixed doc comments and regenerated docs. 2024-01-07 13:22:52 +00:00
hispidence
a70159d95b Regen docs and fix some doc comments 2023-12-26 20:47:08 +00:00
hispidence
e7ffb94d19 Regen docs, increase margin in css file 2023-11-11 12:16:23 +00:00
hispidence
a6947df0bc Fix documentation comments and regen docs 2023-11-09 18:28:02 +00:00
hispidence
88a6d7f229 Modify changes.txt, fix doc comments, update docs. 2023-09-30 13:53:51 +01:00
hispidence
49ee5b69d9 Merge from origin/develop and put in string scale stuff 2023-09-28 19:21:07 +01:00
hispidence
cf0e70813f Update docs with new actionIDs 2023-07-24 14:48:25 +01:00
hispidence
274360c1d5 Updated docs. 2023-07-20 12:13:57 +01:00
hispidence
b354bca1f0 Regen docs after duplicated LogLevel.h removal. 2023-06-03 11:44:57 +01:00
hispidence
0ec39ac7f0 Fix doc comments & regen docs. 2023-05-31 21:48:00 +01:00
hispidence
1b52ec7584 Add Vec2 doc HTML file, bump version number, add Vec2 to changes.txt 2023-05-02 19:30:14 +01:00
hispidence
5d03947991 Correct some doc comments and regen documentation. 2023-04-11 21:29:59 +01:00