Commit graph

296 commits

Author SHA1 Message Date
MontyTRC89
7ff7397fa7 New level format: meshes 2020-07-03 07:05:33 +02:00
Raildex
3cd6100562 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
f334369175 Merge branch 'DiagonalCollisions' into NoShifts 2020-06-26 11:14:16 -03:00
asasas9500
eda2325004 Merge branch 'master' into DiagonalCollisions 2020-06-26 11:13:13 -03:00
MontyTRC89
5b8c90b688 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-06-26 07:06:51 +02:00
MontyTRC89
d8bf82eab1 New FLOOR_INFO struct; Refactoring rooms part I 2020-06-26 07:06:18 +02:00
asasas9500
a9dfdec427 Merge branch 'DiagonalCollisions' into NoShifts 2020-06-21 14:09:31 -03:00
KrysB4k
62707a7296 Merge branch 'master' into DiagonalCollisions 2020-06-21 14:33:31 +02:00
Raildex
e5ead31064 Putting Renderer into namespace
made g_Renderer a global object
2020-06-21 14:27:12 +02:00
Raildex
b635f4df13 Fixed std namespace collisions
Refactored ChunkID/ChunkReader/Writer
2020-06-20 23:39:08 +02:00
Raildex
d2d6e5f30c Made g_Inventory a constant object.
Fixed shadow intensity
Fixed CameraViewConstantBuffer
2020-06-16 19:45:06 +02:00
Raildex
00b3d32468 Added Splash Drips 2020-06-16 19:13:41 +02:00
Raildex
7e14b0843e Added Explosion Sprites and Drips 2020-06-15 19:59:08 +02:00
Raildex
538e015950 Added new SparkParticle 2020-06-15 16:36:52 +02:00
Raildex
8e06949b8a Added new TriggerGunSmokeParticle Function 2020-06-15 16:10:09 +02:00
Gancian
fcae4db754 Updated Smoke, Flares 2020-06-15 15:57:40 +02:00
asasas9500
b89a2fd778 Improve hack 2020-06-11 23:03:05 -03:00
asasas9500
e6c6e83b01 Hack for frame advance, frame stop and slow motion 2020-06-11 16:25:19 -03:00
TokyoSU
2b2a58d44c Implemented Mutant and Locusts
- Added ItemNearTarget().
2020-06-10 21:38:25 +02:00
asasas9500
d69c93bf58 Merge branch 'master' into DiagonalCollisions 2020-06-09 16:58:23 -03:00
asasas9500
b58fc1473e Scripting (#211)
* Create template for variables; Rename properties; Improve console input

* Improve console input again
2020-06-09 09:16:51 +02:00
asasas9500
35fe5cd78f Merge branch 'master' into NoShifts 2020-06-06 18:37:21 -03:00
asasas9500
c49c98d21b 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
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
0ccf99dcd4 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
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
Krys
e46a000190 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
cd1d5f5482 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
963706c3af 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
29f0724693 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
6d4cfeef98 Fixed and Implemented TonyBoss 2020-05-14 18:39:17 +02:00
MontyTRC89
22ccaa2c5a Merge branch 'master' into scripting 2020-04-30 21:52:16 +02:00
asasas9500
4dc0169461 Improve Lua scripting 2020-04-28 12:24:10 -03:00
MontyTRC89
fdc3ff9996 Refactored OBJET_INFO to ObjectInfo 2020-04-27 15:28:54 +02:00
MontyTRC89
5f63d6acba Merged LARA_INFO and LaraExtraInfo into LaraInfo 2020-04-27 14:01:00 +02:00
MontyTRC89
b8f26976a7 Added missing changes from last commit; Fixed WndProc for exiting game when window is closed; 2020-04-27 06:38:50 +02:00
MontyTRC89
ea3db8638f Partially fixed spheres; Fixed swap meshes; partially fixed Lara firing; 2020-04-26 10:55:33 +02:00
MontyTRC89
6b819c2855 Started math refactoring 2020-04-25 16:23:53 +02:00
MontyTRC89
f3bb956927 First EXE build successfully 2020-04-24 19:15:05 +02:00
MontyTRC89
6bff6caed2 Decompiled input 2020-04-23 19:22:01 +02:00
MontyTRC89
9a78144600 Decompiled level loading functions; Moved lot of vars in DLL; Added Zlib; 2020-04-22 14:12:10 +02:00
MontyTRC89
f0925359fe Hair refactoring test 2020-04-20 07:14:54 +02:00
MontyTRC89
c452a8de6b Rewritten DoRayBox() 2020-04-17 06:28:53 +02:00
MontyTRC89
cc4691dd8b Decompiled math functions 4; Code cleaning; Decompiled many functions; 2020-04-15 18:30:34 +02:00
MontyTRC89
1a26660639 Decompiling math functions 2 2020-04-14 16:36:37 +02:00
MontyTRC89
b496c3caba Decompiled UpdateStorm(); Code cleaning; 2020-04-14 06:11:10 +02:00
MontyTRC89
0f5589c72f Refactored some code in TestTriggers; Fixed CROWDOVE_SWITCH; 2020-04-07 19:20:32 +02:00
Raildex
3dd976a8b8 Added Radius-like shatter 2020-04-05 17:36:24 +02:00
MontyTRC89
78293ce999 Fixed GUARDIAN death; Added X angle to shockwaves; Reset Use/combine selected index after combine or separe; Code cleaning; 2020-04-05 08:15:56 +02:00