Commit graph

66 commits

Author SHA1 Message Date
Woops
d150cecaaf Lara refactor: move pickup states to pickup.cpp 2020-08-10 00:34:19 -05:00
asasas9500
7365cdf4c8 Rename Lara files 2020-08-09 22:09:14 -03:00
Woops
59eec6ddc2 Refactor: move puzzle and keys out of pickup.cpp into their own file 2020-08-09 01:24:06 -05:00
Woops
b1efaf61eb clean up remove comments 2020-08-06 03:34:49 -05:00
Woops
058f7f958f small fix 2020-08-05 15:52:07 -05:00
Sezz
5d4dc8ffdd Updated animation and state names to follow a consistent system. 2020-08-04 20:32:07 +10:00
Woops
a6b8554745 super ugly check for joby-like crowbar pickups 2020-07-31 16:36:58 -05:00
MontyTRC89
e057d91de3 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-07-26 07:22:43 +02:00
MontyTRC89
689ec226e7 Frames refactoring 2020-07-25 18:02:35 +02:00
Woops
ac32cb0db6 oops, add missing state check, fixes "hole" pickups 2020-07-25 00:56:37 -05:00
Woops
c357bdbdd4 puzzle, do_puzzle 2020-07-23 15:29:02 -05:00
Woops
7f889c28ad torch pickup stuff 2020-07-23 14:55:27 -05:00
MontyTRC89
6cd500008c Fixed pickups; Fixed no statics bug; 2020-07-23 21:38:12 +02:00
MontyTRC89
83bba01a99 Moving all globals of level under LEVEL struct; Fixed severe performance issue; 2020-07-21 09:56:47 +02:00
MontyTRC89
9867a6d24c Pathfinding refactoring 2020-07-11 21:16:04 +02:00
MontyTRC89
36fe66d617 Hairs done on GPU now 2020-07-07 07:32:33 +02:00
MontyTRC89
5b8c90b688 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-06-26 07:06:51 +02:00
MontyTRC89
d8bf82eab1 New FLOOR_INFO struct; Refactoring rooms part I 2020-06-26 07:06:18 +02:00
Woops
64f11ed55b oops, uncommenting, commenting caused items underwater to spin 2020-06-21 22:02:23 -05:00
Raildex
ccfb97b549 Merge branch 'master' into flipeffect-pickups
# Conflicts:
#	TR5Main/Game/effect.cpp
2020-06-20 13:48:55 +02:00
Woops
23a5d279dc fixing 2020-06-20 06:35:13 -05:00
Raildex
d2d6e5f30c Made g_Inventory a constant object.
Fixed shadow intensity
Fixed CameraViewConstantBuffer
2020-06-16 19:45:06 +02:00
Woops
55e0e36bcb replace empty flipeffect 9, do_pickup 2020-06-15 00:32:58 -05:00
TokyoSU
2c6a1a7480 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
900235c967 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
5152ec047c Fixed missing lasersight change :'( 2020-06-04 11:44:22 +02:00
TokyoSU
509818a7e8 Fixed Tab, now using space 2020-06-04 11:33:49 +02:00
TokyoSU
6105e1a00a 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
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
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
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
MontyTRC89
5f63d6acba Merged LARA_INFO and LaraExtraInfo into LaraInfo 2020-04-27 14:01:00 +02:00
MontyTRC89
f3bb956927 First EXE build successfully 2020-04-24 19:15:05 +02:00
MontyTRC89
6bff6caed2 Decompiled input 2020-04-23 19:22:01 +02:00
MontyTRC89
9a78144600 Decompiled level loading functions; Moved lot of vars in DLL; Added Zlib; 2020-04-22 14:12:10 +02:00
MontyTRC89
53a5e1715a Fixed puzzles and keys; Fixed bug with floor and ceiling trapdoors; 2020-04-13 06:49:05 +02:00
MontyTRC89
30997878af Moved many camera vars in DLL 2020-04-12 07:08:22 +02:00
MontyTRC89
78293ce999 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
MontyTRC89
3cabd868ba Refactoring 1 2020-04-01 13:09:14 +02:00
MontyTRC89
72c590ee1b Added missing TR4 slots 2020-03-21 07:29:31 +01:00
asasas9500
d866d15692 Fix torches; Remove duplicated draw_shotgun() 2020-01-30 23:39:53 -03:00
MontyTRC89
1c577198ea Decompilink smoke emitters; Fixed again dynmic lights; Fixed horizontal pickups; 2020-01-20 07:29:37 +01:00
MontyTRC89
48e25d6a8c Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-01-12 08:12:58 +01: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
6c145d913f Add GetCarriedItems() and GetAIPickups(); Fix CollectCarriedItems() 2020-01-11 20:12:48 -03:00
MontyTRC89
30e5dc3da7 Inventory refactoring 2020-01-10 08:02:16 +01:00
asasas9500
9475ceed7c Rename cupboard functions; Add trapdoor functions; Add camera information to diagnostics 2019-12-20 23:29:01 -03:00
asasas9500
341e75234d Improve cupboard functions; Fix Move3DPosTo3DPos(); Add lara rotation to diagnostics 2019-12-19 15:13:13 -03:00
TokyoSU
2f7100d544 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