Commit graph

54 commits

Author SHA1 Message Date
MontyTRC89
465e5f2347 Added trigger volumes experimental 2021-07-05 16:33:50 +02:00
MontyTRC89
0fde464679 Fix merge conflicts 2021-03-27 07:38:51 +01:00
MontyTRC89
60c61ff4da New level loader code for anim textures 2021-03-27 07:33:40 +01:00
MontyTRC89
9183bb1760 Animated textures data in polygons 2021-03-12 21:33:02 +01:00
MontyTRC89
231b1f77aa Implemented new anim textures in file format 2021-03-10 18:45:12 +01:00
asasas9500
e943098d31 Fix boxes 2021-01-28 20:49:30 -03:00
asasas9500
6c39800d89 Fix no pathfinding 2021-01-17 20:29:37 -03:00
asasas9500
d0a930978f Implement new random system 2020-10-24 01:05:59 -03:00
Raildex
4173289d08 Added Static Mesh Tint Support 2020-10-07 09:08:23 +02:00
Raildex
ac61f71386 Refactored framework.h
Removed Renderer headers from framework.h
Removed bass headers from framework.h
Removed windows-related headers to avoid nameclashes with std::min and std::max
added <algorithm> for general-purpose functions (like std::min/max)
Added NOMINMAX define to project
Minor Refactorings
2020-09-29 21:43:56 +02:00
asasas9500
26a4b39b43 Fix bridges; Fix script IDs 2020-09-28 10:04:44 -03:00
asasas9500
4476d12b5c Fix first bugs in new floordata 2020-09-19 20:09:57 -03:00
asasas9500
dbdba8d2df New floordata prototype 2020-09-14 00:19:05 -03:00
MontyTRC89
b063da4c4b Fixed sounds 2020-09-08 19:50:19 +02:00
MontyTRC89
0aff21a128 Fixed enemy monkey; Added new zone for ID_VON_CROY; Small AI fixes; Added 3 blocks jump; 2020-09-01 07:06:31 +02:00
MontyTRC89
40bac4540c Restored Lara's damage with grenade; HP for statics; 2020-08-16 21:06:35 +02:00
Raildex
b58d18ade2 Refactored functions 2020-08-09 15:25:56 +02:00
MontyTRC89
fdf2de1e89 Increased itemFlags array; Added startPos to ITEM_INFO; Improved wraiths; Rewritten BuildOutsideRoomsTable; 2020-08-04 21:53:58 +02:00
MontyTRC89
bde10fe313 Decompiled wraiths; Added outside rooms table; 2020-08-02 19:39:55 +02:00
MontyTRC89
ecca35d05a Lights refactor 2020-07-26 16:17:54 +02:00
MontyTRC89
f24e2abb94 Added ZLIB 2020-07-26 07:21:38 +02:00
MontyTRC89
689ec226e7 Frames refactoring 2020-07-25 18:02:35 +02:00
MontyTRC89
83bba01a99 Moving all globals of level under LEVEL struct; Fixed severe performance issue; 2020-07-21 09:56:47 +02:00
MontyTRC89
502c647a84 Normal mapping; Tangents and bitangents; 2020-07-18 06:58:44 +02:00
MontyTRC89
2d72803342 Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-07-11 21:29:49 +02:00
MontyTRC89
9867a6d24c Pathfinding refactoring 2020-07-11 21:16:04 +02:00
Raildex
09071a2b88 Merge branch 'master' into memory
# Conflicts:
#	TR5Main/Objects/TR5/tr5_objects.cpp
2020-07-10 20:17:03 +02:00
MontyTRC89
36fe66d617 Hairs done on GPU now 2020-07-07 07:32:33 +02:00
Raildex
053953b8ab Merge branch 'master' into memory 2020-07-05 22:19:28 +02:00
Raildex
5ef674b577 Made Game_Malloc a template with a count parameter 2020-07-05 22:19:06 +02:00
MontyTRC89
538dbb3682 Refactored again room and eshes geometry loading 2020-07-05 06:20:36 +02:00
MontyTRC89
7ff7397fa7 New level format: meshes 2020-07-03 07:05:33 +02:00
MontyTRC89
eaf358f6ae Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-06-29 13:29:45 +02:00
MontyTRC89
71f307a356 New file format: rooms geometry 2020-06-28 15:51: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
MontyTRC89
b637847a1e New level format: ambient light now is Vector3 2020-06-26 20:51:59 +02: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
Raildex
e5ead31064 Putting Renderer into namespace
made g_Renderer a global object
2020-06-21 14:27:12 +02:00
Raildex
1d07a7952e RAII texture2D 2020-06-21 11:51:46 +02:00
Raildex
b635f4df13 Fixed std namespace collisions
Refactored ChunkID/ChunkReader/Writer
2020-06-20 23:39:08 +02:00
MontyTRC89
d665551a02 New level format: textures and sprites 2020-06-20 21:20:36 +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
MontyTRC89
74822167fe Fixes to level loader 2020-05-31 09:39:32 +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
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
39050f69ea Fixing Entity Include (Part 1)
- Less Compile Time...
2020-05-27 13:01:32 +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
MontyTRC89
fdc3ff9996 Refactored OBJET_INFO to ObjectInfo 2020-04-27 15:28:54 +02:00