Commit graph

733 commits

Author SHA1 Message Date
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
KrysB4k
e2ebbe0f66 Modified LaraTestWaterClimbOut()
LaraTestWaterClimbOut() aligns to diagonals
2020-06-05 17:08:18 +02: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
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
cd1d5f5482 Refactor include and moving some structure to right file
- started moving structure out of types.h.
- fixed ExtraAnim using 0 instead of -1.
- changed void(*)(); to function<> for lara routines.
- changed short(*)() effect to function<> for CreatureEffect/CreatureEffect2.
- renamed guardian to laserhead.
- moved some structure to their right place.
- renamed TYPE_ZONE to ZoneTypeEnum.
- fixed zoneType not using ZoneTypeEnum as variable.
- fixed LOT.zone not using ZoneEnumType.
- changed "variable : 1" to bool in some structure.
- implemented @krys new collision structure and improved it a bit (but commented for "later")
- level need #pragma pack(push, 1) #pragma pack(pop) to work (for structure), else it crash at LoadTexturesInfos().

Co-Authored-By: krys <krys@users.noreply.github.com>
2020-05-28 15:17:34 +02:00
Joey Quint
703fd2dbbc Baddy & mummy: replaced many raw numbers with enums
There's much more that could be done, but I've gotta go to bed now right and I don't want to end up 38 commits late when I'm done doing that so I commit.
2020-05-28 01:23:47 +02:00
TokyoSU
507dc052ec Revert Change in TrMath 2020-05-27 20:08:19 +02:00
TokyoSU
937038cf2f Fix Savegame Puzzle 2020-05-27 19:37:01 +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
Joey Quint
50be97f974 Fixing merge issue with tr4_sas.h
I had created my own Objects\TR4\tr4_sas.h before pulling - I just removed it and added its contents to the Objects\TR4\Entity\tr4_sas.h created by @tokyosu
2020-05-27 13:31:25 +02:00
Joey Quint
8b7b433590 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-05-27 13:26:38 +02:00
Joey Quint
27f3c93aa7 Added enums SAS_STATES and SAS_ANIM 2020-05-27 13:23:38 +02:00
TokyoSU
39050f69ea Fixing Entity Include (Part 1)
- Less Compile Time...
2020-05-27 13:01:32 +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
Wuups
df1f4b8a97 Merge pull request #207 from MontyTRC89/Lara_hang_feet
Lara hang feet + booleans for anims + crawl to crawl down
2020-05-26 07:41:16 -05:00
Woops
6deba9d9d7 Merge branch 'Lara_hang_feet' of https://github.com/MontyTRC89/TR5Main into Lara_hang_feet 2020-05-26 07:37:27 -05:00
Woops
9731af9109 Merge branch 'master' into Lara_hang_feet 2020-05-26 07:36:50 -05:00
Woops
70fa73580e add booleans for optionality, add crawl 2 crawl down anim 2020-05-26 07:36:09 -05:00
Wuups
bf4461b2ed Merge pull request #205 from MontyTRC89/master
keep up to date with master
2020-05-24 03:14:56 -05:00
Woops
b817ee8134 add crouch pullup func. and corner anims 2020-05-24 03:10:00 -05:00
MontyTRC89
a351654343 Merge pull request #204 from MontyTRC89/NewFileFormat
New file format
2020-05-24 08:33:20 +02:00
MontyTRC89
ea4f35f5ef Merge branch 'master' into NewFileFormat 2020-05-24 08:33:06 +02:00
MontyTRC89
b23834961a Ready to merge 2020-05-24 08:31:36 +02:00
Woops
724bba94d3 fixes and remove some comments 2020-05-23 16:50:53 -05:00
Woops
d0a42310c4 initial commit 2020-05-23 15:59:18 -05:00
MontyTRC89
2fccea1c66 Fixes to level loader; First tests; 2020-05-23 19:59:58 +02:00
Gancian
c36fa0569d Merge pull request #202 from MontyTRC89/revert-201-Effects-for-Chaff-Flare
Revert back to original flare
2020-05-23 18:02:16 +02:00
Gancian
db5dbb2dbd Revert "Minor Fixes to flare smoke" 2020-05-23 18:00:51 +02:00
Gancian
2b707d352b Merge pull request #201 from MontyTRC89/Effects-for-Chaff-Flare
Minor Fixes to flare smoke
2020-05-23 17:55:36 +02:00
Gancian
b1e0d7930a Created new effects to mimic original TR3 Flare
chaffFX.cpp contains the effects, smaller changes to laraflar.cpp to trigger the effects.
2020-05-23 14:26:06 +02:00
MontyTRC89
a5b6b44494 FInished new level loader 2020-05-23 06:45:39 +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
Woops
c8af347da4 ok 2020-05-21 02:42:10 -05:00
Woops
d0b542b106 water crawlspaces and crawl handling 2020-05-20 22:07:27 -05:00
Woops
08305a2885 add 2/1 click crawlspace exits and 1click crawl maneuver 2020-05-20 06:31:17 -05:00
Woops
00165403cd actually fix swandive to run transition 2020-05-20 03:18:36 -05:00
Woops
1ff6fc5768 fix backwards slide state 2020-05-19 20:42:06 -05:00
Woops
bf3555cd66 fix monkeybar vault in 3 click areas 2020-05-19 19:33:40 -05:00
Wuups
45a0a16799 Merge pull request #198 from MontyTRC89/new_anims
add swandive roll to run, slide to run, and 2/3 click crawlspace flex
2020-05-19 13:55:57 -05:00
Woops
35b6013296 add swandive roll to run, slide to run, and 2/3 click crawlspace flex 2020-05-19 13:54:35 -05:00
MontyTRC89
796f0e4b03 Level reader WIP 2020-05-19 20:27:40 +02:00
TokyoSU
76b1d69599 Implemented Ahmet
- fixed some entity not having zoneType !
2020-05-19 19:01:11 +02:00
TokyoSU
543163798d Implemented Motorbike
- need to fix shift bug, and lara position
- need to fix collision.
2020-05-19 13:20:44 +02:00
MontyTRC89
e938fa7004 Dirty commit 2020-05-19 09:00:24 +02:00
Wuups
f7a874785a crouchroll launch fix for specific geometry 2020-05-18 21:59:13 -05:00
Wuups
98833d3345 fix crouch roll embedding in 1-2 click ledges 2020-05-18 02:22:00 -05:00
MontyTRC89
54eb2a2e39 Added new functions to BaseStream 2020-05-18 06:24:45 +02:00
MontyTRC89
7480878e76 Synced structs with TE 2020-05-18 06:12:44 +02:00
TokyoSU
6d4cfeef98 Fixed and Implemented TonyBoss 2020-05-14 18:39:17 +02:00