Troye
552352dd21
W1
2021-09-25 16:03:28 -05:00
Lwmte
cefc60c7ea
Move around some files
2021-09-19 23:41:26 +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
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
2ee57e5891
Renamed "generalPtr" of LaraInfo to "interactedItem"
...
All code that cast it to ITEM_INFO* was converted to a separate access into g_Level.Items
2021-09-05 11:20:51 +02: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
f7080f56c9
Integrated ITEM_DATA into ITEM_INFO
...
TODO: See what happens with ENEMY_JEEP
2021-08-29 16:11:03 +02:00
Raildex
be16255efc
Merge branch 'master' into item_data
...
# Conflicts:
# TR5Main/Objects/TR4/Entity/tr4_sas.cpp
# TR5Main/Objects/TR4/tr4_objects.cpp
2021-08-29 13:29:55 +02:00
Raildex
c6fcf8b248
Renamed creature.h to creature_info.h
2021-08-29 10:04:49 +02:00
Lwmte
0b7c3d4a20
Merge branch 'master' into legacy_trigger_refactor
2021-08-28 21:38:58 +03:00
MontyTRC89
2b0624b166
Fixed ID_SAS_DRAG_BLOKE; Added namespaces to SAS functions;
2021-08-28 19:12:19 +02:00
Raildex
2621fa8f0d
Fixed More Include Hell
2021-08-28 13:27:58 +02:00
Raildex
dabbeb88db
Fixed Include Hell for Creature Info
2021-08-28 12:16:03 +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
7d9c21f18b
Fixed SAS flashing himself
2021-04-22 08:13:54 +02:00
MontyTRC89
06ca306645
More fixes to SAS
2021-04-22 05:58:40 +02:00
MontyTRC89
9cfb3bf166
Fixing SAS
2021-04-21 13:54:12 +02:00
asasas9500
7218086a0f
Fix phd_sin() and phd_cos()
2020-10-05 22:24:57 -03:00
MontyTRC89
d235b53094
Decompiled ID_SAS_DRAG_BLOKE and ID_SAS_DYING;
2020-08-06 20:41:07 +02:00
MontyTRC89
83bba01a99
Moving all globals of level under LEVEL struct; Fixed severe performance issue;
2020-07-21 09:56:47 +02:00
TokyoSU
963706c3af
Partially finished Entity Folder Refactoring
...
- Less Compile Time
- ObjectInfo now use std::function.
- added isPickup and isPuzzleHole in ObjectInfo.
- Renamed EVIL_LARA to LARA_DOPPELGANGER (DOPPELGANGER in xml)
- Removed TR1 Larson/Pierre and TR1 Raptor.
2020-05-27 19:07:34 +02:00
Joey Quint
8b7b433590
Merge branch 'master' of https://github.com/MontyTRC89/TR5Main
2020-05-27 13:26:38 +02:00
TokyoSU
29f0724693
New project format ( #206 )
...
* Starting Reformat the project
- New Import Method, no more "../../" in import,
- New Entity Folder Structure, less compile time
* Refactoring the Project
- added precompiled header with default import like microsoft or directx.
- fix many double import.
- fix math.h confliting math.h from
microsoft.
- fix effects.h confliting Effects.h from DirectX.
- refactored TR4 entity folder and how it's loaded.
* Update Some Code Before Switching to Master
* Finished the NewProjectFormat Template
- need to finish entity in the master later.
* Added Monty NewFileFormat
* Fixed Monty NewFileFormat Include
* Revert "Fixed Monty NewFileFormat Include"
This reverts commit ebf0afca10
2020-05-27 09:21:20 +02:00
