Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-04 18:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions
2650 commits 65 branches 10 tags 499 MiB
Commit graph

55 commits

Author SHA1 Message Date
Sezz
a036810db9 Refactor lara_fire.cpp 2021-11-20 15:39:05 +11:00
Sezz
f30ae8839e Refactor lara_flare.cpp 2021-11-20 13:18:59 +11:00
Sezz
1ac1fec4e1 Remove LaraItem global usage in lara_flare.cpp + minor cleanup 2021-11-12 19:52:48 +11:00
Lwmte
9058f2e3de Use script for setting weather 2021-11-11 01:16:27 +03:00
Lwmte
22e0e9e40f Cleanup camera code 2021-11-08 19:18:33 +03:00
Lwmte
8e42d77243 Move savegames to separate folder, organize savegame code 2021-10-31 21:36:51 +03:00
MontyTRC89
e4329c4974 Merge branch 'errors' 
# Conflicts:
#	TR5Main/Game/effects/flmtorch.cpp
#	TR5Main/Game/objects.cpp
#	TR5Main/Objects/Effects/enemy_missile.cpp
#	TR5Main/Objects/TR4/Entity/tr4_demigod.cpp
#	TR5Main/Objects/TR4/Entity/tr4_wraith.cpp
 2021-10-28 11:06:02 +02:00
Lwmte
ef0bcf950a Merge branch 'master' into errors 2021-10-08 16:47:59 +03:00
MontyTRC89
fbd15b520d Merge remote-tracking branch 'origin/master' into entities_fixings 2021-10-07 05:30:35 +02:00
Lwmte
2e5a68f3d7 Fix Lara double damage 2021-10-02 19:52:37 +03:00
Lwmte
3f285319f1 Fix HitTarget 2021-10-01 17:22:17 +03:00
MontyTRC89
ff3b1b44d4 Fixing ID_BURNING_TORCH_ITEM; Namespace rename for generic objects; 2021-09-30 12:03:39 +02:00
Troye
552352dd21 W1 2021-09-25 16:03:28 -05:00
Lwmte
e6fc5aba77 Cleanup 2021-09-25 16:00:30 +03:00
Raildex
2b0b1ff282 Added newlines 2021-09-25 11:27:47 +02:00
Raildex
7b070e75ad Fixed duplicated ITEM_INFO definition 2021-09-24 07:53:42 +02:00
Lwmte
cefc60c7ea Move around some files 2021-09-19 23:41:26 +03:00
Lwmte
8d86c2e97d Rename draw.cpp to animation.cpp which makes more sense, some more edits 2021-09-16 05:06:03 +03:00
Lwmte
1d0ceb0ff4 Fix more stuff 2021-09-16 01:12:19 +03:00
Lwmte
4a551c0918 Move LOS stuff out of control.cpp 2021-09-15 17:20:42 +03:00
Lwmte
7253706cb0 Fix issue with active creatures 2021-09-14 15:54:49 +03:00
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
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
Troye
84cc6d9c7f revert to bitshits in Game folder; handle lack of inv objects; 2021-08-30 15:13:18 -05:00
Raildex
c6fcf8b248 Renamed creature.h to creature_info.h 2021-08-29 10:04:49 +02:00
Raildex
dabbeb88db Fixed Include Hell for Creature Info 2021-08-28 12:16:03 +02:00
Lwmte
b8c3b67f10 Move collision and FX functions from effect.cpp 2021-08-26 15:54:52 +03:00
Lwmte
45b6724f92 Move and rename DoProperDetection to collide.cpp 2021-08-26 12:37:46 +03:00
Lwmte
12d8650176 Remove GetTiltType, swap wrongly named TiltX/TiltZ variables (mistake by Core) 2021-08-26 11:39:08 +03:00
Lwmte
70626854f0 Replace all remaining occurences of coll globals 2021-08-24 16:54:26 +03:00
Lwmte
7b9f01a1c4 Fix some lasersight issues 2021-08-11 15:18:22 +03:00
hispidence
0974fc091c Fix old LARA_DRAW_TYPE usage with LARA_TYPE constants. 
These don't need to be scoped, but I originally made it an enum class and plan to end up doing so down the line anyway, and this should save a bit of time there.
 2021-08-07 19:24:39 +01:00
Troye
a5630af88e fix flare cancels (again); use LM_LHAND for torch NodeOffset; remove unused TES_extra_tab; 2021-08-04 01:17:04 -05: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
c707f533c8 Possibly fixed DoRayBox and GetTargetOnLOS for working like in original game; Fixed ID_TROOPS; 2021-05-07 06:06:30 +02:00
MontyTRC89
5c39ead909 Fixed ID_SAS; Fixed serious bugs with CreatureActive(); Fixed grenades;' 2021-04-29 06:26:30 +02:00
asasas9500
700c1b5907 Remove function markers 2021-02-03 01:50:59 -03:00
Raildex
2138df91c3 Fixing Ammo 2021-01-26 10:28:08 +01:00
Raildex
d45db30cd9 Ammo struct to better represent Ammo 2021-01-25 13:58:23 +01:00
asasas9500
10a3d9167a Fix line endings 2020-12-21 13:16:29 -03:00
asasas9500
f9432ce420 Merge branch 'master' into NewTRMath 2020-11-04 11:51:17 -03:00
MontyTRC89
4e37478ffc Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-11-01 07:51:36 +01:00
MontyTRC89
6dc968d61f Climbable pushables beta; AlterFloorHeight (onli for floor) 2020-11-01 07:51:11 +01:00
Woops
eeccd1aabf Revert "bullets can actually hit enemies now" 
This reverts commit ba22c83216.
 2020-10-19 11:00:46 -05:00
Woops
ba22c83216 bullets can actually hit enemies now 2020-10-18 23:48:46 -05:00
Woops
0bd7ac9082 remove bitshifts from Lara code 2020-10-06 11:15:37 -05:00
asasas9500
7218086a0f Fix phd_sin() and phd_cos() 2020-10-05 22:24:57 -03:00