Commit graph

122 commits

Author SHA1 Message Date
asasas9500
64923f91aa Merge branch 'DiagonalCollisions' into NoShifts 2020-06-09 12:09:00 -03:00
KrysB4k
dec07d9c7f Revert "Added ChocolateFans functions"
This reverts commit c3f4b5c62f.
2020-06-09 16:26:14 +02:00
KrysB4k
32ebe3312c Revert "Fixed crawl2hang move for diagonal ledges"
This reverts commit 7388f720d7.
2020-06-09 16:26:03 +02:00
KrysB4k
7388f720d7 Fixed crawl2hang move for diagonal ledges 2020-06-08 16:44:23 +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
64e11ee273 Manually fixed lara.cpp 2020-06-07 22:24:22 +02:00
KrysB4k
36137ce2bf Added grabbing diagonal ledge
Updated lara_col_upjump and lara_col_reach
2020-06-07 19:25:05 +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
89a7801212 Merge branch 'master' into NoShifts 2020-06-06 18:37:21 -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
KrysB4k
5c9442130d Modified LaraTestWaterClimbOut()
LaraTestWaterClimbOut() aligns to diagonals
2020-06-05 17:08:18 +02:00
Woops
ae90f99b6b Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-06-04 16:17:22 -05:00
Woops
3cf66f82ef fix teleportation when performing crawl2hang on triangulated geometry 2020-06-04 16:17:05 -05:00
TokyoSU
8f11417654 Implemented Baboon
- Fixed AIObject not being initialized !
- Fixed ITEM_DEACTIVATED (cause im french and ITEM_DESACTIVATED is more appropriate)
2020-06-04 12:49:08 +02:00
Woops
d2cfa09001 fix specific hang for monkeyswing vault 2020-06-04 04:26:16 -05:00
Woops
c7a791299f fix 1 click crawl vault 2020-06-02 02:18:33 -05:00
Woops
fe4d1bbe5e fix pulling out weps after 1c crawl up/down moves 2020-05-31 15:21:28 -05:00
Woops
031b2fc2ba make 2/3 click crawlspace exits use same anim 2020-05-31 05:16:23 -05:00
Woops
a80c97aea1 add (.0f)s 2020-05-31 04:20:52 -05:00
Woops
5c43d609dc actual proper ceiling check for monkeybar vault 2020-05-30 15:35:01 -05:00
Woops
05e20e201e Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-05-30 13:03:02 -05:00
Woops
27b52f7a6a fix corner shimmy and debug stuff 2020-05-30 13:02:24 -05:00
TokyoSU
df5baee997 Fixed Repo, Fixed Savegame Struct Missing 2020-05-30 17:58:09 +02: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
2c5a621cb3 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
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
Woops
9974661747 add booleans for optionality, add crawl 2 crawl down anim 2020-05-26 07:36:09 -05:00
Woops
f0d3655184 add crouch pullup func. and corner anims 2020-05-24 03:10:00 -05:00
Woops
90cc3a048f fixes and remove some comments 2020-05-23 16:50:53 -05:00
Woops
6771d8a3d0 initial commit 2020-05-23 15:59:18 -05:00
Woops
7e45be030a water crawlspaces and crawl handling 2020-05-20 22:07:27 -05:00
Woops
5615785de9 add 2/1 click crawlspace exits and 1click crawl maneuver 2020-05-20 06:31:17 -05:00
Woops
ace4743319 actually fix swandive to run transition 2020-05-20 03:18:36 -05:00
Woops
ab7ffa98a6 fix backwards slide state 2020-05-19 20:42:06 -05:00
Woops
b502235274 fix monkeybar vault in 3 click areas 2020-05-19 19:33:40 -05:00
Wuups
444615a887
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
96e73614e3 add swandive roll to run, slide to run, and 2/3 click crawlspace flex 2020-05-19 13:54:35 -05:00
TokyoSU
1fc746dac2 Implemented Motorbike
- need to fix shift bug, and lara position
- need to fix collision.
2020-05-19 13:20:44 +02:00
Wuups
9cf1e9de3e
crouchroll launch fix for specific geometry 2020-05-18 21:59:13 -05:00
Wuups
bdf62d5fa0
fix crouch roll embedding in 1-2 click ledges 2020-05-18 02:22:00 -05:00
Wuups
6d30eb227c
fix crawling responsiveness 2020-05-08 12:17:35 -05:00
Wuups
a28bd5e582
Merge pull request #183 from MontyTRC89/CrouchRoll
Enable the crouch roll animation
2020-05-06 00:07:22 -05:00
Wuups
1751989bd2
Merge pull request #185 from MontyTRC89/monkeyswing-roll
enable the monkeyswing roll
2020-05-06 00:07:07 -05:00
Wuups
b696d5174e
Update lara.cpp 2020-05-02 21:49:44 -05:00
Wuups
912d1047b4
enable the monkeyswing roll
- The Core animation is missing an animation command to turn her around.
2020-05-02 14:05:56 -05:00
Wuups
ca3917a32a
done 2020-05-02 12:05:42 -05:00
Wuups
c5a9514e07
remove couple useless stuff 2020-05-01 21:47:35 -05:00