Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-09 12:08:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions
1881 commits 63 branches 10 tags 505 MiB
Commit graph

183 commits

Author SHA1 Message Date
Raildex
b422cafc79 Merge branch 'master' into item_data 
# Conflicts:
#	TR5Main/Game/Lara/lara.cpp
#	TR5Main/Game/Lara/lara_collide.cpp
#	TR5Main/Game/Lara/lara_monkey.cpp
#	TR5Main/Game/Lara/lara_struct.h
#	TR5Main/Game/Lara/lara_tests.cpp
#	TR5Main/Game/collide.h
#	TR5Main/Game/control.h
#	TR5Main/Game/effect.h
#	TR5Main/Game/effect2.cpp
#	TR5Main/Game/flipeffect.cpp
#	TR5Main/Game/floordata.h
#	TR5Main/Game/hair.cpp
#	TR5Main/Game/health.cpp
#	TR5Main/Game/items.cpp
#	TR5Main/Game/newinv2.cpp
#	TR5Main/Game/spotcam.cpp
#	TR5Main/Objects/Effects/tr4_bubbles.cpp
#	TR5Main/Objects/TR1/Entity/tr1_ape.cpp
#	TR5Main/Objects/TR1/Entity/tr1_bigrat.cpp
#	TR5Main/Objects/TR1/Entity/tr1_doppelganger.cpp
#	TR5Main/Objects/TR2/Entity/tr2_birdmonster.cpp
#	TR5Main/Objects/TR2/Entity/tr2_shark.cpp
#	TR5Main/Objects/TR2/Entity/tr2_spider.cpp
#	TR5Main/Objects/TR2/Entity/tr2_yeti.cpp
#	TR5Main/Objects/TR3/Entity/tr3_fishemitter.cpp
#	TR5Main/Objects/TR3/Entity/tr3_flamethrower.cpp
#	TR5Main/Objects/TR3/Entity/tr3_monkey.cpp
#	TR5Main/Objects/TR3/Entity/tr3_raptor.cpp
#	TR5Main/Objects/TR3/Entity/tr3_scuba.cpp
#	TR5Main/Objects/TR3/Entity/tr3_trex.cpp
#	TR5Main/Objects/TR3/Vehicles/kayak.cpp
#	TR5Main/Objects/TR3/Vehicles/minecart.cpp
#	TR5Main/Objects/TR4/Entity/tr4_bat.cpp
#	TR5Main/Objects/TR4/Entity/tr4_big_beetle.cpp
#	TR5Main/Objects/TR4/Entity/tr4_bigscorpion.cpp
#	TR5Main/Objects/TR4/Entity/tr4_demigod.cpp
#	TR5Main/Objects/TR4/Entity/tr4_dog.cpp
#	TR5Main/Objects/TR4/Entity/tr4_hammerhead.cpp
#	TR5Main/Objects/TR4/Entity/tr4_harpy.cpp
#	TR5Main/Objects/TR4/Entity/tr4_mutant.cpp
#	TR5Main/Objects/TR4/Entity/tr4_smallscorpion.cpp
#	TR5Main/Objects/TR4/Entity/tr4_troops.cpp
#	TR5Main/Objects/TR4/Entity/tr4_wildboar.cpp
#	TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp
#	TR5Main/Objects/TR4/Vehicles/motorbike.cpp
#	TR5Main/Objects/TR5/Entity/tr5_doberman.cpp
#	TR5Main/Objects/TR5/Entity/tr5_imp.cpp
#	TR5Main/Objects/TR5/Entity/tr5_larson.cpp
#	TR5Main/Objects/TR5/Entity/tr5_lion.cpp
#	TR5Main/Objects/TR5/Entity/tr5_reaper.cpp
#	TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp
#	TR5Main/Objects/TR5/Object/tr5_rollingball.cpp
#	TR5Main/Objects/TR5/Trap/tr5_fallingceiling.cpp
#	TR5Main/Renderer/Renderer11Draw2D.cpp
#	TR5Main/Specific/input.cpp
#	TR5Main/Specific/level.cpp
#	TR5Main/TombEngine.vcxproj.filters
 2021-08-31 18:20:23 +02:00
