Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-11 04:56:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions
1015 commits 63 branches 10 tags 506 MiB
Commit graph

88 commits

Author SHA1 Message Date
asasas9500
c06fa6f9e2 Merge branch 'master' into NoShifts 2020-08-25 19:25:28 -03:00
Montagna Marco
30f9b1f653 Refactoring weapons; Added new shatter fields to static meshes datat structs; 2020-08-15 07:27:14 +02:00
Montagna Marco
270343fd60 Fixed Lara damage on grenade hit; Fixed EffectList[] init; getBoneMatrix now valid for both Lara and other items; Added code (not working yet) for enemy explosion death; 2020-08-09 20:29:31 +02:00
Montagna Marco
69cce438e4 Fixed GetRoomList; Fixed GetCollidedObjcts; Enabled again disabled weapons; 2020-08-09 17:18:21 +02:00
asasas9500
506f187e7b Merge branch 'DiagonalCollisions' into NoShifts 2020-08-07 22:24:52 -03:00
asasas9500
4af45b000a Fix namespace 2020-08-07 22:12:45 -03:00
asasas9500
671d59e1c8 Merge branch 'DiagonalCollisions' into NoShifts 2020-08-07 16:43:29 -03:00
asasas9500
3045d1c832 Merge branch 'master' into DiagonalCollisions 2020-08-07 16:37:31 -03:00
Woops
622d86c6a2 clean up remove comments 2020-08-06 03:34:49 -05:00
Sebastian Zych
6a3700345e Updated animation and state names to follow a consistent system. 2020-08-04 20:32:07 +10:00
Montagna Marco
a4b2637fc3 Hack for TestLaraPosition that solves for now the bug of objects not working on +/- X sides 2020-07-28 06:16:39 +02:00
KrysB4k
b57cc8d5c1 Merge branch 'master' into DiagonalCollisions 2020-07-26 10:51:06 +02:00
Montagna Marco
1c4196832c Added ZLIB 2020-07-26 07:21:38 +02:00
Montagna Marco
014aa1baa7 Frames refactoring 2020-07-25 18:02:35 +02:00
Montagna Marco
18994dd59e Moving all globals of level under LEVEL struct; Fixed severe performance issue; 2020-07-21 09:56:47 +02:00
KrysB4k
9ebe4d7087 Merge branch 'master' into DiagonalCollisions 2020-07-09 14:57:32 +02:00
Woops
90be4939bc Put enemy hit sounds on a timer 2020-07-07 02:51:21 -05:00
Montagna Marco
2a1c491c7e Hairs done on GPU now 2020-07-07 07:32:33 +02:00
asasas9500
f34069e534 Merge branch 'DiagonalCollisions' into NoShifts 2020-06-26 11:14:16 -03:00
asasas9500
9ee265a0ba Merge branch 'master' into DiagonalCollisions 2020-06-26 11:13:13 -03:00
Montagna Marco
d6f45db5ec Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-06-26 07:06:51 +02:00
Montagna Marco
235dab2f13 New FLOOR_INFO struct; Refactoring rooms part I 2020-06-26 07:06:18 +02:00
asasas9500
219fe4c1db Fix namespace 2020-06-21 14:31:35 -03:00
asasas9500
b53eb41bbb Merge branch 'DiagonalCollisions' into NoShifts 2020-06-21 14:09:31 -03:00
KrysB4k
cd417799f3 Merge branch 'master' into DiagonalCollisions 2020-06-21 14:33:31 +02:00
Nils Gaitzsch
c860919616 Fixed std namespace collisions 
Refactored ChunkID/ChunkReader/Writer
 2020-06-20 23:39:08 +02:00
asasas9500
8b477d26e1 Remove shifts 2020-06-09 14:02:39 -03:00
asasas9500
64923f91aa Merge branch 'DiagonalCollisions' into NoShifts 2020-06-09 12:09:00 -03:00
asasas9500
bea10b9bdf Revert "Remove shifts" 
This reverts commit 29c96cbca9.
 2020-06-09 11:31:53 -03:00
KrysB4k
dec07d9c7f Revert "Added ChocolateFans functions" 
This reverts commit c3f4b5c62f.
 2020-06-09 16:26:14 +02:00
KrysB4k
c3f4b5c62f Added ChocolateFans functions 
SnapToDiagonal() and SnapToQuadrant replace the angle switchcases in some of Lara's anim collision functions
 2020-06-08 16:29:03 +02:00
