Commit graph

97 commits

Author SHA1 Message Date
Lwmte
282927ffda Fix #344 2021-11-08 17:28:04 +03:00
Lwmte
83bae04c01 Replace logD/logE everywhere with TENLog 2021-10-31 10:50:36 +03:00
Lwmte
ce832c3bb8 Remove garbage from console 2021-10-29 04:02:30 +03:00
Lwmte
e6fc5aba77 Cleanup 2021-09-25 16:00:30 +03:00
Lwmte
b7cf7be08c Merge branch 'master' into item_info_include_fix 2021-09-25 15:59:51 +03:00
Raildex
2b0b1ff282 Added newlines 2021-09-25 11:27:47 +02:00
Lwmte
4b242264f6 cleanup 2021-09-24 14:22:47 +03:00
Lwmte
6c29ba5442 Fix everything 2021-09-24 13:50:31 +03:00
Raildex
7b070e75ad Fixed duplicated ITEM_INFO definition 2021-09-24 07:53:42 +02:00
Lwmte
9dc9a1d0a2 Fix 2021-09-22 12:40:57 +03:00
Lwmte
a8fcf23331 Update Render11Helper.cpp 2021-09-22 11:31:47 +03:00
Lwmte
acd31c9e8f Update Render11Helper.cpp 2021-09-22 11:08:05 +03:00
Lwmte
ba7797c71c First test 2021-09-22 10:48:14 +03:00
Lwmte
cefc60c7ea Move around some files 2021-09-19 23:41:26 +03:00
Lwmte
016be41f97 Move anim structs to animation.h 2021-09-19 18:29:25 +03:00
Lwmte
70b0228a20 Really fix aiming 2021-09-17 04:09:01 +03:00
Lwmte
553fbf866b Fix Lara aiming 2021-09-17 03:46:49 +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
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
8a330f1da0 Removed unnecessary constructor of ITEM_DATA
Removed Debugging leftovers
2021-08-30 17:50:11 +02:00
Lwmte
6d9cf3c214 Fix namespace case 2021-08-30 18:03:21 +03: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
59987a69a7 Refactored several info types into separate files 2021-08-29 10:19:47 +02: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
MontyTRC89
0ed8181cda Merge branch 'master' of https://github.com/MontyTRC89/TombEngine; Renamed namespaces;
# Conflicts:
#	TR5Main/TR5Main.vcxproj.user
2021-08-20 05:25:51 +02:00
hispidence
561119ef09 Clean up some warnings. 2021-08-12 22:10:05 +01:00
Lwmte
d4c5304cf0 Fix spheres 4th time, fix alloc of TR4/5 objects 2021-08-05 13:31:42 +03:00
Lwmte
e9b78d8919 Fix GetSpheres again, but currently still broken in some cases (eg lever switch) 2021-08-03 14:14:37 +03:00
Lwmte
95d5f5853e Fix GetSpheres some more, fix cameras/sinks/AI objects/sound sources not cleaning on reload 2021-08-03 13:23:51 +03:00
Lwmte
331bafbf5c Fix GetSpheres and probably a lot of collision issues 2021-08-03 12:32:23 +03:00
Lwmte
f099fc69b4 Implement per-vertex effects for rooms and objects 2021-07-30 20:55:03 +03:00
hispidence
ba48783bc3 Define scale and translation vectors just before the Decompose call instead of in its arguments, since it takes them by non-const reference. 2021-07-23 21:48:06 +01:00
MontyTRC89
abb7b0c862 Added some constants to TestTrigger(); Fixed ID_SETH_BLADE; Fixed many collision bugs with Lara; 2021-06-04 06:02:19 +02:00
MontyTRC89
906703b1ab Merge branch 'AnimTextures'; Fixed doors init;
# Conflicts:
#	TR5Main/Renderer/Renderer11.h
#	TR5Main/Renderer/Renderer11Compatibility.cpp
#	TR5Main/TR5Main.vcxproj.filters
2021-05-25 05:58:44 +02:00
Trxye
6074ab93a2 implement new inventory 2021-05-18 19:16:58 -05:00
Raildex
d57c2f65c9 Animated Texture progress
Refactored Bucket Rendering
2021-03-14 16:30:37 +01:00
Raildex
6d0557c667 Fixing Jeep wheels (and potentially Motorbike) 2021-01-21 19:35:57 +01:00
asasas9500
10a3d9167a Fix line endings 2020-12-21 13:16:29 -03:00
Raildex
69847d859a Increased Room Stack Size to 512 2020-11-26 20:41:07 +01:00
Woops
8dea82395b better biggun tm 2020-10-25 00:35:31 -05:00
Raildex
ddc88e9419 Refactor Renderer 2020-10-11 16:47:36 +02:00
Woops
dc3695e283 upv: make fan rotate + light 2020-09-30 14:45:46 -05:00
Raildex
ac61f71386 Refactored framework.h
Removed Renderer headers from framework.h
Removed bass headers from framework.h
Removed windows-related headers to avoid nameclashes with std::min and std::max
added <algorithm> for general-purpose functions (like std::min/max)
Added NOMINMAX define to project
Minor Refactorings
2020-09-29 21:43:56 +02:00
Woops
5ad889db3e Make rubberboat fan rotate 2020-09-14 12:57:15 -05:00
MontyTRC89
f41b1493c6 Fixed ID_QUAD sounds and wheel rotations 2020-09-10 13:31:35 +02:00
MontyTRC89
971800fc94 Refactoring weapons; Added new shatter fields to static meshes datat structs; 2020-08-15 07:27:14 +02: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
Raildex
b58d18ade2 Refactored functions 2020-08-09 15:25:56 +02:00
MontyTRC89
f24e2abb94 Added ZLIB 2020-07-26 07:21:38 +02:00