Commit graph

93 commits

Author SHA1 Message Date
Nils Gaitzsch
cb96f011f9 Displaying Commit Message on Title 2020-08-18 20:26:47 +02:00
Nils Gaitzsch
a752f49d57 Using Smart Pointers 2020-08-09 22:15:32 +02:00
Nils Gaitzsch
11b2e2cd61 Refactored functions 2020-08-09 15:25:56 +02:00
Nils Gaitzsch
0b9f209270 Merge branch 'master' into renderdatarefactor
# Conflicts:
#	TR5Main/Renderer/Renderer11.h
#	TR5Main/TR5Main.vcxproj.filters
2020-08-09 14:34:58 +02:00
Montagna Marco
b4714163fc Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-08-06 06:51:57 +02:00
Montagna Marco
fb20a04f3c Decompiled ID_LEETLE_BEETLES 2020-08-06 06:51:32 +02:00
Sebastian Zych
2eeef3bdc0 Added option to smoothly transition health bar display. 2020-08-04 20:51:47 +10:00
Montagna Marco
325b5841d0 Decompiled wraiths; Added outside rooms table; 2020-08-02 19:39:55 +02:00
Nils Gaitzsch
a587b08792 Merge branch 'master' into renderdatarefactor
# Conflicts:
#	TR5Main/Renderer/Renderer11Draw.cpp
2020-07-26 08:58:44 +02:00
Nils Gaitzsch
26c0cc0cff Refactored Shadow Mapping with Comparision State 2020-07-25 21:03:02 +02:00
Montagna Marco
014aa1baa7 Frames refactoring 2020-07-25 18:02:35 +02:00
Montagna Marco
96ab36731f Fixed meshes in wrong places 2020-07-24 07:03:36 +02:00
Nils Gaitzsch
d5aff8914b Refactored Constant Buffers 2020-07-23 21:40:07 +02:00
Montagna Marco
bba838cfd3 Fixed pickups; Fixed no statics bug; 2020-07-23 21:38:12 +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
Nils Gaitzsch
31995742ef Normal Mapping first test 2020-07-18 14:53:26 +02:00
Montagna Marco
44a79bba1f Fixed rats, bats, spiders; Added debug infos; 2020-07-08 05:56:50 +02:00
Montagna Marco
2a1c491c7e Hairs done on GPU now 2020-07-07 07:32:33 +02:00
Montagna Marco
e88d24347b Refactored again room and eshes geometry loading 2020-07-05 06:20:36 +02:00
Nils Gaitzsch
822ec19f08 Merge branch 'master' into renderdatarefactor
# Conflicts:
#	TR5Main/Renderer/Render11Helper.cpp
#	TR5Main/Renderer/Renderer11Compatibility.cpp
#	TR5Main/Renderer/Renderer11Draw.cpp
#	TR5Main/Renderer/Renderer11Frame.cpp
#	TR5Main/Renderer/Renderer11Lara.cpp
2020-07-03 10:09:13 +02:00
Montagna Marco
439db540e3 New level format: meshes 2020-07-03 07:05:33 +02:00
Nils Gaitzsch
d6f4239dae Refactored Updating Constant Buffers
Half Lambertian Lighting
2020-07-01 21:13:07 +02:00
Nils Gaitzsch
455a643fe8 Fixed Cubemap 2020-07-01 16:49:53 +02:00
Nils Gaitzsch
15e4dc712b Semi-working cubemapping.
improved camera functions
2020-07-01 08:46:07 +02:00
Nils Gaitzsch
af92efdcb0 Refactored Rendering. You can now render scene to an arbitrary render target 2020-06-30 10:25:41 +02:00
Nils Gaitzsch
932bb84ff4 Merge branch 'master' into renderdatarefactor
# Conflicts:
#	TR5Main/Renderer/Render11Helper.cpp
#	TR5Main/Renderer/Renderer11Compatibility.cpp
2020-06-29 15:02:18 +02:00
Montagna Marco
e0aaae0a3e Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-06-29 13:29:45 +02:00
Montagna Marco
8da773758f New file format: rooms geometry 2020-06-28 15:51:33 +02:00
Nils Gaitzsch
723b2a9361 Changed m_moveableObjects and m_staticObjects to vector<optional> 2020-06-28 11:12:52 +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
Montagna Marco
d6f45db5ec Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-06-26 07:06:51 +02:00
Montagna Marco
235dab2f13 New FLOOR_INFO struct; Refactoring rooms part I 2020-06-26 07:06:18 +02:00
Nils Gaitzsch
5dbea44c7a Moved Files 2020-06-21 20:57:35 +02:00
Nils Gaitzsch
3781370e06 Putting Renderer into namespace
made g_Renderer a global object
2020-06-21 14:27:12 +02:00
Nils Gaitzsch
08f3910e4d RAII texture2D 2020-06-21 11:51:46 +02:00
Nils Gaitzsch
c860919616 Fixed std namespace collisions
Refactored ChunkID/ChunkReader/Writer
2020-06-20 23:39:08 +02:00
Montagna Marco
1cddd102d0 New level format: textures and sprites 2020-06-20 21:20:36 +02:00
Nils Gaitzsch
d5dc365c06 Made g_Inventory a constant object.
Fixed shadow intensity
Fixed CameraViewConstantBuffer
2020-06-16 19:45:06 +02:00
Nils Gaitzsch
0de21e0b9a Added Splash Drips 2020-06-16 19:13:41 +02:00
Nils Gaitzsch
9f682a0078 Refactored RenderTarget2D 2020-06-16 17:40:32 +02:00
Nils Gaitzsch
a82a338795 Refactored Index/Vertex Buffer
Now uses ComPtr
2020-06-16 15:11:30 +02:00
Nils Gaitzsch
7b5731b704 Added Explosion Sprites and Drips 2020-06-15 19:59:08 +02:00
Nils Gaitzsch
315181220a Added new SparkParticle 2020-06-15 16:36:52 +02:00
Gancian
175f0e40d1 Updated Smoke, Flares 2020-06-15 15:57:40 +02:00
Nils Gaitzsch
859af2a0da Added Water Vertex Refraction 2020-06-15 14:39:10 +02:00
asasas9500
1732048a00
Scripting (#211)
* Create template for variables; Rename properties; Improve console input

* Improve console input again
2020-06-09 09:16:51 +02:00
TokyoSU
9045a2206d 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
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
9149dc3596 Fixed climb and monkey 2020-05-02 07:07:41 +02:00
Montagna Marco
8ca2bf97a4 Fixed screen fade 2020-05-01 06:41:45 +02:00