Commit graph

51 commits

Author SHA1 Message Date
asasas9500
c411689790 Merge branch 'DiagonalCollisions' into NoShifts 2020-08-07 16:43:29 -03:00
KrysB4k
ed13777ac2 Merge branch 'master' into DiagonalCollisions 2020-07-26 10:51:06 +02:00
MontyTRC89
689ec226e7 Frames refactoring 2020-07-25 18:02:35 +02:00
asasas9500
2fd6addea6 Fix namespace 2020-06-21 14:31:35 -03:00
asasas9500
4d65439c2d Merge branch 'DiagonalCollisions' into NoShifts 2020-06-09 12:09:00 -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
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
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
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
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
f3bb956927 First EXE build successfully 2020-04-24 19:15:05 +02:00
MontyTRC89
b496c3caba Decompiled UpdateStorm(); Code cleaning; 2020-04-14 06:11:10 +02:00
MontyTRC89
3fef37ee4a Fixed AiPickupCollision; Fixed setup flags of many objects; Fixed item savegames; Refactored inventory; Added InitialseShootSwitch; 2020-01-12 08:02:48 +01:00
asasas9500
fe430299f3 Fix GetCollisionInfo() 2019-12-29 01:40:55 -03:00
TokyoSU
6cccd1d28e Changed mgLOS to TR5 instead of using TR3 one
- changed mgLOS from TR3 to TR5.
- changed a bit GetTiltType() that normally return short.
- changed a bit CollideStaticObjects() and LaraBaddieCollision() to use "vector<short>" instead of "array".
- fixed GetCollidedObjects() where "collidedItems[numItems] = NULL" is called before last return.
- created GetRoomList() to get the roomList with vector or array return.
- structured some function.
2019-12-17 17:37:53 +01:00
TokyoSU
23e8e9d1f0 Now release mode is compatible 2019-12-15 16:19:01 +01:00
MontyTRC89
ee4db35ff7 Fixed problems with item new room 2019-12-11 22:25:26 +01:00
MontyTRC89
7e8de097f1 Fixed GetFloor, GetChange; Disabled GetCollisionInfo (bugged); Fixed signed char in FLOOR_INFO; 2019-12-10 18:25:48 +01:00
MontyTRC89
09cab57f9d Decompiled LaraBaddieCollision 2019-12-08 08:01:55 +01:00
MontyTRC89
40a7fd3d02 Decompiled GetCollisionInfo 2019-12-08 07:38:22 +01:00
MontyTRC89
9540cdab3e Decompiled TestBoundsCollide and CreatureCollision 2019-12-07 09:51:50 +01:00
MontyTRC89
8eef24ec71 Decompiled 2/3 of COLLIDE.CPP; Decompiled some rope functions; Refactoring; 2019-12-07 08:36:13 +01:00
MontyTRC89
18dcfa8053 Added TestLaraSlide, UpdateLaraRoom, TranslateItem, AnimateLara; Fixed partially pistols; 2019-12-04 18:51:23 +01:00
TokyoSU
713c992d76 Added Sophia
- deleted all the __cdecl except for the #define function. because /Gd enable the __cdecl for function by default.

- added the commented code in FireWeapon for TR3 entity (some function is missing)
2019-12-02 14:49:19 +01:00
MontyTRC89
37ac9b77fd Merged branches 2019-12-02 09:11:21 +01:00
MontyTRC89
546654aafe Added ShiftItem; Added TestLaraValut; 2019-12-02 06:39:51 +01:00
MontyTRC89
451af02839 Decompiled Lara (with some bugs) 2019-12-01 08:13:19 +01:00
TokyoSU
c3555a1fd1 [Update] Project & UPV Prototype
- changed __int32/__int16/__int8 to int/short/char respectivly.
- added UPV (prototype), lara is killed when enter.
2019-11-27 15:12:35 +01:00
MontyTRC89
ac968b41f9 Decompiled more functions from BOX.CPP, ITEMS.CPP, OBJECTS.CPP; 2019-11-01 08:35:01 +01:00
MontyTRC89
0e49d65c8e Added TR3 flamethrower; Added TR3 spiky ceiling; Added TR3 spiky wall; Added TR4 horse and horseman; New slots; 2019-05-06 23:48:44 +02:00
MontyTRC89
14837ae96f Refactoring sound IDs; Fixed wrong addresses in collision functions; Tested stargate; 2018-12-02 20:08:57 +01:00
MontyTRC89
705830a27c Added more collision functions; Implemented sarcophagus from TR4; 2018-11-24 17:26:26 +01:00
MontyTRC89
44d9fa6697 Decompiled grenade launcher (needs fixing); Improved crossbow; Added new ammo types; Implemented stargate and slicer dicer from TR4; Decompiled some collision functions and variables; Started implementing knight templar from TR4; 2018-11-24 09:39:37 +01:00
MontyTRC89
0199efb56c Refactoring weapons system 2018-11-21 09:34:01 +01:00
MontyTRC89
9fa8771748 Decompiled GetCollidedObjects; Fixed bugs in crossbow; 2018-11-19 23:29:30 +01:00
MontyTRC89
d32192ff64 Partially implemented crossbow; Inventory refactoring; 2018-11-14 20:54:18 +01:00
MontyTRC89
1f80ddd049 Implement quad; 2018-09-16 15:05:34 +02:00
MontyTRC89
f93d7cbc87 Implemented some TR4 traps 2018-09-09 17:14:49 +02:00