hispidence
f6aa2ac653
Include frameworkandsol.h instead of framework.h and sol.hpp.
2022-02-10 18:23:42 +00:00
hispidence
2f9c8c6894
Add ExecuteScriptFile();
2022-02-10 18:21:42 +00:00
MontyTRC89
7a956274b8
Code cleaning; Moved fade stuff to camera code;
2022-01-25 05:42:41 +01:00
Lwmte
2101d3e65f
Reorganize includes tier 2
2021-12-22 16:23:57 +03:00
Lwmte
e05f0b89a2
Rename newinv2 to gui
2021-11-16 15:51:50 +03:00
Lwmte
8e42d77243
Move savegames to separate folder, organize savegame code
2021-10-31 21:36:51 +03:00
Lwmte
d470cdcf01
Refactor and fix sound code
2021-10-29 02:22:26 +03:00
Lwmte
c871884301
Don't use legacy function names in sound code
2021-10-02 18:54:53 +03:00
Lwmte
e6fc5aba77
Cleanup
2021-09-25 16:00:30 +03:00
MontyTRC89
4b0d76ed95
Refactored flame emitters, Lara burn and lightning bolts;
2021-09-22 05:51:25 +02:00
Lwmte
cefc60c7ea
Move around some files
2021-09-19 23:41:26 +03: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
MontyTRC89
02e6a5f327
Fixed previous merge
2021-09-14 05:19:01 +02:00
MontyTRC89
88de21198a
Merge branch 'master' into displaystrings
2021-09-14 05:11:43 +02:00
Lwmte
744325bea2
Revert "Fix regressions"
...
This reverts commit c1fc33ab52
2021-09-11 10:13:04 +03:00
Lwmte
c1fc33ab52
Fix regressions
2021-09-11 09:41:29 +03:00
MontyTRC89
8db7df3868
Merge branch 'doors_refactoring'
...
# Conflicts:
# TR5Main/Game/door.cpp
# TR5Main/Game/door.h
# TR5Main/Game/memory/malloc.cpp
# TR5Main/Objects/Generic/Switches/cog_switch.cpp
# TR5Main/Objects/Generic/Switches/crowbar_switch.cpp
# TR5Main/Objects/Generic/Switches/generic_switch.h
# TR5Main/Objects/Generic/Switches/turn_switch.cpp
# TR5Main/Objects/TR4/Object/tr4_obelisk.cpp
# TR5Main/Renderer/Renderer11Draw.cpp
# TR5Main/Specific/level.cpp
# TR5Main/TombEngine.vcxproj
# TR5Main/TombEngine.vcxproj.filters
2021-09-11 05:38:26 +02:00
Lwmte
48a9a1d52a
Merge branch 'master' into item_data
2021-09-09 11:10:25 +03:00
Lwmte
ba6c260b92
Further code organizing
2021-09-08 18:19:06 +03:00
Lwmte
f293735d11
Move all effect source files to separate directory, rename effect2 to effects
2021-09-08 18:07:48 +03:00
hispidence
88c31503ca
Add this comment to remind myself to think about stuff when implementing loading/saving.
2021-08-31 13:25:42 +01:00
hispidence
70cc036605
Make SetLevelFunc and GetLevelFunc only store the function in m_levelFuncs.
...
Store the function in m_levelFuncs instead of the table itself.
2021-08-30 18:21:42 +01:00
hispidence
fa5a6fd443
Add DisplayString "flags" and "translated" support, as well as some things I forgot to commit earlier.
2021-08-29 20:25:54 +01:00
hispidence
9a1831bc8f
Remove PrintString; it has been "replaced" with DisplayString/AddString.
2021-08-29 20:11:29 +01:00
hispidence
8c1e290683
Rename AddDisplayString to SetDisplayString. Make it call insert_or_assign instead of just insert.
...
Add GetDisplayString and assorted types/static functions.
2021-08-29 20:09:59 +01:00
hispidence
3d1f2abd0b
Add ScreenToPercent and PercentToScreen.
2021-08-29 20:03:51 +01:00
hispidence
d946f4c118
Add more reserved script names.
2021-08-29 17:03:51 +01:00
Raildex
2621fa8f0d
Fixed More Include Hell
2021-08-28 13:27:58 +02:00
hispidence
434b1f146e
Change PrintString arg names to better reflect what it does.
2021-08-27 19:08:28 +01:00
hispidence
e63153cc88
Implement ShowString, HideString, and PrintString.
2021-08-27 18:56:35 +01:00
hispidence
5a5ca519dc
Replace Get*ByName with GetByName, AddLuaName* with AddName, and RemoveLuaName* with RemoveName. Replace m_*MapName with m_nameMap. Use a std::variant for the types that m_nameMap elements could be. Modify SetNameCallbacks params to be variadic. These do make it look more complex, but also make it more generic, and mean that specific parameters do not need to be repeated (which will make it easier if/when we change said parameters).
2021-08-27 18:21:37 +01:00
hispidence
578724a9c6
Set callbacks to nil and collect garbage when unloading level.
2021-08-27 12:46:01 +01:00
hispidence
770a791c0d
Make ExecuteFunction print a better error message with the name of the function.
2021-08-23 22:07:18 +01:00
hispidence
cb1ad16b2d
Remove more vestiges of old trigger system. Replace TO_LUA_SCRIPT with the enum that used to be there - TO_BODYBAG - so that the following enums still have their same values.
2021-08-23 22:05:58 +01: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
9bf5c361e2
Clean up GameLogicScript.
...
Add some new member functions, ResetLevelTables and GetLevelFunc. The former is called in FreeLevelScripts, which is now called in control.cpp.
Remove AddTrigger, as the LevelFuncs table takes care of triggers.
2021-08-23 02:02:47 +01:00
hispidence
07a756a369
Remove some unused includes.
2021-08-17 14:23:47 +01:00
hispidence
93117c56a3
Fix some documentation.
2021-08-12 22:11:50 +01:00
hispidence
adcee07c68
Fix some GameLogic documentation.
2021-08-12 20:14:40 +01:00
hispidence
c8de277d44
Remove GetLara as the Lara object is easier to use.
...
Add documentation for the Lara object.
2021-08-12 20:14:02 +01:00
hispidence
cd16268e19
Actually add documentation.
2021-08-12 19:58:22 +01:00
hispidence
3efa8f16b7
Take CalculateDistance and CalculateHorizontalDistance out of header file as they can be static now.
...
Add documentation for said functions.
2021-08-12 19:57:17 +01:00
hispidence
53cd3add4f
Register CalculateDistance and CalculateHorizontalDistance in GameLogicScript.
2021-08-12 19:54:03 +01:00
hispidence
582b000fb9
Make OnControlPhase take a float, representing the delta time.
...
This is not ACTUALLY the amount of time that has passed, since things in the gameplay loop appear to assume they are being called thirty times per second, even if more or less time has passed. Thus to keep the scripts in sync with the the rest of the engine, we force a 1/30 second delta time.
2021-08-12 18:20:14 +01:00
hispidence
adf1361d99
Fix documentation; Level -> LevelVars.
2021-08-12 02:43:59 +01:00
hispidence
ea1649b7b1
Make "loop" arg to PlayAudioTrack optional; defaulting to false.
2021-08-12 02:39:29 +01:00
hispidence
b708a6068d
Add comments and update documentation for InventoryAdd/InventoryRemove.
2021-08-12 02:38:30 +01:00
hispidence
c1b46afd62
Rename Lua tables Game and Level to GameVars and LevelVars to disambiguate the latter from the Level class.
2021-08-12 00:39:52 +01:00
hispidence
156342ca14
Register GameScriptRotation in GameFlowScript and not GameLogicScript.
2021-08-11 01:26:35 +01:00
