Commit graph

88 commits

Author SHA1 Message Date
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
60e81f29d8
Merge pull request #328 from MontyTRC89/new_objects_collision
Solid statics collision
2021-09-08 16:44:01 +02:00
Lwmte
e8f6c1fd54 Replace all magic numbers with mesh flags 2021-09-08 15:01:19 +03: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
d6a5e7b8c6 Merge branch 'master' into legacy_trigger_refactor 2021-08-26 19:49:09 +03:00
Lwmte
02d78da776 Cleanup sound code 2021-08-26 19:47:59 +03:00
Lwmte
dd3b6fa4e5 Move collision and FX functions from effect.cpp 2021-08-26 15:54:52 +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
5802745c1c Fix some lasersight issues 2021-08-11 15:18:22 +03:00
MontyTRC89
c1bfae6bf9 Refactored cameras, sinks and sound sources; Added sound sources playback; 2021-07-10 06:55:37 +02:00
MontyTRC89
6b5a932ff8 Remapped correctly sounds from TR5 to TR4; Decompiled TR4 CogSwitchControl; Decompiled TR4 ControlWaterfall; 2021-05-26 06:04:32 +02:00
Nils
218931ea13 Fixing Ammo 2021-01-26 10:28:08 +01:00
Nils
3f8b15a927 Ammo struct to better represent Ammo 2021-01-25 13:58:23 +01:00
asasas9500
d4c6cc4a97 Fix line endings 2020-12-21 13:16:29 -03:00
Woops
c812665152 remove bitshifts from the "Game" folder 2020-10-06 12:44:14 -05:00
asasas9500
6fc9bd9890 Fix phd_sin() and phd_cos() 2020-10-05 22:24:57 -03:00
Montagna Marco
31c7019e3f Improved vehicles; Fixed bugs in ID_SPEEDBOAT; 2020-09-12 07:52:47 +02:00
asasas9500
e2b5977307 Fix compile and revert camera hack 2020-08-29 22:20:52 -03:00
asasas9500
50ba19525d Finish merge 2020-08-25 19:39:50 -03:00
asasas9500
b9bc1cf54e Rename Lara files 2020-08-09 22:09:14 -03:00
Woops
98dbafdd34 Lara refactor: Move functions around, clean up Lara.h 2020-08-09 00:54:57 -05:00
asasas9500
c07530f8f9 Fix camera matrices 2020-08-07 22:25:39 -03:00
asasas9500
671d59e1c8 Merge branch 'DiagonalCollisions' into NoShifts 2020-08-07 16:43:29 -03:00
Woops
622d86c6a2 clean up remove comments 2020-08-06 03:34:49 -05: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
Montagna Marco
2a1c491c7e Hairs done on GPU now 2020-07-07 07:32:33 +02:00
Nils Gaitzsch
15e4dc712b Semi-working cubemapping.
improved camera functions
2020-07-01 08:46:07 +02:00
Nils Gaitzsch
bce320d1b8 Merge branch 'master' into renderdatarefactor
# Conflicts:
#	TR5Main/Renderer/Render11Helper.cpp
#	TR5Main/Renderer/Renderer11.h
#	TR5Main/Renderer/Renderer11Compatibility.cpp
#	TR5Main/Renderer/Renderer11Draw.cpp
2020-06-27 19:48:50 +02:00
asasas9500
f34069e534 Merge branch 'DiagonalCollisions' into NoShifts 2020-06-26 11:14:16 -03:00
Montagna Marco
235dab2f13 New FLOOR_INFO struct; Refactoring rooms part I 2020-06-26 07:06:18 +02:00
Nils Gaitzsch
3781370e06 Putting Renderer into namespace
made g_Renderer a global object
2020-06-21 14:27:12 +02:00
asasas9500
189302e8c0 Improve hack 2020-06-11 23:03:05 -03:00
TokyoSU
11b3751851 Finished Moving Function
- Moved Some Function to here respective file (new cpp/h).
- Changed effect_routines to function<void(ITEM_INFO*)>.
- Fixed ActivateCamera() not using ITEM_INFO* Argument for effect_routines[].
- Fixed ActivateKey() not using ITEM_INFO* Argument for effect_routines[].
- Fixed ActivateKey() and ActivateCamera() being defined 2 time.
- Commented the new level loader, for later.
2020-06-04 11:00:08 +02:00
TokyoSU
df5baee997 Fixed Repo, Fixed Savegame Struct Missing 2020-05-30 17:58:09 +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
3cf3b1d2dc Fixed look camera; Fixed bugs with gunflashes and smoke positions; 2020-04-29 06:43:53 +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
Montagna Marco
32bafa9893 PHD Math removal 1 2020-04-20 14:17:01 +02:00
Montagna Marco
0b59d298e4 Hair refactoring test 2020-04-20 07:14:54 +02:00
Montagna Marco
6ec5f2c97b Fixed last commit; Rewritten phd_RotBoundingBoxNoPersp(); 2020-04-17 07:00:47 +02:00
Nils Gaitzsch
ddbbeca968 Merge branch 'RenderOptimize' 2020-04-13 16:00:49 +02:00