Lwmte
|
e509290192
|
Merge branch 'master' into coll_info_reorganize
|
2021-09-10 10:11:15 +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
|
cccd7a048b
|
Clarify function names
# Conflicts:
# TR5Main/Game/collide.cpp
|
2021-09-02 19:49:07 +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 |
|
Nils
|
e0787f1051
|
Removed unnecessary constructor of ITEM_DATA
Removed Debugging leftovers
|
2021-08-30 17:50:11 +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
|
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
|
c0cb6ae37c
|
Organize COLL_INFO
|
2021-08-25 06:54:17 +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 |
|
MontyTRC89
|
c1bfae6bf9
|
Refactored cameras, sinks and sound sources; Added sound sources playback;
|
2021-07-10 06:55:37 +02:00 |
|
Trxye
|
1787898437
|
Remove TR3 comments
|
2021-03-24 12:49:36 -05:00 |
|
asasas9500
|
2df3f39d4c
|
Merge branch 'master' into NewTRMath
|
2020-11-04 11:51:17 -03:00 |
|
Woops
|
13341879ad
|
cleanup UPV code, defines
|
2020-10-30 00:00:41 -05:00 |
|
Woops
|
b97bacf4b7
|
fix UPV surface bug
|
2020-10-28 18:03:48 -05:00 |
|
Woops
|
8fab57c4ec
|
restore upv bump, fix upv and kayak positions
|
2020-10-26 13:04:58 -05:00 |
|
Woops
|
ed8dd5579f
|
Fix the UPV glitch one and for all
|
2020-10-19 15:06:51 -05:00 |
|
asasas9500
|
4606725a19
|
Merge branch 'master' into NewTRMath
|
2020-10-14 22:22:10 -03: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 |
|
Woops
|
77a2445fbc
|
fix UPV shooting
|
2020-10-01 14:52:03 -05:00 |
|
Woops
|
53a6ac7cb8
|
lovely UPV jitter workaround
|
2020-09-30 22:00:54 -05:00 |
|
Woops
|
58ec692255
|
upv: make fan rotate + light
|
2020-09-30 14:45:46 -05:00 |
|
Woops
|
f3a6a5a23d
|
hotfix but I still hate this
|
2020-09-30 14:13:36 -05:00 |
|
asasas9500
|
54f6db166b
|
Remove rcossin_tbl; Remove duplicated TriggerAlertLight()
|
2020-09-30 12:37:06 -03:00 |
|
Woops
|
a14a640b49
|
more UPV fixes/cleanups
|
2020-09-28 15:21:19 -05:00 |
|
Woops
|
2c8e87ec3e
|
partially fix UPV
|
2020-09-27 23:29:25 -05: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 |
|
Montagna Marco
|
133c971aaf
|
Merge branch 'master' of https://github.com/MontyTRC89/TR5Main
|
2020-07-11 21:29:49 +02:00 |
|
Montagna Marco
|
9f373c691a
|
Pathfinding refactoring
|
2020-07-11 21:16:04 +02:00 |
|
Nils Gaitzsch
|
da0eaeac0e
|
Made Game_Malloc a template with a count parameter
|
2020-07-05 22:19:06 +02:00 |
|
TokyoSU
|
ee59d27517
|
(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
|
ae6ea3581a
|
Fixing Entity Include (Part 1)
- Less Compile Time...
|
2020-05-27 13:01:32 +02:00 |
|