Commit graph

45 commits

Author SHA1 Message Date
MontyTRC89
99614caa27 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-05-27 05:33:17 +02:00
Trxye
35af9b2c92 clean up ring inventory code; fix KillItem(); 2021-05-26 01:58:30 -05:00
MontyTRC89
6b5a932ff8 Remapped correctly sounds from TR5 to TR4; Decompiled TR4 CogSwitchControl; Decompiled TR4 ControlWaterfall; 2021-05-26 06:04:32 +02:00
MontyTRC89
1ccd6eb160 Merge branch 'AnimTextures'; Fixed doors init;
# Conflicts:
#	TR5Main/Renderer/Renderer11.h
#	TR5Main/Renderer/Renderer11Compatibility.cpp
#	TR5Main/TR5Main.vcxproj.filters
2021-05-25 05:58:44 +02:00
Trxye
622cc4210a fix inventory drawing; implement inventory in game code; 2021-05-20 14:19:11 -05:00
KrysB4k
8f6b428942 Removed duplicate function GetFloorAndTestTriggers, fix pushblock issues
GetFloorAndItemTriggers() was removed in favor of TestTriggersAtXYZ() from switch.cpp, which does the same. All calls to GetFloorAndItemTriggers were replaced with TestTriggersAtXYZ.

Pushables pulling bug was fixed in TestBlockPull(). PushableBlockControl() now calls ItemNewRoom() to signal change of room membership of pushable.
2020-12-19 23:02:55 +01:00
asasas9500
5bed19f999 Remove W2V_SHIFT, W2V_SCALE, WALL_SHIFT and NODE_SHIFT 2020-10-14 20:53:59 -03:00
Woops
622d86c6a2 clean up remove comments 2020-08-06 03:34:49 -05:00
Sebastian Zych
6a3700345e Updated animation and state names to follow a consistent system. 2020-08-04 20:32:07 +10:00
Montagna Marco
014aa1baa7 Frames refactoring 2020-07-25 18:02:35 +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
133c971aaf Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-07-11 21:29:49 +02:00
Montagna Marco
9f373c691a Pathfinding refactoring 2020-07-11 21:16:04 +02:00
Nils Gaitzsch
4b825f364e Merge branch 'master' into memory
# Conflicts:
#	TR5Main/Objects/TR5/tr5_objects.cpp
2020-07-10 20:17:03 +02:00
Montagna Marco
2a1c491c7e Hairs done on GPU now 2020-07-07 07:32:33 +02:00
Nils Gaitzsch
da0eaeac0e Made Game_Malloc a template with a count parameter 2020-07-05 22:19:06 +02:00
Montagna Marco
235dab2f13 New FLOOR_INFO struct; Refactoring rooms part I 2020-06-26 07:06:18 +02:00
Nils Gaitzsch
d5dc365c06 Made g_Inventory a constant object.
Fixed shadow intensity
Fixed CameraViewConstantBuffer
2020-06-16 19:45:06 +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
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
7293b0e203 Refactored math code and spheres 2020-04-27 06:33:42 +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
85b200d103 Commented code for ProcessClosedDoors because it seems to break some portals 2020-01-19 07:17:51 +01:00
Montagna Marco
e9b540323d Fixed sparks drawing; Moved boxes, overlaps and zones in DLL; Decompiled missing doors code; Added some code to phd_LookAt; 2020-01-16 19:14:35 +01:00
Montagna Marco
ab6d63fff0 Decompiling ID_STEEL_DOOR; Added missing file; 2020-01-07 17:32:49 +01:00
Montagna Marco
354a9d5afb Fixed InitialiseDoor 2019-12-26 07:16:38 +01:00
Montagna Marco
4ae49325e6 Merged branches; Possible fix to #92; 2019-12-25 08:44:01 +01:00
Lwmte
9267781719 Replace magic numbers in InitialiseDoor 2019-12-24 15:10:32 +03:00
Lwmte
7a23148f77 Fix #93 2019-12-24 14:31:58 +03:00
Montagna Marco
19a77eaf65 Decompiled InitialiseDoor an InitialiseSmashObjects 2019-12-23 10:53:15 +01: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
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
Montagna Marco
2443494349 Decompiling Lara 2019-11-21 07:43:34 +01:00
Montagna Marco
55d4f2466c Refactoring; Fixed bug with switch triggers; Tested crowbar door (to fix final Lara position wrong); 2019-11-18 07:49:02 +01:00
Montagna Marco
06d819b435 Fixed definitvely pushpull door 2019-11-17 08:27:04 +01:00
Montagna Marco
746a050503 Fixed push pull door 2019-11-16 21:07:06 +01:00
Montagna Marco
1ea4734f8a Merged branches; Fixed conflicts; 2019-11-15 07:40:22 +01:00
Montagna Marco
bfcb4a8920 Decompiled SWITCH.CPP; Decompiled DOOR.CPP; Refactoring; Fixed sequences variables; 2019-11-09 09:56:33 +01:00
MontyTRC89
e6114af969 First commit 2018-08-19 09:46:58 +02:00