KrysB4k
3a2e2a4b61 Merge branch 'master' into DiagonalCollisions 2020-06-07 20:32:00 +02:00
KrysB4k
4dd61dace9 GetOrthogonalIntersect() bug fix 
Fixed dir value calculation
 2020-06-07 20:13:00 +02:00
TokyoSU
024a2e5612 Refactored Crocodile 
- Refactored the bat a bit.
- Improved crocodile code style.
- Fixed crocodile attack range.
- Fixed crocodile water/land transition.
- Fixed crocodile not aligning to floor rotation.
- Simplified CalcItemToFloorRotation() and added a description to inform and warn the user.
 2020-06-07 09:30:14 +02:00
KrysB4k
9af4e39456 Added GetOrthogonalIntersect() 
GetOrthogonalIntersect() replaces bloated dir switch case in functions like TestLaraVault() and similar
 2020-06-07 02:49:38 +02:00
asasas9500
b3b4d22476 Move COLL_TYPE, HEIGHT_TYPES, HEADINGS and OCTANTS to control.h 2020-06-06 19:05:54 -03:00
asasas9500
89a7801212 Merge branch 'master' into NoShifts 2020-06-06 18:37:21 -03:00
KrysB4k
bf60b8cff2 Merge branch 'master' into DiagonalCollisions 2020-06-06 23:17:16 +02:00
asasas9500
ea975e554b Create RotateBoundingBox() 2020-06-06 17:55:05 -03:00
asasas9500
4f3a87664a Merge branch 'DiagonalCollisions' into NoShifts 2020-06-06 16:00:44 -03:00
asasas9500
8dfe41f8d1 Move COLL_TYPE, HEIGHT_TYPES and HEADINGS to collide.h; Create OCTANTS, SnapToQuadrant(), GetQuadrant(), SnapToDiagonal() and GetOctant() 2020-06-06 15:48:38 -03:00
KrysB4k
2943609195 Add GetDiagonalIntersect() 
GetDiagonalIntersect() returns Vector2 with x and z coordinates aligned to diagonal, offset by LARA_RAD
 2020-06-06 20:37:19 +02:00
asasas9500
29c96cbca9 Remove shifts 2020-06-05 12:27:55 -03:00
asasas9500
dcfe21be4a Fix signs 2020-06-05 11:57:30 -03:00
asasas9500
a627e08583 Improve collision vectors 2020-06-04 15:09:54 -03:00
TokyoSU
ee59d27517 (Broken) Deleted Global Folder 
- No more enums.h, constants.h, macro.h, etc...
- moved all structure in types.h to there respective file.
 2020-05-30 15:55:23 +02:00
Krys
dbac993499 First tests for diagonal collision 
This branch tests the diagonal collisions. So far only the running splat, walking splat and vaults work with diagonal collision. Jumping splat, getting out of water still needs some work
 2020-05-28 20:59:46 +02:00
TokyoSU
9045a2206d Partially finished Entity Folder Refactoring 
- Less Compile Time
- ObjectInfo now use std::function.
- added isPickup and isPuzzleHole in ObjectInfo.
- Renamed EVIL_LARA to LARA_DOPPELGANGER (DOPPELGANGER in xml)
- Removed TR1 Larson/Pierre and TR1 Raptor.
 2020-05-27 19:07:34 +02:00
TokyoSU
9c1c4517d7
New project format (#206) 
* Starting Reformat the project

- New Import Method, no more "../../" in import,
- New Entity Folder Structure, less compile time

* Refactoring the Project

- added precompiled header with default import like microsoft or directx.
- fix many double import.
- fix math.h confliting math.h from
microsoft.
- fix effects.h confliting Effects.h from DirectX.
- refactored TR4 entity folder and how it's loaded.

* Update Some Code Before Switching to Master

* Finished the NewProjectFormat Template

- need to finish entity in the master later.

* Added Monty NewFileFormat

* Fixed Monty NewFileFormat Include

* Revert "Fixed Monty NewFileFormat Include"

This reverts commit ebf0afca10.

* Trying to fix conflits for NewFileFormat

* Fixed .filters

* Last Commit in NewProjectFormat
 2020-05-27 09:21:20 +02:00
Krys
9b0139e901 Added CalcItemToFloorRotation 
Added CalcItemToFloorRotation function (collide.cpp) which calculates XZ tangents and applies to item rot

Co-Authored-By: TokyoSU <tokyosu@users.noreply.github.com>
 2020-05-22 12:55:03 +02:00