hispidence
f6aa2ac653
Include frameworkandsol.h instead of framework.h and sol.hpp.
2022-02-10 18:23:42 +00:00
hispidence
51570bd9cd
g_gameScript is now a ScriptInterfaceGame.
2022-02-10 18:22:32 +00:00
MontyTRC89
c3a748cc78
Merge branch 'master' into renderer_refactor
...
# Conflicts:
# TR5Main/Renderer/Renderer11.cpp
2021-12-24 15:19:12 +01:00
Lwmte
8f4ba68f30
Reorganize includes tier 3
2021-12-24 03:32:19 +03:00
Lwmte
2101d3e65f
Reorganize includes tier 2
2021-12-22 16:23:57 +03:00
MontyTRC89
71e4403ac5
Merge branch 'master' into renderer_refactor
...
# Conflicts:
# TR5Main/TombEngine.vcxproj
2021-12-08 06:52:49 +01:00
Lwmte
cf962439ee
Move all new animations to script
2021-12-01 15:18:47 +03:00
MontyTRC89
21b3cc8151
Merge branch 'master' into renderer_refactor
...
# Conflicts:
# TR5Main/Renderer/Renderer11DrawEffect.cpp
# TR5Main/TombEngine.vcxproj.filters
2021-11-23 09:28:40 +01:00
MontyTRC89
28931e36e5
Distance fog
2021-11-23 09:10:07 +01:00
Lwmte
e05f0b89a2
Rename newinv2 to gui
2021-11-16 15:51:50 +03:00
Lwmte
7f088caeda
Tier 2
2021-11-16 14:52:52 +03:00
Lwmte
64f1be7c37
Cleanup savegame and sound code
2021-10-31 23:55:17 +03:00
Lwmte
cbbb28e388
Restore background track on savegame reload
2021-10-29 03:39:22 +03:00
Lwmte
d470cdcf01
Refactor and fix sound code
2021-10-29 02:22:26 +03:00
Lwmte
27c4dee8b2
Merge branch 'master' into errors
2021-10-28 11:28:24 +03:00
MontyTRC89
51cc21338e
Linked all the coded for loading and saving
2021-10-15 05:55:22 +02:00
MontyTRC89
174183ad20
Working on new savegames, first prototype load and save (missing UI)
2021-10-11 10:44:28 +02:00
Troye
552352dd21
W1
2021-09-25 16:03:28 -05:00
Lwmte
1d0ceb0ff4
Fix more stuff
2021-09-16 01:12:19 +03:00
Lwmte
68923228dd
Remove unused globals and move others from control.cpp to needed source files
2021-09-15 21:09:09 +03:00
Lwmte
b9ff80220e
Move all sky stuff to renderer
2021-09-09 13:30:49 +03:00
Lwmte
ba6c260b92
Further code organizing
2021-09-08 18:19:06 +03:00
hispidence
bc9e863307
Give documentation comments new tag names. Part 2 of making the documentation better.
2021-08-23 19:16:24 +01:00
hispidence
6c3f2d1673
Update SetScriptErrorMode call.
2021-08-21 00:15:56 +01:00
hispidence
10419d15a8
Fixed some GameFlowScript.cpp warnings:
...
Remove SkyVelocity1 and SkyVelocity2 - they weren't being used.
Change a loop var to a size_t.
Make GameScriptInventoryObject.yOffset a short.
2021-08-20 02:42:47 +01:00
hispidence
07a756a369
Remove some unused includes.
2021-08-17 14:23:47 +01:00
hispidence
9b4cd106d1
Make some getters const.
2021-08-17 13:37:08 +01:00
hispidence
672f90e238
Add documentation for SetGameFarView, Level.FarView, and Level.UVRotate, as well as some value checking.
2021-08-17 13:36:34 +01:00
hispidence
b8521b5224
Fail assert if string is not found.
2021-08-16 12:52:45 +01:00
hispidence
af84f318b6
Document errorMode. Make it an enum on the Lua side rather than a string.
2021-08-16 12:52:06 +01:00
hispidence
3f3b259cb9
Make window title a strings.lua string instead.
2021-08-15 23:23:33 +01:00
hispidence
813b8bb42a
Add documentation comments in GameFlowScript.cpp.
...
Move windowTitle from GameScriptSettings to GameFlowScript and rename it to SetWindowTitleKey.
2021-08-15 23:04:56 +01:00
hispidence
196646297b
Amend doc comment.
2021-08-12 17:20:09 +01:00
hispidence
686a4902a5
Update GameFlowScript to account for the changes made to GameScriptInventoryObject.
...
Add FROM_DEGREES calls to fix the "rot" property.
2021-08-11 01:28:37 +01:00
hispidence
156342ca14
Register GameScriptRotation in GameFlowScript and not GameLogicScript.
2021-08-11 01:26:35 +01:00
hispidence
05054a05fe
Make the read-only table of kInventorySlots in GameFlowScript instead of GameLogicScript.
2021-08-08 23:53:52 +01:00
hispidence
c96a92f1cb
Improve GameScriptLevel.
...
Rename LARA_DRAW_TYPE to LARA_TYPE as it's used in more than just drawing code. Make WEATHER_TYPE a scoped enum (would have done this for LARA_TYPE too but didn't want to pepper casts in other parts of the codebase). Relabel constants in both enums.
Add kLaraTypes and kWeatherTypes and add them as tables in GameFlow.
Remove Background member - it's not level-specific so GameFlow is a better home for it.
Add (incomplete for now) documentation for some GameScriptLevel members - those I tested, at any rate.
2021-08-07 19:20:17 +01:00
hispidence
e409222739
Clean up GameFlowScript.
...
Remove a lot of members which were unused and which represented level properties already accounted for in GameScriptLevel.
Make TITLE_TYPE an enum class and relabel its values.
Add TitleScreenImagePath and SetTitleScreenImagePath, which replaces GameScriptLevel's Background member.
Register GameScriptColor in GameFlowScript since we will be using it for the fog and sky layer properties of levels.
2021-08-07 19:13:36 +01:00
hispidence
7d26686836
Add ErrorMode to GameScriptSettings (C++) and errorMode to settings (Lua). Call SetErrorMode in LoadGameFlowScript.
2021-08-06 16:44:37 +01:00
hispidence
4155d5faa4
Change ExecuteScript and ExecuteString to return void and throw a TENScriptException on error. Remove my old comments which didn't really add info. Implement SetSettings.
2021-08-03 15:12:24 +01:00
hispidence
b566e33f68
Missed these in the last commit.
2021-07-28 19:06:15 +01:00
hispidence
b94cc960a2
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
16b3511d5f
Make GetString return a char const *.
...
Make Intro a char const *.
2021-07-23 21:48:49 +01:00
Troye
5d8bb0014d
FLARE_AGE constant; fix dynamic light intensity; fix release builds
2021-07-13 22:29:47 -05: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
hispidence
350d0426ca
Remove assignment that already happens in LuaHandler.
2021-06-23 21:27:04 +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
dc5db910f2
Added translations support and fixed some bugs with strings
2021-06-20 06:33:44 +02:00
