Commit graph

33 commits

Author SHA1 Message Date
hispidence
53b971c033 Remove 'typedef' from enums and structs. This was required in C, but in C++ all it does is generate thousands of warnings. 2021-07-18 15:22:15 +01:00
MontyTRC89
cf98c30910 Merge branch 'NewLuaScripting' of https://github.com/MontyTRC89/TR5Main into NewLuaScripting 2021-06-26 07:37:02 +02:00
MontyTRC89
a4d3ec9d26 Switched audio tracks from int index to string; Added Tracks.lua loading support; 2021-06-26 07:36:54 +02:00
hispidence
1fbb41d997 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
MontyTRC89
a455a091c0 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
e2e4022188 Merge branch 'master' into NewLuaScripting
# Conflicts:
#	TR5Main/Scripting/GameFlowScript.cpp
#	TR5Main/Scripting/GameFlowScript.h
2021-06-19 07:20:04 +02:00
MontyTRC89
a4467c2a4b Moving to stringed keys for game strings 2021-06-19 07:11:22 +02:00
hispidence
b4ffd55914 GameFlowScript changes:
Inherit from LuaHandler.

Remove the SCRIPT.DAT-related code.

Add m_translationsMap which stores strings by key and holds a vector with their translations. The index of a translation corresponds with the index of the language in m_languageNames; e.g. if Italian is at index 2 in m_languageNames, then the Italian translation of a string will be at index 2 in the vector. See GameFlow:SetStrings in English.lua.

Add m_languageNames which stores a vector of language names. See GameFlow:SetLanguageNames in English.lua.

Add WriteDefaults and AddTracks, which is there for data which isn't in Lua scripts yet. It will be removed in the future.

Add AddLevel, which corresponds with GameFlow:AddLevel in Gameflow.lua.

Add LoadGameFlowScript, which loads (for now) Gameflow.lua and English.lua.

Add GetLang, which is to load the old-style strings and which will be removed when the switch to new strings is complete.
2021-06-16 14:51:58 +01:00
asasas9500
10a3d9167a Fix line endings 2020-12-21 13:16:29 -03:00
Raildex
b635f4df13 Fixed std namespace collisions
Refactored ChunkID/ChunkReader/Writer
2020-06-20 23:39:08 +02:00
Raildex
2b4d1ca2e8 resolving namespace std conflicts 2020-06-18 15:54:08 +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
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
37ac9b77fd 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
c30ed7373f Refactoring; Added fixed extra rotation to inventory objects; 2019-04-30 12:56:27 +02: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
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
57f243ac0e Working on DX11 renderer 2019-01-13 21:57:16 +01:00
MontyTRC89
4328c805b6 Added default configuration; Improved renderer resolution change; Added sound settings menu; 2018-12-31 10:38:34 +01:00
MontyTRC89
da2804d997 Improving setup dialog; Working on sunglasses object; 2018-12-30 11:41:48 +01:00
MontyTRC89
209a49ad88 Rewritten WinAppProc; Handled toggle fullscreen; Handled device lost; 2018-12-28 12:12:58 +01:00
MontyTRC89
39436dbbb5 Added scorpion from TR4 2018-11-28 13:19:01 +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
0199efb56c Refactoring weapons system 2018-11-21 09:34:01 +01:00
MontyTRC89
150a8377aa Fixed inventory strings 2018-11-11 23:42:30 +01:00
MontyTRC89
c3b4308309 Implemented debris rendering 2018-11-10 09:27:10 +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
153bbda34c Decompiled lot of code about weapons, need to fix and test; Implementing harpoon gun, grenade launcher, rocket launcher; 2018-11-01 22:45:59 +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.h (Browse further)