Commit graph

1622 commits

Author SHA1 Message Date
Lwmte
cbdbca527b Also rename solution 2021-08-02 18:38:51 +03:00
Lwmte
d48f90bb93 Rename project to TEN, add icon 2021-08-02 17:53:44 +03:00
Lwmte
71dd879ee8 Fix #236 2021-08-02 17:16:23 +03:00
Nils
48f18a54b0 Putting Light of Lara's burning to Lara's hips 2021-08-02 16:12:15 +02:00
Lwmte
3291010b6b Fix demigod fireballs and binoculars zoom 2021-08-02 16:51:36 +03:00
Lwmte
393b9fd52e Merge branch 'master' of https://github.com/MontyTRC89/TombEngine 2021-08-02 15:54:18 +03:00
Lwmte
8d717c86ad Fix Lara fire 2021-08-02 15:40:51 +03:00
Nils
f785b1fd08 Fixed Debris collision 2021-08-02 14:18:28 +02:00
hispidence
35712bd6d1 Merge branch 'master' of https://github.com/MontyTRC89/TombEngine 2021-08-02 13:10:34 +01:00
Lwmte
2db7e4dd05 Fix some sentry gun bugs 2021-08-02 15:01:28 +03:00
hispidence
6cbf19fe8d Merge branch 'master' of https://github.com/MontyTRC89/TombEngine 2021-08-02 12:49:32 +01:00
hispidence
0da5f86f90 Remove HandleScriptMessage and associated globals - apparently this is no longer supposed to be here. 2021-08-02 12:49:17 +01:00
Lwmte
fd844d5d6b Remove poisoning by medkits 2021-08-02 14:44:28 +03:00
Lwmte
041b03c91d Assign hitEffect for most objects 2021-08-02 14:21:41 +03:00
Nils
95bec0e3b0 Reduced Vertex Count for Bars from 9 to 5
Added define for PI for shaders
Added Primes to Vertex Hash generation
Fixed Debris
2021-08-02 13:16:51 +02:00
Lwmte
4da3b6b624 Fix binoculars mode engaging other states 2021-08-02 12:35:17 +03:00
Lwmte
1a43e0efb0 Fix small scorpion poisoning ratio 2021-08-02 12:07:54 +03:00
Lwmte
90f595b55c Remove gnFrameCounter which is seemingly the same as GlobalCounter 2021-08-02 11:25:53 +03:00
Lwmte
b6e9b30293 Fix poisoning 2021-08-01 23:28:54 +03:00
hispidence
f5439d518f Restore original line now that the stack overflow is fixed. 2021-08-01 20:50:41 +01:00
hispidence
0d5c49e6c3 Fix assignment-addition operator of GAME_OBJECT_ID, thus fixing a stack overflow. The operator was calling itself... Silly me D: 2021-08-01 20:49:28 +01:00
Lwmte
d80aa61527 Simplify Lara renderer a bit 2021-08-01 22:24:20 +03:00
Lwmte
c9a0f65251 Fix keyhole deadlock 2021-08-01 22:24:09 +03:00
Lwmte
054dafeeac Fix blending modes issue (#281)
Only for rooms and some objects but not for Lara or most effects
2021-08-01 15:54:54 +03:00
Lwmte
fce029ae69 Update shaders 2021-08-01 14:07:14 +03:00
Lwmte
95bd4f7466 Use refraction as before but accounting for vertex weight factor 2021-08-01 11:39:02 +03:00
Lwmte
20528997db Increase max refraction value 2021-07-31 19:11:02 +03:00
Lwmte
2966d5da02 Add refraction vertex attribute, separate attribs into separate normalized float values 2021-07-31 18:51:38 +03:00
hispidence
7216b7b0af Remove accidental scope specifier thingy. 2021-07-31 13:23:22 +01:00
hispidence
d31ecdf58e Change TitleType member initializer. 2021-07-31 12:50:52 +01:00
Lwmte
48a714b92b Fix #276 2021-07-31 07:32:01 +03:00
Lwmte
752cf5a35c Fix #266 2021-07-31 05:28:42 +03:00
Lwmte
755708cae8 Fix #268 2021-07-31 04:48:15 +03:00
Lwmte
f642a7fb93 Fix puzzle holes. NOTE: Commented a line which caused stack overflow, needs fixing 2021-07-31 04:40:28 +03:00
Lwmte
a620558375 Update spotcam.cpp 2021-07-31 04:07:41 +03:00
Lwmte
e81ca65849 Fix #286 2021-07-31 03:47:56 +03:00
Lwmte
633e0eadc3 Implement per-vertex effects for rooms and objects 2021-07-30 20:55:03 +03:00
Lwmte
e0b504ff00 Draw vertex colors for moveables too 2021-07-30 14:45:18 +03:00
hispidence
d61b38647b Compile fix; forgot to commit this last time. 2021-07-30 11:44:00 +01:00
hispidence
8b7928d83e Missed these in the last commit. 2021-07-28 19:06:15 +01:00
hispidence
5562667f98 Move GameScriptLevel, GameScriptAudioTrack, GameScriptInventoryObject, GameScriptSkyLayer, GameScriptSettings and GameScriptMirror into their own files. This could be changed later as this does create many small .h and .cpp files, but for now this cleans things up and makes it easier to check things class by class.
Treat functions as global that would previously be accessed through the GameFlow table. This does pollute the global environment in Lua a bit, but keeps it consistent with the functions in GameLogicScript, which are all accessed as globals.

Add some default member initialisers.

Remove WriteDefaults. Rename Intro to IntroImagePath and make it a std::string.

Add some documentation for the functions of GameFlowScript.

Fix some comments.
2021-07-28 18:44:24 +01:00
hispidence
4de85da46a Include GameScriptColor.h in GameFlowScript.h as it uses it. 2021-07-26 18:28:13 +01:00
hispidence
dba2f8ac91 Delete copy operations for GameScriptAIObject, GameScriptCameraInfo, GameScriptSinkInfo and GameScriptSoundSourceInfo - this can be changed later, but for now is a safety measure since we hold a reference, which means copying these would take some extra thought. 2021-07-26 18:25:50 +01:00
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
945082ce54 Change mesh loading to use emplace_back.
Change some remaining vector::back calls to use the already-existing references.
2021-07-24 19:14:23 +01:00
hispidence
daf46fed61 Clean up a load of warnings and possible errors:
Fix buffer from char*[255] to char[255]. This also allows us to avoid the C-style cast to char const *.

Remove original push_back call to g_Level.SoundSources which I left in by accident.

Use string constructor which takes pointer to first char and pointer to last char + 1. This removes the need to zero the memory (the calls were generating warnings about accessing buffer[256] when buffer is only 255 elements) and also gets rid of warning C6054 about string possibly not being zero-terminated.

Change calls to push_back and back with an emplace_back. Aside from being shorter and slightly more efficient, it gets rid of warning C26444 (about creating local variables with no name).
2021-07-24 19:08:17 +01:00
hispidence
520acc7180 Make the GAME_OBJECT_ID compound addition-assignment operator take references, as is the canonical implementation (and so we don't return a reference to a local, as cppcheck very correctly warned me about). 2021-07-24 14:10:16 +01:00
hispidence
9dd4bcf4ca Add SOUND_SOURCE_INFO and AI_OBJECT names when loading in the level data. Implement remaining functions on the GameLogicScript side. 2021-07-24 12:45:33 +01:00
hispidence
07d8a254b9 Fix comment. 2021-07-24 12:29:54 +01:00
hispidence
cf8723c448 Add GameScriptSoundSourceInfo and GameScriptAIObject, and associated functions. 2021-07-24 12:29:25 +01:00