Commit graph

63 commits

Author SHA1 Message Date
Sezz
f30ae8839e Refactor lara_flare.cpp 2021-11-20 13:18:59 +11:00
Sezz
27b8f3486e Refactor quad.cpp 2021-11-17 00:17:25 +11:00
Sezz
f68b5334e0 Refactor biggun.cpp and quad.cpp 2021-11-16 22:30:37 +11:00
Sezz
2ed0dbeddc Rename quad state 2021-11-16 19:03:49 +11:00
Sezz
d493933ce5 Refactor quad.cpp 2021-11-16 14:19:22 +11:00
Sezz
ec43f8ded0 Refactor quad.cpp 2021-11-15 14:51:34 +11:00
Sezz
6e693240e2 Move quad structs 2021-11-14 16:08:59 +11:00
Sezz
3d861600a6 Refactor quad.cpp 2021-11-14 14:59:11 +11:00
Sezz
1ac1fec4e1 Remove LaraItem global usage in lara_flare.cpp + minor cleanup 2021-11-12 19:52:48 +11:00
Lwmte
8f51243ca4 First commit 2021-11-10 02:41:59 +03:00
Lwmte
fc14708e4e Fix optional pitch and gain multipliers for SoundEffect 2021-09-20 21:47:42 +03:00
Lwmte
015815c5d3 Fix embedding into diagonal walls and steps, fix Lara freeze on triangle slopes 2021-09-17 22:55:09 +03:00
Lwmte
32b48e9c24 Rename some functions 2021-09-17 16:07:53 +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
f79d6436a3 Remove optional TestTriggers argument 2021-09-15 16:58:53 +03:00
Lwmte
280c9fa28b Merge branch 'master' into coll_info_reorganize 2021-09-10 10:11:15 +03:00
Lwmte
c9d4914e3d Simplify COLL_POSITION 2021-09-10 00:43:26 +03:00
Lwmte
48a9a1d52a Merge branch 'master' into item_data 2021-09-09 11:10:25 +03:00
Lwmte
3fe6211e4e Further organizing 2021-09-08 18:31:35 +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
Lwmte
21df1e84f1 Globals cleanup, remove wrecking ball hack, remove gassed property, fix diagonal block jump bug 2021-08-29 23:53:58 +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
59987a69a7 Refactored several info types into separate files 2021-08-29 10:19:47 +02:00
Lwmte
b8c3b67f10 Move collision and FX functions from effect.cpp 2021-08-26 15:54:52 +03:00
Lwmte
1f68fd812b Simplify TestTriggers by providing overloads 2021-08-26 12:12:05 +03:00
Lwmte
ec9479860f Merge branch 'master' into legacy_trigger_refactor 2021-08-24 19:04:54 +03:00
Lwmte
70626854f0 Replace all remaining occurences of coll globals 2021-08-24 16:54:26 +03:00
Lwmte
1828ddaeab Replace all direct occurences of TestTriggers with TestTriggersAtXYZ and references to TriggerIndex global in structs 2021-08-20 14:13:06 +03: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
5e98a7aff7 Define some PHD_3DPOS vars before TriggerShockwave calls so that we don't take an address of a temporary. 2021-07-23 21:51:41 +01:00
hispidence
53b971c033 Remove 'typedef' from enums and structs. This was required in C, but in C++ all it does is generate thousands of warnings. 2021-07-18 15:22:15 +01:00
MontyTRC89
b2f102ae63 Remapped correctly sounds from TR5 to TR4; Decompiled TR4 CogSwitchControl; Decompiled TR4 ControlWaterfall; 2021-05-26 06:04:32 +02:00
Trxye
a6462075a3 Remove TR3 comments 2021-03-24 12:49:36 -05:00
asasas9500
10a3d9167a Fix line endings 2020-12-21 13:16:29 -03:00
asasas9500
d0a930978f Implement new random system 2020-10-24 01:05:59 -03:00
Woops
a8b36fab20 remove bitshifts from vehicles 2020-10-06 10:36:30 -05:00
asasas9500
7218086a0f Fix phd_sin() and phd_cos() 2020-10-05 22:24:57 -03:00
Woops
c695b76b14 fix motorbike crash, better explosions, better cheats 2020-09-16 13:03:30 -05: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
MontyTRC89
fd8652b093 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-09-12 07:54:20 +02:00
MontyTRC89
54893c42be Improved vehicles; Fixed bugs in ID_SPEEDBOAT; 2020-09-12 07:52:47 +02:00
Woops
456482715c engine revving with sprint 2020-09-10 23:43:44 -05:00
Woops
7f758c32fe fix quad explosion with water 2020-09-10 15:56:58 -05:00
MontyTRC89
f41b1493c6 Fixed ID_QUAD sounds and wheel rotations 2020-09-10 13:31:35 +02:00
asasas9500
547b643232 Merge branch 'master' into NoShifts 2020-08-25 19:25:28 -03:00
MontyTRC89
3958108a48 Added TriggerExplosionBubbles; Added TriggerRocketFire; Added fire to grenade; Fixed and tested grenade explosive ammos; Added flag from TR4 to TriggerUnderwaterExplosion; 2020-08-10 18:17:59 +02:00
asasas9500
7365cdf4c8 Rename Lara files 2020-08-09 22:09:14 -03:00