Commit graph

84 commits

Author SHA1 Message Date
asasas9500
b657727242 Merge branch 'DiagonalCollisions' into NoShifts 2020-08-07 22:24:52 -03:00
asasas9500
9cf8ff503c Fix namespace 2020-08-07 22:12:45 -03:00
asasas9500
c411689790 Merge branch 'DiagonalCollisions' into NoShifts 2020-08-07 16:43:29 -03:00
asasas9500
86e2291c53 Merge branch 'master' into DiagonalCollisions 2020-08-07 16:37:31 -03:00
Woops
b1efaf61eb clean up remove comments 2020-08-06 03:34:49 -05:00
Sezz
5d4dc8ffdd Updated animation and state names to follow a consistent system. 2020-08-04 20:32:07 +10:00
MontyTRC89
4311a5837e 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
ed13777ac2 Merge branch 'master' into DiagonalCollisions 2020-07-26 10:51:06 +02:00
MontyTRC89
f24e2abb94 Added ZLIB 2020-07-26 07:21:38 +02:00
MontyTRC89
689ec226e7 Frames refactoring 2020-07-25 18:02:35 +02:00
MontyTRC89
83bba01a99 Moving all globals of level under LEVEL struct; Fixed severe performance issue; 2020-07-21 09:56:47 +02:00
KrysB4k
2c98fbbc2c Merge branch 'master' into DiagonalCollisions 2020-07-09 14:57:32 +02:00
Woops
d44dba63c9 Put enemy hit sounds on a timer 2020-07-07 02:51:21 -05:00
MontyTRC89
36fe66d617 Hairs done on GPU now 2020-07-07 07:32:33 +02:00
asasas9500
f334369175 Merge branch 'DiagonalCollisions' into NoShifts 2020-06-26 11:14:16 -03:00
asasas9500
eda2325004 Merge branch 'master' into DiagonalCollisions 2020-06-26 11:13:13 -03:00
MontyTRC89
5b8c90b688 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-06-26 07:06:51 +02:00
MontyTRC89
d8bf82eab1 New FLOOR_INFO struct; Refactoring rooms part I 2020-06-26 07:06:18 +02:00
asasas9500
2fd6addea6 Fix namespace 2020-06-21 14:31:35 -03:00
asasas9500
a9dfdec427 Merge branch 'DiagonalCollisions' into NoShifts 2020-06-21 14:09:31 -03:00
KrysB4k
62707a7296 Merge branch 'master' into DiagonalCollisions 2020-06-21 14:33:31 +02:00
Raildex
b635f4df13 Fixed std namespace collisions
Refactored ChunkID/ChunkReader/Writer
2020-06-20 23:39:08 +02:00
asasas9500
03519aac29 Remove shifts 2020-06-09 14:02:39 -03:00
asasas9500
4d65439c2d Merge branch 'DiagonalCollisions' into NoShifts 2020-06-09 12:09:00 -03:00
asasas9500
05eb7778fd Revert "Remove shifts"
This reverts commit 40fe55b230.
2020-06-09 11:31:53 -03:00
KrysB4k
5ed8cf6b8a Revert "Added ChocolateFans functions"
This reverts commit 4760288101.
2020-06-09 16:26:14 +02:00
KrysB4k
4760288101 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
b99c3ea6e1 Merge branch 'master' into DiagonalCollisions 2020-06-07 20:32:00 +02:00
KrysB4k
f89869fb41 GetOrthogonalIntersect() bug fix
Fixed dir value calculation
2020-06-07 20:13:00 +02:00
TokyoSU
663e5b7fa6 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
f7e6850627 Added GetOrthogonalIntersect()
GetOrthogonalIntersect() replaces bloated dir switch case in functions like TestLaraVault() and similar
2020-06-07 02:49:38 +02:00
asasas9500
d9fcc87f12 Move COLL_TYPE, HEIGHT_TYPES, HEADINGS and OCTANTS to control.h 2020-06-06 19:05:54 -03:00
asasas9500
35fe5cd78f Merge branch 'master' into NoShifts 2020-06-06 18:37:21 -03:00
KrysB4k
dda527bb90 Merge branch 'master' into DiagonalCollisions 2020-06-06 23:17:16 +02:00
asasas9500
a3fadb109c Create RotateBoundingBox() 2020-06-06 17:55:05 -03:00
asasas9500
92fdb556c6 Merge branch 'DiagonalCollisions' into NoShifts 2020-06-06 16:00:44 -03:00
asasas9500
c49c98d21b 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
475effbe25 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
40fe55b230 Remove shifts 2020-06-05 12:27:55 -03:00
asasas9500
eccff9a529 Fix signs 2020-06-05 11:57:30 -03:00
asasas9500
73b17c40b4 Improve collision vectors 2020-06-04 15:09:54 -03:00
TokyoSU
b615a98c46 (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
e46a000190 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
963706c3af 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
29f0724693 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
516ef3a73b 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
MontyTRC89
efd1f2728b Fixed look camera; Fixed bugs with gunflashes and smoke positions; 2020-04-29 06:43:53 +02:00
MontyTRC89
fdc3ff9996 Refactored OBJET_INFO to ObjectInfo 2020-04-27 15:28:54 +02:00
MontyTRC89
b8f26976a7 Added missing changes from last commit; Fixed WndProc for exiting game when window is closed; 2020-04-27 06:38:50 +02:00
MontyTRC89
ea3db8638f Partially fixed spheres; Fixed swap meshes; partially fixed Lara firing; 2020-04-26 10:55:33 +02:00