Nils
01bf1881b3
Fixed duplicated ITEM_INFO definition
2021-09-24 07:53:42 +02:00
Lwmte
5cfbc3a487
Fix embedding into diagonal walls and steps, fix Lara freeze on triangle slopes
2021-09-17 22:55:09 +03:00
Lwmte
99ab563ee7
Rename draw.cpp to animation.cpp which makes more sense, some more edits
2021-09-16 05:06:03 +03:00
Lwmte
2b49b9aa42
Fix more stuff
2021-09-16 01:12:19 +03:00
Lwmte
da67b9166c
Remove optional TestTriggers argument
2021-09-15 16:58:53 +03:00
Lwmte
e509290192
Merge branch 'master' into coll_info_reorganize
2021-09-10 10:11:15 +03:00
Lwmte
8136b41f42
Simplify COLL_POSITION
2021-09-10 00:43:26 +03:00
Lwmte
8728405870
Rename settings to setup
2021-09-10 00:20:59 +03:00
Lwmte
26957e806e
Reorganize COLL_INFO
2021-09-10 00:18:47 +03:00
Lwmte
4186dfe685
Merge branch 'master' into item_data
2021-09-09 11:10:25 +03:00
Lwmte
9af21e3146
Further code organizing
2021-09-08 18:19:06 +03:00
Lwmte
2bee1df81a
Move all effect source files to separate directory, rename effect2 to effects
2021-09-08 18:07:48 +03:00
Nils
d08a1fa596
Merge branch 'master' into item_data
...
# Conflicts:
# TR5Main/Game/items.cpp
2021-09-04 11:52:34 +02:00
Lwmte
fb65e68191
Remove broken CollideStaticObjects function
...
# Conflicts:
# TR5Main/Game/collide.cpp
2021-09-02 19:50:10 +02:00
Nils
7f774d04b3
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
e2e20a2497
Globals cleanup, remove wrecking ball hack, remove gassed property, fix diagonal block jump bug
2021-08-29 23:53:58 +03:00
Nils
cb43604806
Integrated ITEM_DATA into ITEM_INFO
...
TODO: See what happens with ENEMY_JEEP
2021-08-29 16:11:03 +02:00
Nils
34c2b0b245
Refactored several info types into separate files
2021-08-29 10:19:47 +02:00
Lwmte
efa66ca8ff
Fix idiocy
2021-08-29 00:00:15 +03:00
Lwmte
dd3b6fa4e5
Move collision and FX functions from effect.cpp
2021-08-26 15:54:52 +03:00
Lwmte
932ccc40d1
Simplify TestTriggers by providing overloads
2021-08-26 12:12:05 +03:00
Lwmte
0b8ca4fa54
Replace all remaining occurences of coll globals
2021-08-24 16:54:26 +03:00
Lwmte
218e9f685a
Replace all direct occurences of TestTriggers with TestTriggersAtXYZ and references to TriggerIndex global in structs
2021-08-20 14:13:06 +03:00
hispidence
21a867e821
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
4c7110558f
Switched audio tracks from int index to string; Added Tracks.lua loading support;
2021-06-26 07:36:54 +02:00
Trxye
1787898437
Remove TR3 comments
2021-03-24 12:49:36 -05:00
Woops
032f91a87c
remove bitshifts from vehicles
2020-10-06 10:36:30 -05:00
asasas9500
6fc9bd9890
Fix phd_sin() and phd_cos()
2020-10-05 22:24:57 -03:00
asasas9500
b9bc1cf54e
Rename Lara files
2020-08-09 22:09:14 -03:00
Montagna Marco
18994dd59e
Moving all globals of level under LEVEL struct; Fixed severe performance issue;
2020-07-21 09:56:47 +02:00
Nils Gaitzsch
4b825f364e
Merge branch 'master' into memory
...
# Conflicts:
# TR5Main/Objects/TR5/tr5_objects.cpp
2020-07-10 20:17:03 +02:00
Montagna Marco
2a1c491c7e
Hairs done on GPU now
2020-07-07 07:32:33 +02:00
Nils Gaitzsch
da0eaeac0e
Made Game_Malloc a template with a count parameter
2020-07-05 22:19:06 +02:00
Montagna Marco
439db540e3
New level format: meshes
2020-07-03 07:05:33 +02:00
Montagna Marco
d6f45db5ec
Merge branch 'master' of https://github.com/MontyTRC89/TR5Main
2020-06-26 07:06:51 +02:00
Montagna Marco
235dab2f13
New FLOOR_INFO struct; Refactoring rooms part I
2020-06-26 07:06:18 +02:00
Nils Gaitzsch
c860919616
Fixed std namespace collisions
...
Refactored ChunkID/ChunkReader/Writer
2020-06-20 23:39:08 +02:00
TokyoSU
9d6a3b20d1
Fix weapon not being updated when crouching
...
- caused by me in the first place, but i forgot this small detail :x
- Updated lara structure a bit for enum variables.
- Fixed some variable not using these enum (or using the wrong one !)
2020-06-05 14:01:22 +02:00
TokyoSU
ae6ea3581a
Fixing Entity Include (Part 1)
...
- Less Compile Time...
2020-05-27 13:01:32 +02:00
