Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-30 08:47:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions
1945 commits 64 branches 10 tags 487 MiB
Commit graph

57 commits

Author SHA1 Message Date
Lwmte
48a9a1d52a Merge branch 'master' into item_data 2021-09-09 11:10:25 +03:00
Lwmte
ba6c260b92 Further code organizing 2021-09-08 18:19:06 +03:00
Lwmte
f293735d11 Move all effect source files to separate directory, rename effect2 to effects 2021-09-08 18:07:48 +03:00
MontyTRC89
713b52b616 Merge pull request #322 from MontyTRC89/generalPtr 
Renamed "generalPtr" of LaraInfo to "interactedItem"
 2021-09-08 16:43:33 +02:00
MontyTRC89
1ee650487b Merge pull request #323 from MontyTRC89/new_tightrope 
Added new Tightrope behaviour
 2021-09-08 16:43:18 +02:00
Raildex
f62f900fb0 Added new Tightrope behaviour 
You can use Left and Right to control lara's balance
Lara will gradually lose balance
When lara stops, her balance regenerates
 2021-09-05 14:49:00 +02:00
Raildex
2ee57e5891 Renamed "generalPtr" of LaraInfo to "interactedItem" 
All code that cast it to ITEM_INFO* was converted to a separate access into g_Level.Items
 2021-09-05 11:20:51 +02:00
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
Troye
84cc6d9c7f revert to bitshits in Game folder; handle lack of inv objects; 2021-08-30 15:13:18 -05:00
Raildex
2621fa8f0d Fixed More Include Hell 2021-08-28 13:27:58 +02:00
Lwmte
b8c3b67f10 Move collision and FX functions from effect.cpp 2021-08-26 15:54:52 +03:00
Lwmte
d394bcc39f Completely get rid of TriggerIndex 2021-08-20 15:26:12 +03:00
MontyTRC89
b2f102ae63 Remapped correctly sounds from TR5 to TR4; Decompiled TR4 CogSwitchControl; Decompiled TR4 ControlWaterfall; 2021-05-26 06:04:32 +02:00
MontyTRC89
42ce51dd9e Fix merge conflicts 2021-05-21 05:38:20 +02:00
asasas9500
10a3d9167a Fix line endings 2020-12-21 13:16:29 -03:00
Woops
2ce98f1e8f remove bitshifts from the "Game" folder 2020-10-06 12:44:14 -05: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
Raildex
81a786c839 Made Spark.size a float 
Fixed Lara burning fire, Quad Exhaust smoke and Grenade/Rocket Trail.
TODO: More fixing of sparks
 2020-09-12 13:49:09 +02:00
Sezz
5d4dc8ffdd Updated animation and state names to follow a consistent system. 2020-08-04 20:32:07 +10:00
MontyTRC89
91aa426fc1 Fixed IsRoomOutside; Fixed AnimatingControl; 2020-08-04 07:10:31 +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
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
efd1f2728b Fixed look camera; Fixed bugs with gunflashes and smoke positions; 2020-04-29 06:43:53 +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
7771e8faf1 PHD Math removal 1 2020-04-20 14:17:01 +02:00
MontyTRC89
de5baead1f Fixed last commit; Rewritten phd_RotBoundingBoxNoPersp(); 2020-04-17 07:00:47 +02:00
MontyTRC89
e6c2205ffc Removed ExplodingDeath define and renamed ExplodingDeath2 => ExplodingDeath 2020-04-17 06:31:51 +02:00
MontyTRC89
cc4691dd8b Decompiled math functions 4; Code cleaning; Decompiled many functions; 2020-04-15 18:30:34 +02: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
1a7fa55424 Fixed shatterObjects references 2020-03-29 20:05:04 +02:00
MontyTRC89
826af067b3 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
asasas9500
420f1fd9c0 Fix flat bridges; Add wrecking ball functions 2019-12-23 20:08:52 -03:00
MontyTRC89
411f8e434e Fixed references to doors; Added TR3 style pushable blocks; Added InitialiseTightRope; 2019-12-23 23:10:24 +01:00
MontyTRC89
0e986ce616 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2019-12-23 10:53:56 +01:00
MontyTRC89
b1efced035 Decompiled InitialiseDoor an InitialiseSmashObjects 2019-12-23 10:53:15 +01:00
asasas9500
e5b1febf56 Fix parallel bars; Fix bridges 2019-12-22 21:44:54 -03:00
asasas9500
50d977e753 Fix input handling; Fix poles 2019-12-22 17:07:52 -03:00
asasas9500
f4d262c0f5 Fix lara_col_surftread(); Fix ANGLE(); Replace some ANGLE() calls 2019-12-17 21:49:33 -03:00
TokyoSU
713c992d76 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
MontyTRC89
37ac9b77fd Merged branches 2019-12-02 09:11:21 +01:00
MontyTRC89
451af02839 Decompiled Lara (with some bugs) 2019-12-01 08:13:19 +01:00