Commit graph

41 commits

Author SHA1 Message Date
hispidence
e33e821cb8 Clean up GameFlow and GameScriptLevel by adding default member initialisers. Replace GameScriptFog with GameScriptColor. Rename some enums for consistency. Make TITLE_TYPE and enum for consistency. 2021-07-26 18:23:29 +01:00
hispidence
b0089ef059 Make GetString return a char const *.
Make Intro a char const *.
2021-07-23 21:48:49 +01:00
Troye
7b0025a1c9 FLARE_AGE constant; fix dynamic light intensity; fix release builds 2021-07-13 22:29:47 -05:00
MontyTRC89
b544c8bed6 Merge branch 'NewLuaScripting' of https://github.com/MontyTRC89/TR5Main into NewLuaScripting 2021-06-26 07:37:02 +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
Brad Ellis
1a41e3ef50 Remove Strings and CurrentStrings from GameFlow; they were for the old system. Remove LoadScript for the same reason. 2021-06-25 14:33:26 +01:00
Brad Ellis
1a9347297c Remove assignment that already happens in LuaHandler. 2021-06-23 21:27:04 +01:00
MontyTRC89
3bd65d3629 Removed test code; Removed scripts from project (they will be created by LD); Added some missing strings for inventory; Added scripting for puzzles; Removed some old code for scripting; 2021-06-23 05:58:24 +02:00
MontyTRC89
907fce42e7 Added translations support and fixed some bugs with strings 2021-06-20 06:33:44 +02:00
MontyTRC89
a03f30952c Merge branch 'master' into NewLuaScripting
# Conflicts:
#	TR5Main/Scripting/GameFlowScript.cpp
#	TR5Main/Scripting/GameFlowScript.h
2021-06-19 07:20:04 +02:00
MontyTRC89
1bb5965157 Moving to stringed keys for game strings 2021-06-19 07:11:22 +02:00
Brad Ellis
b6be46992b GameFlowScript changes:
Remove all code related to reading SCRIPT.DAT.

Include AudioTracks.h, which, I emphasise, is temporary until we start listing audio tracks in Lua.

Hardcode language to English for now.

Add WeatherType and LaraType usertypes. These were in the Lua scripts but weren't connected with their related C++ types.

Name -> NameStringIndex; the latter is what the engine reads, and as far as I can tell, that is what GameFlow.lua is passing.

Add _GameFlow usertype to correspond to the GameFlow class. I don't think this is the perfect way to expose this functionality to Lua, but it will do the job for now.

GameFlow's destructor now deletes its dynamically allocated memory. Note that I haven't fully looked into whether said memory needs to be dynamically allocated; I just new'd GameScriptLevels and LanguageScripts because they were being new'd in the original implementation.
2021-06-16 15:05:10 +01:00
asasas9500
d4c6cc4a97 Fix line endings 2020-12-21 13:16:29 -03: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
Nils Gaitzsch
c860919616 Fixed std namespace collisions
Refactored ChunkID/ChunkReader/Writer
2020-06-20 23:39:08 +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
4cc46789e9 Decompiled input 2020-04-23 19:22:01 +02:00
Montagna Marco
4246d8ae46 Decompiled UpdateStorm(); Code cleaning; 2020-04-14 06:11:10 +02:00
Montagna Marco
bd199af075 Refactoring; Added all sounds from all TR; Removed trash legacy functions for skinning and meshes processing; New skinning procedure, without fixed arrays; Code cleaning; Decompiled LoadSamples; Dynamic size sound map; 2020-03-02 09:49:11 +01:00
Montagna Marco
15f47b3e6c Fixed sky not drawing 2020-01-19 20:13:22 +01:00
Montagna Marco
09c2957f4f Merged branches 2019-12-02 09:11:21 +01:00
MontyTRC89
c89f89f607 Added title flyby; Added scripted audio tracks; 2019-05-31 21:45:20 +02:00
MontyTRC89
0e49d65c8e Added TR3 flamethrower; Added TR3 spiky ceiling; Added TR3 spiky wall; Added TR4 horse and horseman; New slots; 2019-05-06 23:48:44 +02:00
MontyTRC89
5a2842f89d Refactoring 2019-04-29 13:10:58 +02:00
MontyTRC89
e11487cec5 Fixed text rendering; Fixed savegames; Fixed sky rendering; Fixed ColAddHorizon rendering; Fixed script loading; 2019-03-29 00:27:16 +01:00
MontyTRC89
4226a90206 Added new script commands; Fixed serious memory leak with sprites; Added LoadSprites(); Code cleaning; 2019-03-24 10:08:54 +01:00
MontyTRC89
26aa263892 Added bats; Addes rats; Fixed weather; New script commands; Code cleaning; Fixed horizon; 2019-03-20 23:43:52 +01:00
MontyTRC89
020f3051fc ZeroMemory on LegacyGameFlow; Small fixes to gameflow; 2019-03-20 00:16:00 +01:00
MontyTRC89
e67b95450e Added rope drawing; Added 2D lines and bars drawing; Some debug code for launching directly a level; 2019-03-16 20:55:27 +01:00
MontyTRC89
fee77b4bd9 New script.dat loader; Fixed gameflow; Refactored code for cleaning resources on renderer shutdown and level switch; Removed some legacy code; 2019-03-15 23:03:54 +01:00
MontyTRC89
2030841e1b Added enumeration of adapters and video modes 2019-02-10 09:15:02 +01:00
MontyTRC89
1ca876de04 Improved waterfalls; Refactoring items drawing; 2019-02-09 09:35:30 +01:00
MontyTRC89
7d836faeb7 Added rain rendering; Added 3D lines rendering; 2019-02-02 08:24:03 +01:00
MontyTRC89
112112ff1a Refactored DX11 renderer; Added special effects and sprites rendering; 2019-02-01 17:31:49 +01:00
MontyTRC89
57f243ac0e Working on DX11 renderer 2019-01-13 21:57:16 +01:00
MontyTRC89
209a49ad88 Rewritten WinAppProc; Handled toggle fullscreen; Handled device lost; 2018-12-28 12:12:58 +01:00
MontyTRC89
44d9fa6697 Decompiled grenade launcher (needs fixing); Improved crossbow; Added new ammo types; Implemented stargate and slicer dicer from TR4; Decompiled some collision functions and variables; Started implementing knight templar from TR4; 2018-11-24 09:39:37 +01:00
MontyTRC89
6b72d1acfb Implemented pulse color; Implemented rumble effect; Implemented poisoning; Implemented bats, rats and spider; Implemented sound sources; 2018-11-08 23:05:25 +01:00
MontyTRC89
b425561e3f FIxed bars; Made debug infos configurable with LUA; 2018-10-30 18:49:16 +01:00
MontyTRC89
e61572b14f New savegame system partially working 2018-10-24 23:32:22 +02:00
MontyTRC89
b7dfc803d2 Refactored script system; Decompiled TestTriggers; Added some functions and variables; Fixed a couple of bugs in control phase; 2018-09-22 23:54:51 +02:00
Renamed from TR5Main/Scripting/GameScript.cpp (Browse further)