Commit graph

70 commits

Author SHA1 Message Date
Lwmte
42bb372f63 Remove unused globals and move others from control.cpp to needed source files 2021-09-15 21:09:09 +03:00
Lwmte
cfe0c38522 Move flipmap stuff out of control.cpp 2021-09-15 17:40:00 +03:00
Lwmte
27b22964bd Implement basic flash, fix func names 2021-09-15 14:24:03 +03:00
Lwmte
a18a385f53 Move FlashFader to environment controller 2021-09-15 12:58:07 +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
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
MontyTRC
94e002baa7
Merge pull request #322 from MontyTRC89/generalPtr
Renamed "generalPtr" of LaraInfo to "interactedItem"
2021-09-08 16:43:33 +02:00
MontyTRC
0e529ecba0
Merge branch 'master' into bitshifts_2 2021-09-08 16:20:28 +02:00
Nils
a1c19a4b75 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
cccd7a048b Clarify function names
# Conflicts:
#	TR5Main/Game/collide.cpp
2021-09-02 19:49:07 +02:00
Troye
6aabe62297 revert to bitshits in Game folder; handle lack of inv objects; 2021-08-30 15:13:18 -05:00
Lwmte
e879038220 Fix namespace case 2021-08-30 18:03:21 +03: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
Lwmte
7cfe471c26 Cleanup a bit more 2021-08-26 19:55:34 +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
MontyTRC89
109b7d6e18 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
07dcf6da5b Fix #273 2021-08-02 19:42:07 +03:00
Nils
48f18a54b0 Putting Light of Lara's burning to Lara's hips 2021-08-02 16:12:15 +02:00
Lwmte
8d717c86ad Fix Lara fire 2021-08-02 15:40:51 +03:00
MontyTRC89
dfa4740519 Merge conflicts 2021-06-19 07:14:38 +02:00
MontyTRC89
1bb5965157 Moving to stringed keys for game strings 2021-06-19 07:11:22 +02:00
wolfcheese
d878cd1c9e Added bridge collision to FALLING_BLOCK 2021-06-16 10:19:46 -04:00
MontyTRC89
6b5a932ff8 Remapped correctly sounds from TR5 to TR4; Decompiled TR4 CogSwitchControl; Decompiled TR4 ControlWaterfall; 2021-05-26 06:04:32 +02:00
asasas9500
f3e436bdad Improve FindItem() 2021-02-07 17:12:41 -03:00
asasas9500
4521994088 Remove function markers 2021-02-03 01:50:59 -03:00
Trxye
50f42daae4 remove kayak hack 2021-01-17 14:46:08 -06:00
KrysB4k
8f6b428942 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
1eac30a7ce remove bitshifts 2020-10-16 12:06:33 -05:00
asasas9500
6fc9bd9890 Fix phd_sin() and phd_cos() 2020-10-05 22:24:57 -03:00
asasas9500
54f6db166b Remove rcossin_tbl; Remove duplicated TriggerAlertLight() 2020-09-30 12:37:06 -03:00
asasas9500
7605313df1 Move trapdoor to generic objects folder 2020-09-29 09:53:36 -03:00
Woops
f3de61c983 add hack for kayak 2020-09-18 14:00:32 -05:00
Sebastian Zych
6a3700345e Updated animation and state names to follow a consistent system. 2020-08-04 20:32:07 +10:00
Montagna Marco
014aa1baa7 Frames refactoring 2020-07-25 18:02:35 +02: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
9f373c691a Pathfinding refactoring 2020-07-11 21:16:04 +02:00
Woops
1d3f97b9ce flycheat removes fire from Lara 2020-07-06 15:37:08 -05:00
Nils Gaitzsch
3781370e06 Putting Renderer into namespace
made g_Renderer a global object
2020-06-21 14:27:12 +02:00
TokyoSU
8f11417654 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
df5baee997 Fixed Repo, Fixed Savegame Struct Missing 2020-05-30 17:58:09 +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
9c1c4517d7
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.

* Trying to fix conflits for NewFileFormat

* Fixed .filters

* Last Commit in NewProjectFormat
2020-05-27 09:21:20 +02:00
Montagna Marco
46f2db3481 Merged LARA_INFO and LaraExtraInfo into LaraInfo 2020-04-27 14:01:00 +02:00
Montagna Marco
20bd242052 Started math refactoring 2020-04-25 16:23:53 +02:00
Montagna Marco
85e462f6a2 First EXE build successfully 2020-04-24 19:15:05 +02:00
Montagna Marco
4cc46789e9 Decompiled input 2020-04-23 19:22:01 +02:00
Montagna Marco
9f05715977 Decompiled level loading functions; Moved lot of vars in DLL; Added Zlib; 2020-04-22 14:12:10 +02:00