Lwmte
21df1e84f1 Globals cleanup, remove wrecking ball hack, remove gassed property, fix diagonal block jump bug 2021-08-29 23:53:58 +03:00
Raildex
c6fcf8b248 Renamed creature.h to creature_info.h 2021-08-29 10:04:49 +02:00
Lwmte
0b7c3d4a20 Merge branch 'master' into legacy_trigger_refactor 2021-08-28 21:38:58 +03:00
Raildex
dabbeb88db Fixed Include Hell for Creature Info 2021-08-28 12:16:03 +02:00
MontyTRC89
d0da243f73 Refactored switches 2021-08-28 06:37:22 +02:00
Lwmte
b8c3b67f10 Move collision and FX functions from effect.cpp 2021-08-26 15:54:52 +03:00
MontyTRC89
82898fe37b Refactoring switches; Moved crowbar switch and underwater switches to separated files; 2021-08-26 05:46:10 +02:00
MontyTRC89
a12247a287 Refactoring switches; Fixed ID_JUMP_SWITCH and ID_LEVER_SWITCH; 2021-08-25 09:42:17 +02:00
MontyTRC89
9474284c87 Refactoring ID_LITTLE_BEETLES 2021-08-22 06:08:02 +02:00
Lwmte
d4c5304cf0 Fix spheres 4th time, fix alloc of TR4/5 objects 2021-08-05 13:31:42 +03:00
Lwmte
1c4c321e0d Assign hitEffect for most objects 2021-08-02 14:21:41 +03:00
Lwmte
7b105ec01b Fix #266 2021-07-31 05:28:42 +03:00
wolfcheese
26860575a2 Added bridge collision to FALLING_BLOCK 2021-06-16 10:19:46 -04:00
asasas9500
495641c632 Remove comments; Fix ID_ANIMATING13, ID_ANIMATING14, ID_ANIMATING15 and ID_ANIMATING16 2021-02-07 00:10:36 -03:00
asasas9500
10a3d9167a Fix line endings 2020-12-21 13:16:29 -03:00
asasas9500
fbb3cb6c9e Move trapdoor to generic objects folder 2020-09-29 09:53:36 -03:00
asasas9500
0e6e42b619 Remove ControlXRayMachine(); Move bridges to generic objects folder; Merge bridges 2020-09-27 20:44:17 -03:00
asasas9500
5f025c9cb5 Add support for bridges 2020-09-21 23:59:57 -03: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
asasas9500
7365cdf4c8 Rename Lara files 2020-08-09 22:09:14 -03:00
MontyTRC89
fa0012ba6a Decompiled ID_LEETLE_BEETLES 2020-08-06 06:51:32 +02:00
MontyTRC89
689ec226e7 Frames refactoring 2020-07-25 18:02:35 +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
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
39050f69ea Fixing Entity Include (Part 1) 
- Less Compile Time...
 2020-05-27 13:01:32 +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
TokyoSU
76b1d69599 Implemented Ahmet 
- fixed some entity not having zoneType !
 2020-05-19 19:01:11 +02:00
TokyoSU
543163798d Implemented Motorbike 
- need to fix shift bug, and lara position
- need to fix collision.
 2020-05-19 13:20:44 +02:00
TokyoSU
6d4cfeef98 Fixed and Implemented TonyBoss 2020-05-14 18:39:17 +02:00
MontyTRC89
4f703436c3 Fixed spider emitter 2020-04-30 06:22:31 +02:00
MontyTRC89
fdc3ff9996 Refactored OBJET_INFO to ObjectInfo 2020-04-27 15:28:54 +02:00
MontyTRC89
f3bb956927 First EXE build successfully 2020-04-24 19:15:05 +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
cc4691dd8b Decompiled math functions 4; Code cleaning; Decompiled many functions; 2020-04-15 18:30:34 +02:00
Raildex
e021865952 Added new Bubble routines 2020-04-13 13:36:23 +02:00
MontyTRC89
cbe099b03d Code cleaning and refactoring 2020-04-12 07:25:37 +02:00
MontyTRC89
cbe9f362b6 Fixed chase camera; Moved Camera in DLL; 2020-04-12 06:50:43 +02:00
asasas9500
f9c0138c81 Add BounceCamera(), TriggerAlertLight() and WreckingBallControl() 2020-04-09 11:17:26 -03:00
MontyTRC89
3cabd868ba Refactoring 1 2020-04-01 13:09:14 +02:00
MontyTRC89
030977968f Refactoring of shatters code 2020-04-01 07:24:15 +02:00
MontyTRC89
c7b6efe28d Added death states to CHEF and LAGOON_WITCH; Fixed water enemies; 2020-03-31 07:44:40 +02:00
MontyTRC89
db49a19c19 Decompiled CHEF 2020-03-30 11:39:20 +02:00
MontyTRC89
23affbdfc7 Decompiled ID_LAGOON_WITCH 2020-03-29 14:07:28 +02:00
MontyTRC89
c97c3b0745 Decompiled ControlBodyPart; Some bugfixes for ROMAN_GOD; 2020-03-26 07:07:02 +01:00