Commit graph

31 commits

Author SHA1 Message Date
MontyTRC89
984e2856a0 Fix merge conflicts 2021-05-28 12:41:38 +02:00
MontyTRC89
cd2a9a6216 Fixed bug in level loading; Fixed ID_DOG from TR4; 2021-05-28 12:36:40 +02:00
Trxye
d4474a1888 fix clockwork control; fix infinite pickup display; 2021-05-27 17:06:38 -05:00
MontyTRC89
c707f533c8 Possibly fixed DoRayBox and GetTargetOnLOS for working like in original game; Fixed ID_TROOPS; 2021-05-07 06:06:30 +02:00
asasas9500
6eb1a5e963 Merge branch 'master' into PushableOCB 2021-02-06 11:50:08 -03:00
asasas9500
7f7db2a31d Fix raising block 2021-01-27 22:26:47 -03:00
asasas9500
c4c810a0cc Add InitialiseExplosion() 2021-01-07 23:32:46 -03:00
asasas9500
1b96701d5e Fix raising blocks height 2020-11-14 14:35:27 -03:00
asasas9500
5f025c9cb5 Add support for bridges 2020-09-21 23:59:57 -03:00
asasas9500
04d9e70803 Merge branch 'master' into NoShifts 2020-08-25 20:28:18 -03:00
asasas9500
547b643232 Merge branch 'master' into NoShifts 2020-08-25 19:25:28 -03:00
Woops
e4bf317ce8 better things 2020-08-24 18:01:12 -05:00
Woops
fece17e9da implement 2020-08-24 13:23:21 -05:00
Woops
6ada970725 Lara refactor: lara_cheat, move the rest of the functions out of laramisc.cpp and delete it. fix includes. 2020-08-16 16:01:58 -05:00
Woops
415749b5c8 Lara refactor: lara_initialise and move AnimateLara to lara.cpp 2020-08-15 15:16:08 -05:00
MontyTRC89
971800fc94 Refactoring weapons; Added new shatter fields to static meshes datat structs; 2020-08-15 07:27:14 +02:00
asasas9500
7365cdf4c8 Rename Lara files 2020-08-09 22:09:14 -03:00
MontyTRC89
83bba01a99 Moving all globals of level under LEVEL struct; Fixed severe performance issue; 2020-07-21 09:56:47 +02:00
MontyTRC89
2d72803342 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-07-11 21:29:49 +02:00
MontyTRC89
9867a6d24c Pathfinding refactoring 2020-07-11 21:16:04 +02:00
Raildex
09071a2b88 Merge branch 'master' into memory
# Conflicts:
#	TR5Main/Objects/TR5/tr5_objects.cpp
2020-07-10 20:17:03 +02:00
MontyTRC89
e496593ff3 Fixed rats, bats, spiders; Added debug infos; 2020-07-08 05:56:50 +02:00
MontyTRC89
36fe66d617 Hairs done on GPU now 2020-07-07 07:32:33 +02:00
Raildex
5ef674b577 Made Game_Malloc a template with a count parameter 2020-07-05 22:19:06 +02:00
Moooonyeah
820a3700b0 TR5 ennemy trigger fix + decompiled code
- Fixed TR5 ennemies trigger issues.
- Added some decompiled WRAITH ennemy code
2020-06-20 22:59:24 +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
0ccf99dcd4 Finished Moving Function
- Moved Some Function to here respective file (new cpp/h).
- Changed effect_routines to function<void(ITEM_INFO*)>.
- Fixed ActivateCamera() not using ITEM_INFO* Argument for effect_routines[].
- Fixed ActivateKey() not using ITEM_INFO* Argument for effect_routines[].
- Fixed ActivateKey() and ActivateCamera() being defined 2 time.
- Commented the new level loader, for later.
2020-06-04 11:00:08 +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