Commit graph

76 commits

Author SHA1 Message Date
Lwmte
1c20cefd4e Fix merge and small things 2021-09-24 13:58:56 +03:00
MontyTRC89
4b0d76ed95 Refactored flame emitters, Lara burn and lightning bolts; 2021-09-22 05:51:25 +02: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
d8aa65260f Make Lara targetable again 2021-09-16 03:56:04 +03:00
Lwmte
0f70ad4082 Fix LaraFire 2021-09-16 03:25:04 +03:00
Lwmte
68923228dd Remove unused globals and move others from control.cpp to needed source files 2021-09-15 21:09:09 +03:00
Lwmte
2e62725933 Move flipmap stuff out of control.cpp 2021-09-15 17:40:00 +03:00
Lwmte
1284d34f68 Implement basic flash, fix func names 2021-09-15 14:24:03 +03:00
Lwmte
26cd489da6 Move FlashFader to environment controller 2021-09-15 12:58:07 +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
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
MontyTRC89
713b52b616 Merge pull request #322 from MontyTRC89/generalPtr
Renamed "generalPtr" of LaraInfo to "interactedItem"
2021-09-08 16:43:33 +02:00
MontyTRC89
e06a79ffc9 Merge branch 'master' into bitshifts_2 2021-09-08 16:20:28 +02: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
Lwmte
522b41d1d6 Clarify function names
# Conflicts:
#	TR5Main/Game/collide.cpp
2021-09-02 19:49:07 +02:00
Troye
84cc6d9c7f revert to bitshits in Game folder; handle lack of inv objects; 2021-08-30 15:13:18 -05: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
Lwmte
7d4fde9942 Cleanup a bit more 2021-08-26 19:55:34 +03: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
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
Lwmte
83b1ed8bf0 Fix #273 2021-08-02 19:42:07 +03:00
Raildex
6856543d0f Putting Light of Lara's burning to Lara's hips 2021-08-02 16:12:15 +02:00
Lwmte
7683cacb3f Fix Lara fire 2021-08-02 15:40:51 +03:00
MontyTRC89
a6b3916d72 Merge conflicts 2021-06-19 07:14:38 +02:00
MontyTRC89
a4467c2a4b Moving to stringed keys for game strings 2021-06-19 07:11:22 +02:00
wolfcheese
26860575a2 Added bridge collision to FALLING_BLOCK 2021-06-16 10:19:46 -04:00
MontyTRC89
b2f102ae63 Remapped correctly sounds from TR5 to TR4; Decompiled TR4 CogSwitchControl; Decompiled TR4 ControlWaterfall; 2021-05-26 06:04:32 +02:00
asasas9500
ad446ad534 Improve FindItem() 2021-02-07 17:12:41 -03:00
asasas9500
700c1b5907 Remove function markers 2021-02-03 01:50:59 -03:00
Trxye
a016bb7f21 remove kayak hack 2021-01-17 14:46:08 -06:00
KrysB4k
735e73f1ea Removed duplicate function GetFloorAndTestTriggers, fix pushblock issues
GetFloorAndItemTriggers() was removed in favor of TestTriggersAtXYZ() from switch.cpp, which does the same. All calls to GetFloorAndItemTriggers were replaced with TestTriggersAtXYZ.

Pushables pulling bug was fixed in TestBlockPull(). PushableBlockControl() now calls ItemNewRoom() to signal change of room membership of pushable.
2020-12-19 23:02:55 +01:00
Woops
47fc1ecb13 remove bitshifts 2020-10-16 12:06:33 -05:00
asasas9500
7218086a0f Fix phd_sin() and phd_cos() 2020-10-05 22:24:57 -03:00
asasas9500
9f415aa291 Remove rcossin_tbl; Remove duplicated TriggerAlertLight() 2020-09-30 12:37:06 -03:00
asasas9500
fbb3cb6c9e Move trapdoor to generic objects folder 2020-09-29 09:53:36 -03:00
Woops
f914c4cb7a add hack for kayak 2020-09-18 14:00:32 -05:00
Sezz
5d4dc8ffdd Updated animation and state names to follow a consistent system. 2020-08-04 20:32:07 +10:00
MontyTRC89
689ec226e7 Frames refactoring 2020-07-25 18:02:35 +02:00
MontyTRC89
83bba01a99 Moving all globals of level under LEVEL struct; Fixed severe performance issue; 2020-07-21 09:56:47 +02:00
MontyTRC89
9867a6d24c Pathfinding refactoring 2020-07-11 21:16:04 +02:00
Woops
82a2b428ec flycheat removes fire from Lara 2020-07-06 15:37:08 -05:00
Raildex
e5ead31064 Putting Renderer into namespace
made g_Renderer a global object
2020-06-21 14:27:12 +02:00
TokyoSU
900235c967 Implemented Baboon
- Fixed AIObject not being initialized !
- Fixed ITEM_DEACTIVATED (cause im french and ITEM_DESACTIVATED is more appropriate)
2020-06-04 12:49:08 +02:00
TokyoSU
e355827ee5 Fixed Repo, Fixed Savegame Struct Missing 2020-05-30 17:58:09 +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