Commit graph

8102 commits

Author SHA1 Message Date
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
011c5b2222 Remove g_AudioTracks reference from a file where it's not used. 2021-08-17 13:15:38 +01:00
Lwmte
5c8cfd1764 Revert pushable "fix" 2021-08-17 12:23:57 +03:00
asasas9500
e47d359625 Fix laser head 2021-08-16 23:40:51 -03:00
Lwmte
17501c45d0 Update tr5_pushableblock.cpp 2021-08-17 03:13:22 +03:00
hispidence
3a01ec6629 Fix assert error message. 2021-08-17 00:30:21 +01:00
Troye
e13da5c0b6 Fix camera on waterout and block pulling/pushing 2021-08-16 18:05:38 -05:00
Lwmte
a277954a8c Fix pushable detection without hacks 2021-08-17 01:40:25 +03:00
asasas9500
43bb0bc410 Remove hack remains 2021-08-16 18:19:40 -03:00
Lwmte
26e75629ac Fix big scorpion and harpy poisoning 2021-08-17 00:15:09 +03:00
Lwmte
dc34a7081a Rollback regression from abb7b0c862 2021-08-16 18:55:25 +03:00
Lwmte
accb7da91b Fix sol compile error on release build 2021-08-16 17:22:37 +03:00
hispidence
063c65660d Compile updated docs. 2021-08-16 12:55:22 +01:00
hispidence
8751096da6 Make LogLevel::Error print to cout instead of cerr so it reaches the console window. 2021-08-16 12:53:33 +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
MontyTRC89
1ad81f4a63 Merge branch 'master' of https://github.com/MontyTRC89/TombEngine 2021-08-16 05:45:10 +02:00
MontyTRC89
ab37257b77 Fixed ID_HAMMERHEAD 2021-08-16 05:44:55 +02:00
hispidence
3f3b259cb9 Make window title a strings.lua string instead. 2021-08-15 23:23:33 +01:00
hispidence
8cb2dcef8a Update compiled docs. 2021-08-15 23:08:05 +01:00
hispidence
0fd15ad18d Make AudioTrack documentation stub. 2021-08-15 23:07:22 +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
asasas9500
769e36702a Fix slopes 2021-08-15 18:07:38 -03:00
asasas9500
3be421316b Revert "Fixed Climb Out Of Water towards -X"
This reverts commit f4622315cf.
2021-08-15 18:02:31 -03:00
MontyTRC89
990cb9f634 Merge branch 'master' of https://github.com/MontyTRC89/TombEngine 2021-08-15 16:04:20 +02:00
MontyTRC89
4f0f077378 FIxed ID_HARPY 2021-08-15 16:04:07 +02:00
hispidence
97089fb2a6 Cast this bit too in service of killing warnings. 2021-08-12 22:17:08 +01:00
hispidence
c07a7aa00e Merge remote-tracking branch 'origin/master' 2021-08-12 22:13:12 +01:00
hispidence
93117c56a3 Fix some documentation. 2021-08-12 22:11:50 +01:00
hispidence
8ddd04f9d7 Don't register CalculateDistance functions in winmain. 2021-08-12 22:11:22 +01:00
hispidence
561119ef09 Clean up some warnings. 2021-08-12 22:10:05 +01:00
wolfcheese
763b898910 Merge branch 'master' of https://github.com/MontyTRC89/TombEngine 2021-08-12 16:00:04 -04:00
wolfcheese
8ecef928fc Removed inappropriate object number conversion when listing inventory items 2021-08-12 15:59:50 -04:00
hispidence
904588213a Add compiled documentation. 2021-08-12 20:16:28 +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
196646297b Amend doc comment. 2021-08-12 17:20:09 +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
a79a5114a1 Use new SetVolumeMusic and SetVolumeFX calls. 2021-08-12 00:38:44 +01:00
hispidence
63d5f56b22 Big audio & audio settings cleanup.
Remove "Sound Enabled" setting, as it would disable BASS if used, leading to a load of warning messages and missing sounds when re-enabled.

Currently-playing track(s) now get quieter/louder when using the music volume slider in the audio settings menu.

Encapsulate GlobalMusicVolume and GlobalFXVolume in functions (at the time of writing this is only strictly necessary for music volume, since SetVolumeMusic needs to also set the volume of currently-playing tracks).

Make "apply" button return to the previous menu, as it does with keyboard controls.

Replace a printf call with a TENLog call.
2021-08-12 00:38:15 +01:00
hispidence
231d49ca26 Merge remote-tracking branch 'origin/master' 2021-08-11 15:06:11 +01:00
hispidence
16a605f102 Remove GameScriptLevel members which look superfluous. Mark some others as unused (for now). 2021-08-11 14:51:21 +01:00