Lwmte
280c9fa28b
Merge branch 'master' into coll_info_reorganize
2021-09-10 10:11:15 +03:00
Lwmte
1df38ae15a
Rename settings to setup
2021-09-10 00:20:59 +03:00
Lwmte
1efe0a9f09
Reorganize COLL_INFO
2021-09-10 00:18:47 +03:00
Lwmte
48a9a1d52a
Merge branch 'master' into item_data
2021-09-09 11:10:25 +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
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
Raildex
2621fa8f0d
Fixed More Include Hell
2021-08-28 13:27:58 +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
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
1effeed738
Refactored cameras, sinks and sound sources; Added sound sources playback;
2021-07-10 06:55:37 +02:00
Trxye
a6462075a3
Remove TR3 comments
2021-03-24 12:49:36 -05:00
asasas9500
f9432ce420
Merge branch 'master' into NewTRMath
2020-11-04 11:51:17 -03:00
Woops
bf7211aa94
fix kayak get on from the right
2020-10-27 22:23:33 -05:00
Woops
ea291e702b
restore upv bump, fix upv and kayak positions
2020-10-26 13:04:58 -05:00
Woops
17e9ce886a
removing more bitshifts
2020-10-17 13:23:01 -05:00
asasas9500
2a7ed3e61f
Merge branch 'master' into NewTRMath
2020-10-14 22:22:10 -03:00
asasas9500
185471eab8
Remove W2V_SHIFT, W2V_SCALE, WALL_SHIFT and NODE_SHIFT
2020-10-14 20:53: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
b30d7ae46e
Fix kayak movement
2020-10-03 13:13:13 -05:00
asasas9500
9f415aa291
Remove rcossin_tbl; Remove duplicated TriggerAlertLight()
2020-09-30 12:37:06 -03:00
Raildex
85b4a2ff1c
Added parameter to SetupRIpple to specifiy sprite
2020-09-21 15:20:59 +02:00
Woops
f914c4cb7a
add hack for kayak
2020-09-18 14:00:32 -05:00
MontyTRC89
9216fab654
Fixed ID_KAYAK
2020-09-16 06:49:58 +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
MontyTRC89
36fe66d617
Hairs done on GPU now
2020-07-07 07:32:33 +02:00
Raildex
5ef674b577
Made Game_Malloc a template with a count parameter
2020-07-05 22:19:06 +02:00
MontyTRC89
7ff7397fa7
New level format: meshes
2020-07-03 07:05:33 +02:00
MontyTRC89
5b8c90b688
Merge branch 'master' of https://github.com/MontyTRC89/TR5Main
2020-06-26 07:06:51 +02:00
MontyTRC89
d8bf82eab1
New FLOOR_INFO struct; Refactoring rooms part I
2020-06-26 07:06:18 +02:00
Raildex
b635f4df13
Fixed std namespace collisions
...
Refactored ChunkID/ChunkReader/Writer
2020-06-20 23:39:08 +02:00
TokyoSU
2c6a1a7480
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
b615a98c46
(Broken) Deleted Global Folder
...
- No more enums.h, constants.h, macro.h, etc...
- moved all structure in types.h to there respective file.
2020-05-30 15:55:23 +02:00
TokyoSU
39050f69ea
Fixing Entity Include (Part 1)
...
- Less Compile Time...
2020-05-27 13:01:32 +02:00
