Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-13 14:07:04 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions
2599 commits 62 branches 10 tags 512 MiB
Commit graph

60 commits

Author SHA1 Message Date
Lwmte
84f6425959 Fix grenade ricochet in quicksand rooms, rename some projectile funcs 2021-11-08 18:57:38 +03:00
MontyTRC89
89d2755a46 Fixed demigods; Fixed energy bubbles; 2021-10-07 05:30:01 +02:00
MontyTRC89
ff3b1b44d4 Fixing ID_BURNING_TORCH_ITEM; Namespace rename for generic objects; 2021-09-30 12:03:39 +02:00
MontyTRC89
14d4ad67ec Fixed lightning draw; Improved darts emitter; 2021-09-22 10:55:48 +02:00
MontyTRC89
6cf4db33f1 Merge branch 'entities_fixings' 
# Conflicts:
#	TR5Main/Game/item.h
#	TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp
#	TR5Main/Objects/TR4/Object/tr4_element_puzzle.cpp
#	TR5Main/Objects/TR4/Trap/tr4_blade.cpp
#	TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp
#	TR5Main/Objects/TR4/Trap/tr4_mine.cpp
#	TR5Main/Objects/TR5/Trap/tr5_teethspike.cpp
#	TR5Main/TombEngine.vcxproj.filters
 2021-09-20 06:15:39 +02:00
Lwmte
cefc60c7ea Move around some files 2021-09-19 23:41:26 +03:00
MontyTRC89
234bc02b2f Fixed ID_TEETH_SPIKES and ID_SETH_BLADE 2021-09-18 06:20:56 +02: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
744325bea2 Revert "Fix regressions" 
This reverts commit c1fc33ab52.
 2021-09-11 10:13:04 +03:00
Lwmte
c1fc33ab52 Fix regressions 2021-09-11 09:41:29 +03:00
MontyTRC89
8db7df3868 Merge branch 'doors_refactoring' 
# Conflicts:
#	TR5Main/Game/door.cpp
#	TR5Main/Game/door.h
#	TR5Main/Game/memory/malloc.cpp
#	TR5Main/Objects/Generic/Switches/cog_switch.cpp
#	TR5Main/Objects/Generic/Switches/crowbar_switch.cpp
#	TR5Main/Objects/Generic/Switches/generic_switch.h
#	TR5Main/Objects/Generic/Switches/turn_switch.cpp
#	TR5Main/Objects/TR4/Object/tr4_obelisk.cpp
#	TR5Main/Renderer/Renderer11Draw.cpp
#	TR5Main/Specific/level.cpp
#	TR5Main/TombEngine.vcxproj
#	TR5Main/TombEngine.vcxproj.filters
 2021-09-11 05:38:26 +02: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
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
6d9cf3c214 Fix namespace case 2021-08-30 18:03:21 +03: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
c6fcf8b248 Renamed creature.h to creature_info.h 2021-08-29 10:04:49 +02:00
Raildex
2621fa8f0d Fixed More Include Hell 2021-08-28 13:27:58 +02: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
MontyTRC89
5129f0e064 Fixed ID_COG_SWITCH 2021-08-25 08:16:35 +02:00
MontyTRC89
7093a8df24 Refactored energy bubbles function names; Removed LanguageScript.cpp from the project; Working on ID_CROCODILE_GOD; 2021-08-20 06:00:34 +02:00
Lwmte
1c4c321e0d Assign hitEffect for most objects 2021-08-02 14:21:41 +03:00
Lwmte
3a2327a220 Fix #268 2021-07-31 04:48:15 +03:00
Trxye
55b517010d diary bs 2021-06-15 14:09:49 -05:00
wolfcheese
28f377789e Added rudimentary implementation of EXPANDING_PLATFORM 2021-06-11 22:57:58 -04:00
MontyTRC89
28d3a1078b Some little adjustments to ID_TEETH_SPIKES 2021-06-05 06:26:15 +02:00
MontyTRC89
b2f146922d Fixed ID_MUMMY init; Bugged 2 blocks platform; 2021-06-01 13:02:05 +02:00
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