Commit graph

8960 commits

Author SHA1 Message Date
MontyTRC89
36cf58ba16 Merge branch 'develop_60fps' of https://github.com/MontyTRC89/TombEngine into develop_60fps 2024-08-22 15:16:04 +02:00
MontyTRC89
08f43e146d Fixed strings flickering in title menu 2024-08-22 15:15:59 +02:00
MontyTRC89
dd2d8e8899 Fixed turn switch flickering frame 2024-08-21 16:58:06 +02:00
Sezz
39a52d26a4 Formatting 2024-08-21 17:38:24 +10:00
MontyTRC89
294a7592cd Merge branch 'develop' into develop_60fps
# Conflicts:
#	TombEngine/Renderer/Renderer.h
#	TombEngine/Renderer/RendererFrame.cpp
#	TombEngine/Renderer/RendererHelper.cpp
#	TombEngine/Renderer/Structures/RendererItem.h
2024-08-21 06:20:26 +02:00
MontyTRC89
b3210f93bd Merge branch 'develop_60fps' of https://github.com/MontyTRC89/TombEngine into develop_60fps 2024-08-21 06:03:36 +02:00
MontyTRC89
b46641a2cf Fixed flickering frame on camera transition 2024-08-21 06:03:30 +02:00
Sezz
806c052ff5 Fix GetBoneOrientation() 2024-08-18 22:58:50 +10:00
TokyoSU
f85769f3ca Update RendererCompatibility.cpp 2024-08-17 19:10:04 +02:00
Sezz
5c834a0906
Use BoundingSphere natively (#1339)
* Use BoundingSphere natively; remove CreatureSpheres and LaraSpheres globals

* Remove parameter from GetSpheres()

* Remove useless includes; rename file; add namespace

* Tabs

* Change pointer argument to reference

* Fix weapon crash

* Rename function and return bool

* Pass reference arguments

* Rename parameter

* Fix errors

* Use Intersects() method

* Define local constant

* Rename function; use generic variable names

* Update RendererHelper.cpp

* Fix merge errors

* Fix and further simplify item spheres

* Fix weapon firing

* Add GetSpheres() ItemInfo method

* Fix GenericSphereBoxCollision()
2024-08-17 13:11:36 +01:00
Sezz
7bc21f7d3a Fix formatting 2024-08-16 19:05:52 +10: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
MontyTRC89
d8aced8ab4 Fixed exploding body parts 2024-08-16 10:05:01 +02:00
Sezz
08d74d6608 Fix formatting 2024-08-16 15:48:36 +10: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
TokyoSU
349d7e5cdd Fixed hair again (for good this time) 2024-08-15 20:15:46 +02:00
Sezz
e3c1ccf5c2 Integrate GetWaterSurface(), GetWaterDepth() and GetWaterHeight() into PointCollisionData 2024-08-16 02:12:41 +10:00
Sezz
2439e7cd46 Minor cleanup 2024-08-15 22:46:08 +10:00
Sezz
bea2810408 Remove Ptr suffix; use const 2024-08-15 22:44:35 +10:00
Sezz
cce384d3de Remove unused parameter 2024-08-15 22:40:08 +10:00
TokyoSU
6b18d46096 Update CHANGELOG.md 2024-08-15 14:08:47 +02:00
TokyoSU
fcf32b1ad0 Fix young hair drawing. 2024-08-15 13:55:23 +02:00
TokyoSU
3a535a83d4 Add willard (WIP) 2024-08-14 18:11:09 +02:00
Sezz
dcfdae10da lara -> player in GUI 2024-08-14 17:50:19 +10:00
Sezz
079a2bfc00 Correct config 2024-08-14 16:09:42 +10:00
Stranger1992
4258b27c0c Changelog typos 2024-08-14 00:52:48 +01:00
Stranger1992
a9c3474b1c Update CHANGELOG.md 2024-08-13 23:19:11 +01:00
Sezz
37f056bfaf Add missing include 2024-08-12 15:13:35 +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
Jakub
cb7d5ddccc Merge remote-tracking branch 'origin/master' into develop 2024-08-11 12:13:40 +01:00
Jakub
8b4573787b
Create LICENSE 2024-08-11 12:12:10 +01:00
Kewin Kupilas
0628affb69
Rework menu option looping (#1393)
* Remove menu loop

* Update CHANGELOG.md

* Update config

* Implement new menu logic

* Remove mouse smoothing

* Update Input.cpp

* Allow 3 options for menu looping

* Name adjustment

* Rename RegKey

* String key rename

* General refactors

* Change default menu looping mode

* Update configuration.h

---------

Co-authored-by: Sezz <sezzary@outlook.com>
2024-08-11 09:59:56 +01:00
Jakub
046e0b26ac
Update AUTHORS.md 2024-08-11 09:57:43 +01:00
Jakub
16112505b6
Update AUTHORS.md 2024-08-11 09:57:14 +01:00
Jakub
da05580213
Update AUTHORS.md 2024-08-11 09:57:05 +01:00
Sezz
77af7e9e22 Update Raptor.cpp 2024-08-08 22:28:52 +10:00
Sezz
587ce7d551 Remove magic number 2024-08-08 22:23:30 +10:00
Sezz
943c552627 Rename raptor files 2024-08-08 22:22:32 +10:00
Sezz
9ae935b8bb Extend functionality of TargetNearestEntity() 2024-08-08 22:12:50 +10:00
Sezz
29e65d0d2e Formatting; simplify 2024-08-08 21:57:12 +10:00
Stranger1992
89c4b0b22d Update CHANGELOG.md 2024-08-08 00:22:19 +01:00
Stranger1992
a46c1af417 Update CHANGELOG.md 2024-08-08 00:21:20 +01:00
TokyoSU
374c42b9fb
Raptor upgrade (#1346)
* Upgrade raptor

OCB 0: NORMAL: Like the original, change zone type to basic to avoid the raptor to try jumping pit when he cant anymore.
OCB 1: ABLE_TO_JUMP: can jump pit, new behaviour.
2024-08-08 00:07:06 +01:00
TokyoSU
27b4e0c2ad Fixed bomb freezing/crashing the game.
- Improved centaur code.
- Now centaur look and rotate the head and torso at the target.
- Removed double ID_PROJ_BOMB init.
-
2024-08-07 21:03:29 +02:00
Sezz
3ad7b1f5de Tidy up room struct 2024-08-06 22:09:58 +10:00
Sezz
3a38e4c576 Rename previously updated creature files 2024-08-06 19:00:49 +10:00
MontyTRC89
33edb092a9 Fixed shockwaves 2024-07-31 11:31:48 +02:00
Sezz
f0603349e2 Update RendererDraw.cpp 2024-07-31 19:21:51 +10:00
davidmarr
8e9ed77e64
Fixed Volume:GetActive() method (#1389)
* Update VolumeObject.cpp

fixed Volume:GetActive() method

* Update CHANGELOG.md
2024-07-27 18:16:13 +01:00