Commit graph

8102 commits

Author SHA1 Message Date
Sezz
dde865442f Update input 2023-05-01 16:18:02 +10:00
Lwmte
c7927c96ce Update Changes.txt 2023-05-01 08:17:18 +02:00
Sezz
6bae831eb8 Fix inventory input interference when entering inventory via puzzle 2023-05-01 16:02:17 +10:00
Lwmte
c3c5ba688c Update camera.cpp 2023-04-30 11:07:16 +02:00
Lwmte
858a83aece Update Changes.txt 2023-04-30 11:03:31 +02:00
Lwmte
cf03b48af7 Fix thumbstick camera option producing jerky movements 2023-04-30 11:03:31 +02:00
TokyoSU
705a46f9f7 Added gunflash to cowboy :) 2023-04-30 10:16:06 +02:00
Sezz
31a93a6bb6 Fix Tokyo's formatting part 2 2023-04-30 14:32:51 +10:00
MontyTRC89
678bf9ec6a Merge branch 'develop' into renderer_fixes_and_features
# Conflicts:
#	TombEngine/Renderer/Renderer11.h
2023-04-30 06:10:07 +02:00
hispidence
cc5d0de965 Merge remote-tracking branch 'origin/develop' into vec2_and_vec4 2023-04-29 22:51:16 +01:00
hispidence
fd9dff8721 Initial commit of Vec2 2023-04-29 22:50:48 +01:00
TokyoSU
4cefe19248 Fix crash with bridge
They crash since the object is not loaded, so now we check if the object is loaded before calling it !
2023-04-29 19:35:43 +02:00
Sezz
e37c13ae25 Merge branch 'develop' of https://github.com/MontyTRC89/TombEngine into develop 2023-04-29 23:47:45 +10:00
Sezz
b78ac79239 Fix Tokyo's formatting part 1 2023-04-29 23:47:38 +10:00
Kubsy
750d716725 Update Changes.txt 2023-04-29 14:23:30 +01:00
Lwmte
73fa423141 Update winmain.cpp 2023-04-29 15:07:11 +02:00
Lwmte
8a18dcfbcd Better error handling for missing font and/or shaders 2023-04-29 15:02:35 +02:00
Kubsy
d8e07691fb revert the mistake 2023-04-29 08:59:12 +01:00
Sezz
b8cde31501 Improve handling in swamps 2023-04-29 15:09:58 +10:00
MontyTRC89
cdcb4ae37b Merge branch 'develop' of https://github.com/MontyTRC89/TombEngine into develop 2023-04-29 05:42:48 +02:00
MontyTRC89
7bb5ec67fd Added fog bulbs 2023-04-29 05:41:16 +02:00
Kubsy
8305f79cf0 Fix merge error 2023-04-28 22:12:44 +01:00
Kubsy
4d1a689e99 Update Changes.txt 2023-04-28 17:04:59 +01:00
Kubsy
e3e7b65b10 Update Changes.txt 2023-04-28 17:03:33 +01:00
TokyoSU
2ba8257468
Enemy firing system refactor (#1069)
* Refactored gunflash.

- Fixed rendering of gunflash.
- Improved gen.bat with some comment.
- Now entity can shoot with 2 weapon (left and right) like lara.

* Fix compiling error

* Move muzzleFlash to creature struct

- Removed BiteInfo and remplaced it by CreatureBiteInfo.
- Fixed Mafia2 and Cybord muzzleflash pos.
- Added dynamic light and smoke when entity shoot. (only for weapon)

* Able to switch GUN_FLASH mesh.

* Improve CreatureEffect/Effect2

Pass bite directly instead.

* Fixed TR5 and TR4 biteInfo

* Finished implementing gunflash for creatures.

- Fix snowmobile gun crash.
- Fix knifethrower not throwing knife.

* Removed traps cpp/h.

* Update Changes.txt

* Update Changes.txt

* Update effects.cpp

* Fixed build error

* Update setup.cpp

- Removed old ObjectObjects() and TrapObjects() and move the code to TR5 objects.

* Fix mpgun gunflash not playing when dead.

* Fixed snowmobile gun not appearing correctly

- Fixed crash if ID_GUN_FLASH2 not exist  and creature like snomobile driver shoot.
- Fix the snowmobile driver AI that where commented (was disabled to test the gunflash).

* Improved AssignObjectAnimations

* Added new lot for snowmobile gun

- Allow the snowmobile to drop from 4 block !

* Fixed savegame crash

* Change what @Lwmte reviewed.

* Added todo for snowmobile gun.

- reverted NO_JOINT in CreatureBiteInfo causing error when compiling.

* Fix compile error caused by the develop merge

* Minor formatting

* Update people.cpp

---------

Co-authored-by: Sezz <sezzary@outlook.com>
Co-authored-by: Kubsy <80340234+Kubsy@users.noreply.github.com>
2023-04-28 16:52:35 +01:00
Kubsy
e220c649e5 Fix blade damaging player when initially disabled. 2023-04-28 11:05:50 +01:00
Kubsy
0a7fe24994 Update Changes.txt 2023-04-28 09:46:01 +01:00
davidmarr
8bf82ab0b3
Check levels in Gameflow.lua (#1087)
* Check levels in Gameflow.lua

Check if there is the title and at least one playable level to avoid crashing the game

* code review

* code review

* code review

* revisione codice

* code review

use of TENLog() instead of TENScriptException()

* code review

* Update FlowHandler.cpp

* Update FlowHandler.cpp

* Update FlowHandler.cpp

---------

Co-authored-by: Sezz <sezzary@outlook.com>
2023-04-28 08:22:50 +01:00
hispidence
e24a1d1fd0 Fix doc comment. 2023-04-27 14:48:24 +01:00
Kubsy
e7c01add78 Update Changes.txt 2023-04-26 11:58:42 +01:00
Sezz
875a44d0d5 Use C-style cast 2023-04-26 14:06:42 +10:00
Sezz
79add2d62d Clarify enum name 2023-04-26 14:05:04 +10:00
Sezz
1ee85ce26b Formatting 2023-04-26 14:03:18 +10:00
Nemoel-Tomo
b7e2aaf18b
multiusable keyholes (#1082)
* multi useable keyholes

* removed hardcoded keycard slots, key anim number = ocb number

* changed enum name

* fixed a compile error
2023-04-25 20:48:09 +01:00
Sezz
2b417e5745 Init bar values correctly 2023-04-25 14:35:16 +10:00
Kubsy
aa9a7a394a Update Changes.txt 2023-04-24 20:35:05 +01:00
Joey Quint
6d9c03ea36 Fix crash if ID_LITTLE_BEETLE exists and ID_BATS_EMITTER does not
Copy-paste error
2023-04-24 21:31:42 +02:00
MontyTRC89
c617fbecdd v142 for debug 2023-04-24 10:28:42 +02:00
Sezz
5d54453fce Remove namespace invocation 2023-04-24 17:06:19 +10:00
Sezz
f1c2eaaa12 Move constant 2023-04-24 16:46:43 +10:00
Sezz
8afe89cc04 Simplify status bars 2023-04-24 15:13:42 +10:00
Sezz
fe6e9294ed Formatting 2023-04-24 13:57:46 +10:00
TokyoSU
13f1ae1076 Fix compilation error for Cowboy 2023-04-23 23:08:23 +02:00
Kubsy
e8152c7e5d Update Changes.txt 2023-04-23 14:48:04 +01:00
davidmarr
c10eeaf27a
String:SetTranslated() method and isStringDisplaying() function. (#1079)
* string:SetTranslated() method and isStringDisplaying() function.

The string:SetTranslated() method sets the translated parameter. If it is true, this will be the key string for the translation that will be displayed. If it is false, this will be the string that will be displayed.
The isStringDisplaying() function checks whether the string is displayed. It returns the bool true if it is shown, false if it is hidden.

* DisplayString::SetTranslated @tparam

Corrected @tparam argument name of DisplayString::SetTranslated() method.

* Corrected method name.

capitalized the first letter of the method name
StringsHandler::IsStringDisplaying()

* Corrected method name.

capitalized the first letter of the string:IsStringDisplaying() method name.

* Corrected method name.

Capitalized the first letter of the method name
StringsHandler::IsStringDisplaying()

* Update DisplayString.cpp

code improvements

* code improvements

code improvements

* code improvements

code improvements
2023-04-23 14:45:20 +01:00
TokyoSU
f49e00579a
Implemented cowboy (#1071) 2023-04-23 14:44:30 +01:00
Sezz
903e1bf55e Formatting 2023-04-22 15:37:27 +10:00
Nemoel-Tomo
2b49e4edcf
fixed targeting (#1080) 2023-04-21 19:14:32 +01:00
Kubsy
5c84d59f4e Revert "Visual Studio 2019 solution (#1076)"
This reverts commit 3482e21745.
2023-04-21 10:52:31 +01:00
davidmarr
3482e21745
Visual Studio 2019 solution (#1076)
Fixed the version needed to compile the project in Visual Studio 2019
2023-04-21 10:44:39 +01:00