Commit graph

60 commits

Author SHA1 Message Date
Woops
643ae060a7 super ugly check for joby-like crowbar pickups 2020-07-31 16:36:58 -05:00
Montagna Marco
de90a64b34 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-07-26 07:22:43 +02:00
Montagna Marco
014aa1baa7 Frames refactoring 2020-07-25 18:02:35 +02:00
Woops
f96d7a584e oops, add missing state check, fixes "hole" pickups 2020-07-25 00:56:37 -05:00
Woops
9d91f7c4a3 puzzle, do_puzzle 2020-07-23 15:29:02 -05:00
Woops
3491173b02 torch pickup stuff 2020-07-23 14:55:27 -05:00
Montagna Marco
bba838cfd3 Fixed pickups; Fixed no statics bug; 2020-07-23 21:38:12 +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
Montagna Marco
9f373c691a Pathfinding refactoring 2020-07-11 21:16:04 +02:00
Montagna Marco
2a1c491c7e Hairs done on GPU now 2020-07-07 07:32:33 +02: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
Woops
668fcaa71a oops, uncommenting, commenting caused items underwater to spin 2020-06-21 22:02:23 -05:00
Nils Gaitzsch
c591a12fa1 Merge branch 'master' into flipeffect-pickups
# Conflicts:
#	TR5Main/Game/effect.cpp
2020-06-20 13:48:55 +02:00
Woops
52b5cc7472 fixing 2020-06-20 06:35:13 -05:00
Nils Gaitzsch
d5dc365c06 Made g_Inventory a constant object.
Fixed shadow intensity
Fixed CameraViewConstantBuffer
2020-06-16 19:45:06 +02:00
Woops
040df20441 replace empty flipeffect 9, do_pickup 2020-06-15 00:32:58 -05:00
TokyoSU
9d6a3b20d1 Fix weapon not being updated when crouching
- caused by me in the first place, but i forgot this small detail :x
- Updated lara structure a bit for enum variables.
- Fixed some variable not using these enum (or using the wrong one !)
2020-06-05 14:01:22 +02: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
TokyoSU
cbef59ab82 Fixed missing lasersight change :'( 2020-06-04 11:44:22 +02:00
TokyoSU
f061d1a76c Fixed Tab, now using space 2020-06-04 11:33:49 +02:00
TokyoSU
1bff35f3dc Fixed Lasersight using hasSilencer
- Fixed HK using crossbow to check if it's present.
- Refactored PickedUpObject() to use WEAPON_AMMOXX enum for Ammo[] array.
2020-06-04 11:31:58 +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
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
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
Montagna Marco
46f2db3481 Merged LARA_INFO and LaraExtraInfo into LaraInfo 2020-04-27 14:01:00 +02:00
Montagna Marco
85e462f6a2 First EXE build successfully 2020-04-24 19:15:05 +02:00
Montagna Marco
4cc46789e9 Decompiled input 2020-04-23 19:22:01 +02:00
Montagna Marco
9f05715977 Decompiled level loading functions; Moved lot of vars in DLL; Added Zlib; 2020-04-22 14:12:10 +02:00
Montagna Marco
c0eaab7018 Fixed puzzles and keys; Fixed bug with floor and ceiling trapdoors; 2020-04-13 06:49:05 +02:00
Montagna Marco
c5b06cb1b7 Moved many camera vars in DLL 2020-04-12 07:08:22 +02:00
Montagna Marco
c12d345976 Fixed GUARDIAN death; Added X angle to shockwaves; Reset Use/combine selected index after combine or separe; Code cleaning; 2020-04-05 08:15:56 +02:00
Montagna Marco
3f35e4de4f Refactoring 1 2020-04-01 13:09:14 +02:00
Montagna Marco
7c27d8245c Added missing TR4 slots 2020-03-21 07:29:31 +01:00
asasas9500
b02200cb19 Fix torches; Remove duplicated draw_shotgun() 2020-01-30 23:39:53 -03:00
Montagna Marco
99fef97800 Decompilink smoke emitters; Fixed again dynmic lights; Fixed horizontal pickups; 2020-01-20 07:29:37 +01:00
Montagna Marco
18640b4f04 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-01-12 08:12:58 +01:00
Montagna Marco
c69cdeee40 Fixed AiPickupCollision; Fixed setup flags of many objects; Fixed item savegames; Refactored inventory; Added InitialseShootSwitch; 2020-01-12 08:02:48 +01:00
asasas9500
7db27f7b93 Add GetCarriedItems() and GetAIPickups(); Fix CollectCarriedItems() 2020-01-11 20:12:48 -03:00
Montagna Marco
5a2209fc6f Inventory refactoring 2020-01-10 08:02:16 +01:00
asasas9500
ca9a5c952b Rename cupboard functions; Add trapdoor functions; Add camera information to diagnostics 2019-12-20 23:29:01 -03:00
asasas9500
f3f31bc71f Improve cupboard functions; Fix Move3DPosTo3DPos(); Add lara rotation to diagnostics 2019-12-19 15:13:13 -03:00
TokyoSU
1de924d557 Updated some function, Added flag to Cupboard
- Fixed SequenceDoorControl() for Heavy Triggers && door->opened value.
- Cupboard Flag Added
- Updated:
UnderwaterDoorCollision()
DoubleDoorCollision()
PushPullKickDoorCollision()
PushPullKickDoorControl() // not really
DoorCollision()
DoorControl()
2019-12-18 15:12:01 +01:00
TokyoSU
a0ce2c7651 Decompiled Cupboard
- Crash when lara are in range of the cupboard, need to be fixed, possibly related to Initialise and flags.
2019-12-18 11:47:27 +01:00
asasas9500
f8468e679a Fix pickup triggers 2019-12-15 23:49:15 -03:00
TokyoSU
3670fddc71 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
Montagna Marco
09c2957f4f Merged branches 2019-12-02 09:11:21 +01:00
Montagna Marco
92bd6a006e Decompiled Lara (with some bugs) 2019-12-01 08:13:19 +01:00
TokyoSU
dc888f2c9c [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