Lwmte
|
ef0bcf950a
|
Merge branch 'master' into errors
|
2021-10-08 16:47:59 +03:00 |
|
Lwmte
|
c871884301
|
Don't use legacy function names in sound code
|
2021-10-02 18:54:53 +03:00 |
|
Troye
|
552352dd21
|
W1
|
2021-09-25 16:03:28 -05:00 |
|
Lwmte
|
e6fc5aba77
|
Cleanup
|
2021-09-25 16:00:30 +03:00 |
|
Raildex
|
2b0b1ff282
|
Added newlines
|
2021-09-25 11:27:47 +02:00 |
|
Raildex
|
7b070e75ad
|
Fixed duplicated ITEM_INFO definition
|
2021-09-24 07:53:42 +02: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 |
|
Lwmte
|
17ff197dc7
|
Merge branch 'coll_info_reorganize' into sky_fix
|
2021-09-14 12:08:05 +03:00 |
|
Lwmte
|
a2dd7e52e5
|
Merge branch 'master' into coll_info_reorganize
|
2021-09-14 08:48:36 +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
|
eb2f33217c
|
Convert static position to PHD_3DPOS, fix crossbow bolt shatter, read/write proper shatter type
|
2021-09-13 23:15:02 +03:00 |
|
Lwmte
|
b8bb8562a3
|
Merge branch 'master' into sky_fix
|
2021-09-13 09:50:25 +03:00 |
|
MontyTRC89
|
e7eba9c30b
|
Removed closed doors
|
2021-09-12 05:09:20 +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
|
86d585263e
|
Merge branch 'static_mesh_fixes' into sky_fix
|
2021-09-10 18:43:12 +03:00 |
|
Lwmte
|
42a6e45bca
|
Merge branch 'master' into sky_fix
|
2021-09-10 14:04:00 +03:00 |
|
Lwmte
|
f8d9edeb81
|
Convert static position to PHD_3DPOS, fix crossbow bolt shatter, read/write proper shatter type
|
2021-09-10 13:49:45 +03:00 |
|
Lwmte
|
b9ff80220e
|
Move all sky stuff to renderer
|
2021-09-09 13:30:49 +03:00 |
|
Lwmte
|
48a9a1d52a
|
Merge branch 'master' into item_data
|
2021-09-09 11:10:25 +03:00 |
|
Lwmte
|
3fe6211e4e
|
Further organizing
|
2021-09-08 18:31:35 +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
|
b5d8fe06ad
|
Fix wrong function name.
|
2021-08-29 21:08:20 +01:00 |
|
hispidence
|
a2303d022f
|
Add the functions/properties SetPos, GetPos, col and key to DisplayString.
Add documentation too.
|
2021-08-29 20:28:40 +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
|
dde17f88cd
|
Make MakeReadOnlyTable give the metatable its own metatable with an __index metamethod which raises an error (for now) when you use a variable that doesn't exist.
|
2021-08-29 17:07:19 +01:00 |
|
hispidence
|
e834d38522
|
Fix GameScriptColor's D3DCOLOR operator and __tostring, and add a converting constructor.
|
2021-08-29 17:05:06 +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
|
96441572bf
|
Make default s_callbackRemoveName not throw.
|
2021-08-27 19:07:55 +01:00 |
|
hispidence
|
6bc5a561a0
|
Make variables an unordered_map for consistency and speed.
|
2021-08-27 19:04:03 +01:00 |
|
hispidence
|
e63153cc88
|
Implement ShowString, HideString, and PrintString.
|
2021-08-27 18:56:35 +01:00 |
|
hispidence
|
538fe191a8
|
Add GameScriptDisplayString.h and .cpp.
|
2021-08-27 18:49:59 +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
|
b71555efa8
|
Add ReservedScriptNames.h. This holds some static const strings to be used as template arguments.
|
2021-08-27 18:11:59 +01:00 |
|
hispidence
|
b5fe8904c1
|
Add IdentifierType for named script types. This is in an effort to consolidate a lot of very similar functions into a few templates.
|
2021-08-27 18:10:19 +01:00 |
|
hispidence
|
f7cff1076e
|
Add comment for prev commit.
|
2021-08-27 14:32:00 +01:00 |
|
hispidence
|
824a65e603
|
Make GameScriptColor able to convert to D3DCOLOR.
|
2021-08-27 14:30:41 +01:00 |
|