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

65 commits

Author SHA1 Message Date
Lwmte
c81fcfe43e Fix merge conflicts 2021-09-09 11:25:03 +03:00
Lwmte
48a9a1d52a Merge branch 'master' into item_data 2021-09-09 11:10:25 +03:00
Lwmte
f293735d11 Move all effect source files to separate directory, rename effect2 to effects 2021-09-08 18:07:48 +03:00
Raildex
31ec83f9cc Merge branch 'master' into item_data 
# Conflicts:
#	TR5Main/Game/items.cpp
 2021-09-04 11:52:34 +02:00
MontyTRC89
cea3608a25 Cleaned collision code; Cleaning AI code; Usin visibility for for statics culling; Fixed Lara crawling; 2021-09-04 07:53:21 +02:00
Raildex
dce3f72d99 Removed BaddieSlots 
ActiveCreatures now contains pointers to CREATURE_INFOs of items instead
Every Item with Creature Info now contains their own path finding data.
Fixed OoB issues with XZ_GET_SECTOR
 2021-09-03 09:37:42 +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
Raildex
e7f2632c99 Fixed Door crashes by doing a simple copy of the floor data instead of memcpy 
Using resize() insteaad of clear() for vectors in LEVEL to force a deallocation
 2021-08-30 17:28:26 +02:00
Raildex
44c454318f Cleaned up several buffers to use fixed arrays 
Removed game_malloc
TODO: DOOR_DATA destructor crashes
 2021-08-29 16:35:19 +02:00
Raildex
f7080f56c9 Integrated ITEM_DATA into ITEM_INFO 
TODO: See what happens with ENEMY_JEEP
 2021-08-29 16:11:03 +02: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
hispidence
1e38b88339 Set luaName to blank in CreateItem to indicate the lack of a name. 2021-07-17 23:49:40 +01:00
hispidence
54e14ccb3f Make some functions take a GAME_OBJECT_ID instead of a short. Make AIOBJECT use a GAME_OBJECT_ID instead of a short. 2021-07-11 16:55:20 +01:00
Trxye
e2b0178cb8 InitialiseObelisk(); some of ObeliskControl() 2021-06-09 22:48:18 -05:00
Trxye
c0ca04a806 clean up ring inventory code; fix KillItem(); 2021-05-26 01:58:30 -05:00
MontyTRC89
97cc77446a Fixed bug in ItemNewRoom 2021-05-24 09:27:52 +02:00
MontyTRC89
5c39ead909 Fixed ID_SAS; Fixed serious bugs with CreatureActive(); Fixed grenades;' 2021-04-29 06:26:30 +02:00
asasas9500
ad446ad534 Improve FindItem() 2021-02-07 17:12:41 -03: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
MontyTRC89
211263afac Fixed Lara damage on grenade hit; Fixed EffectList[] init; getBoneMatrix now valid for both Lara and other items; Added code (not working yet) for enemy explosion death; 2020-08-09 20:29:31 +02:00
Woops
b1efaf61eb clean up remove comments 2020-08-06 03:34:49 -05: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
5ef674b577 Made Game_Malloc a template with a count parameter 2020-07-05 22:19:06 +02:00
Raildex
3cd6100562 Merge branch 'master' into renderdatarefactor 
# Conflicts:
#	TR5Main/Renderer/Render11Helper.cpp
#	TR5Main/Renderer/Renderer11.h
#	TR5Main/Renderer/Renderer11Compatibility.cpp
#	TR5Main/Renderer/Renderer11Draw.cpp
 2020-06-27 19:48:50 +02:00
MontyTRC89
d8bf82eab1 New FLOOR_INFO struct; Refactoring rooms part I 2020-06-26 07:06:18 +02:00
Raildex
e5ead31064 Putting Renderer into namespace 
made g_Renderer a global object
 2020-06-21 14:27:12 +02:00
TokyoSU
e355827ee5 Fixed Repo, Fixed Savegame Struct Missing 2020-05-30 17:58:09 +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
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
ea3db8638f Partially fixed spheres; Fixed swap meshes; partially fixed Lara firing; 2020-04-26 10:55:33 +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
3cabd868ba Refactoring 1 2020-04-01 13:09:14 +02:00
MontyTRC89
65451b3854 Restored FLAME (still badly rendered); Moves items/fx variables to DLL; Increased Effects[] from 24 to 1024; Fixed dynamic lights in rooms; 2020-01-19 08:12:51 +01:00
asasas9500
b04d3d86a4 Fix wrong ClearItem() address 2020-01-14 15:16:41 -03:00
MontyTRC89
29ff6f9355 Fixing Larson; Fixed ITEM_INFO struct; Fixed some entities; Fixed InitialiseCreature; Fixed ClearItem; 2020-01-04 09:10:24 +01:00
MontyTRC89
c1ba43dac9 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2019-12-22 07:56:44 +01:00
MontyTRC89
25418903ad Decompiled EFFECTS.CPP, EFFECT2.CPP, TOMB4FX.CPP 2019-12-22 00:20:10 +01: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
asasas9500
6e2b4641e4 Fix for loops 2019-12-16 17:26:31 -03:00
MontyTRC89
ee4db35ff7 Fixed problems with item new room 2019-12-11 22:25:26 +01:00
MontyTRC89
54cca0249a Fixed crashes and hangs with effects; Fixed camera FOV; Downgraded to DX10.0 feature level; 2019-12-11 07:40:47 +01: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
TokyoSU
c3555a1fd1 [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
TokyoSU
0a35c93a84 Added Entity 
- Flamethrower (no effect)
- Knifethrower & Knife
- Bird Monster
- Tony (no effect)
 2019-11-23 14:49:00 +01:00