Commit graph

66 commits

Author SHA1 Message Date
hispidence
7a94c3214d The explicit cast to void * made this line resolve to an assignment to an rvalue, but removing it fixes it. 2021-07-23 21:54:57 +01:00
MontyTRC89
1b60545b4a Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2021-07-14 05:30:04 +02:00
hispidence
10aec3d6f2 Make some functions take a GAME_OBJECT_ID instead of a short. Make AIOBJECT use a GAME_OBJECT_ID instead of a short. 2021-07-11 16:55:20 +01:00
MontyTRC89
c1bfae6bf9 Refactored cameras, sinks and sound sources; Added sound sources playback; 2021-07-10 06:55:37 +02:00
MontyTRC89
d25cfb6c92 Moved GameScriptPosition, GameScriptRotation and GameScriptColor classes in separate files 2021-06-29 05:28:17 +02:00
MontyTRC89
4c7110558f Switched audio tracks from int index to string; Added Tracks.lua loading support; 2021-06-26 07:36:54 +02:00
MontyTRC89
1bb5965157 Moving to stringed keys for game strings 2021-06-19 07:11:22 +02:00
Trxye
35af9b2c92 clean up ring inventory code; fix KillItem(); 2021-05-26 01:58:30 -05:00
asasas9500
d4c6cc4a97 Fix line endings 2020-12-21 13:16:29 -03:00
asasas9500
e45daf7d24 Separate bridge floor and ceiling; Fix pushables 2020-11-11 15:01:45 -03:00
asasas9500
c06fa6f9e2 Merge branch 'master' into NoShifts 2020-08-25 19:25:28 -03:00
Woops
aca8da8db1 Lara refactor: lara_cheat, move the rest of the functions out of laramisc.cpp and delete it. fix includes. 2020-08-16 16:01:58 -05:00
Nils Gaitzsch
82b3944dde Deactivated Pool memory
@TODO: Fix Pool
Changed pointers for ChunkIds to smart pointers
2020-08-11 19:18:36 +02: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
133c971aaf Merge branch 'master' of https://github.com/MontyTRC89/TR5Main 2020-07-11 21:29:49 +02:00
Montagna Marco
9f373c691a Pathfinding refactoring 2020-07-11 21:16:04 +02:00
Nils Gaitzsch
4b825f364e Merge branch 'master' into memory
# Conflicts:
#	TR5Main/Objects/TR5/tr5_objects.cpp
2020-07-10 20:17:03 +02:00
Montagna Marco
2a1c491c7e Hairs done on GPU now 2020-07-07 07:32:33 +02:00
Nils Gaitzsch
da0eaeac0e Made Game_Malloc a template with a count parameter 2020-07-05 22:19:06 +02:00
Montagna Marco
439db540e3 New level format: meshes 2020-07-03 07:05:33 +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
c860919616 Fixed std namespace collisions
Refactored ChunkID/ChunkReader/Writer
2020-06-20 23:39:08 +02: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
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
TokyoSU
75e7b53263 Fix Savegame Puzzle 2020-05-27 19:37:01 +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
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
85e462f6a2 First EXE build successfully 2020-04-24 19:15:05 +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
1ebf4a5229 Fixed chase camera; Moved Camera in DLL; 2020-04-12 06:50:43 +02:00
Montagna Marco
3f35e4de4f Refactoring 1 2020-04-01 13:09:14 +02:00
asasas9500
f9286cbed2 Fix include 2020-03-17 21:47:37 -03:00
Montagna Marco
af8a6c2ec0 New objects list; Decompiled ID_LARA_HAIRS; 2020-02-24 12:51:28 +01:00
Montagna Marco
6d6ab2c9a4 Decompiled ID_BATS; Renamed submarine functions; 2020-01-30 11:24:12 +01:00
Montagna Marco
99fef97800 Decompilink smoke emitters; Fixed again dynmic lights; Fixed horizontal pickups; 2020-01-20 07:29:37 +01:00
Montagna Marco
365c88ba2b Possible fix for items resetting after load game; Reverted bad change in renderer; 2020-01-18 21:55:04 +01:00
asasas9500
114de19117 Improve flipmaps 2020-01-14 00:26:44 -03:00
Montagna Marco
c69cdeee40 Fixed AiPickupCollision; Fixed setup flags of many objects; Fixed item savegames; Refactored inventory; Added InitialseShootSwitch; 2020-01-12 08:02:48 +01:00
Montagna Marco
fdd248667f Fixed flyby decompilation issues; Fixed cinematic bars; 2019-12-29 08:05:58 +01:00
Montagna Marco
91f90d5ee5 Fixed savegame crash 2019-12-11 07:48:27 +01:00
Montagna Marco
09c2957f4f Merged branches 2019-12-02 09:11:21 +01:00
Montagna Marco
92bd6a006e Decompiled Lara (with some bugs) 2019-12-01 08:13:19 +01:00
TokyoSU
dc888f2c9c [Update] Project & UPV Prototype
- changed __int32/__int16/__int8 to int/short/char respectivly.
- added UPV (prototype), lara is killed when enter.
2019-11-27 15:12:35 +01:00