Commit graph

247 commits

Author SHA1 Message Date
Montagna Marco
2a1c491c7e Hairs done on GPU now 2020-07-07 07:32:33 +02:00
Montagna Marco
439db540e3 New level format: meshes 2020-07-03 07:05:33 +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
asasas9500
9ee265a0ba Merge branch 'master' into DiagonalCollisions 2020-06-26 11:13:13 -03: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
asasas9500
b53eb41bbb Merge branch 'DiagonalCollisions' into NoShifts 2020-06-21 14:09:31 -03:00
KrysB4k
cd417799f3 Merge branch 'master' into DiagonalCollisions 2020-06-21 14:33:31 +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
c860919616 Fixed std namespace collisions
Refactored ChunkID/ChunkReader/Writer
2020-06-20 23:39:08 +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
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
Nils Gaitzsch
25f383e42c Added new TriggerGunSmokeParticle Function 2020-06-15 16:10:09 +02:00
Gancian
175f0e40d1 Updated Smoke, Flares 2020-06-15 15:57:40 +02:00
asasas9500
189302e8c0 Improve hack 2020-06-11 23:03:05 -03:00
asasas9500
b56ff11743 Hack for frame advance, frame stop and slow motion 2020-06-11 16:25:19 -03:00
TokyoSU
3699a78e34 Implemented Mutant and Locusts
- Added ItemNearTarget().
2020-06-10 21:38:25 +02:00
asasas9500
ea7e5fcfc0 Merge branch 'master' into DiagonalCollisions 2020-06-09 16:58:23 -03: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
asasas9500
89a7801212 Merge branch 'master' into NoShifts 2020-06-06 18:37:21 -03:00
asasas9500
8dfe41f8d1 Move COLL_TYPE, HEIGHT_TYPES and HEADINGS to collide.h; Create OCTANTS, SnapToQuadrant(), GetQuadrant(), SnapToDiagonal() and GetOctant() 2020-06-06 15:48:38 -03: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
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
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
Krys
dbac993499 First tests for diagonal collision
This branch tests the diagonal collisions. So far only the running splat, walking splat and vaults work with diagonal collision. Jumping splat, getting out of water still needs some work
2020-05-28 20:59:46 +02:00
TokyoSU
2c5a621cb3 Refactor include and moving some structure to right file
- started moving structure out of types.h.
- fixed ExtraAnim using 0 instead of -1.
- changed void(*)(); to function<> for lara routines.
- changed short(*)() effect to function<> for CreatureEffect/CreatureEffect2.
- renamed guardian to laserhead.
- moved some structure to their right place.
- renamed TYPE_ZONE to ZoneTypeEnum.
- fixed zoneType not using ZoneTypeEnum as variable.
- fixed LOT.zone not using ZoneEnumType.
- changed "variable : 1" to bool in some structure.
- implemented @krys new collision structure and improved it a bit (but commented for "later")
- level need #pragma pack(push, 1) #pragma pack(pop) to work (for structure), else it crash at LoadTexturesInfos().

Co-Authored-By: krys <krys@users.noreply.github.com>
2020-05-28 15:17:34 +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
TokyoSU
d66e608c74 Fixed and Implemented TonyBoss 2020-05-14 18:39:17 +02:00
MontyTRC
6b16828381
Merge branch 'master' into scripting 2020-04-30 21:52:16 +02:00
asasas9500
960110196e Improve Lua scripting 2020-04-28 12:24:10 -03:00
Montagna Marco
dc07c30969 Refactored OBJET_INFO to ObjectInfo 2020-04-27 15:28:54 +02:00
Montagna Marco
46f2db3481 Merged LARA_INFO and LaraExtraInfo into LaraInfo 2020-04-27 14:01:00 +02:00
Montagna Marco
2f306993a8 Added missing changes from last commit; Fixed WndProc for exiting game when window is closed; 2020-04-27 06:38:50 +02:00
Montagna Marco
8a02a323b1 Partially fixed spheres; Fixed swap meshes; partially fixed Lara firing; 2020-04-26 10:55:33 +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
0b59d298e4 Hair refactoring test 2020-04-20 07:14:54 +02:00
Montagna Marco
08d97768c4 Rewritten DoRayBox() 2020-04-17 06:28:53 +02:00
Montagna Marco
8cd437a81b Decompiled math functions 4; Code cleaning; Decompiled many functions; 2020-04-15 18:30:34 +02:00
Montagna Marco
5bfcbc2786 Decompiling math functions 2 2020-04-14 16:36:37 +02:00
Montagna Marco
4246d8ae46 Decompiled UpdateStorm(); Code cleaning; 2020-04-14 06:11:10 +02:00
Montagna Marco
afa786ba78 Refactored some code in TestTriggers; Fixed CROWDOVE_SWITCH; 2020-04-07 19:20:32 +02:00
Nils Gaitzsch
bc86d6b131 Added Radius-like shatter 2020-04-05 17:36:24 +02:00