Commit graph

45 commits

Author SHA1 Message Date
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
b5b133911f
Initialize with a z (#1077)
* Initialise -> initialize

* Update new functions

* Fix typo
2023-04-21 10:39:31 +01:00
Nemoel-Tomo
13ef827c81
2-way puzzle holes (#1068)
* first attempt for 2 way puzzleholes

* finished puzzle holes, spiky wall speed fix

* spiky wall speed controllable with ocb

* Change remove puzzle animation number; formatting

* fix spiky wall damage

* align Lara to puzzledone

* Set last frame for puzzledone when level starts

* test

* test

* fixed 2 way puzzle hole bit flag

---------

Co-authored-by: Sezz <sezzary@outlook.com>
2023-04-19 18:38:29 +01:00
Sezz
5289517b4c
Animation refactors tier 2 (#1047)
* Properly handle setting animations from different slots

* Further dehardcode certain animation changes

* Use anim functions

* More conversions

* Use SetAnimation()

* Group ObjectInfo members

* Comments

* Test conversions

* Progress

* More conversions

* Rename functions to avoid confusion

* Rename parameter

* Update getters

* Fix error

* Fix bug with SetAnimation()

* Update vehicle animation handling

* Add anim function overloads

* Add SyncVehicleAnimation() for convenience

* Add commented block

* Group members in LEVEL struct

* Fix minecart wheels
2023-04-13 06:09:31 +01:00
Sezz
93341ca823
Further split LaraInfo (#1066) 2023-04-12 14:44:13 +01:00
Sezz
adc777bc2b Minor floordata revision 2023-03-12 10:36:12 +11:00
Adngel
dcdaac50ff Error fix
from pointer to reference update.
2023-02-04 11:49:05 +01:00
Adngel
99e050f4f8
Airlock Switch recreated. (#986)
* Airlock Switch recreated.

* Updated feedback

* Changed pointers by references.

* Formatting

* Add parentheses

* Unmade SwitchTrigger feedback from int to bool

Will be remade on a future branch once the airlock and switches were merged.

* Update Changes.txt

---------

Co-authored-by: Sezz <sezzary@outlook.com>
Co-authored-by: Kubsy <kubadd475@gmail.com>
2023-02-04 10:44:13 +00:00
Adngel
fface0419d
Switches fix (#987)
* Switches fix

* Update generic_switch.cpp

* Polishment of the switch influence area.

* Update Changes.txt

---------

Co-authored-by: Kubsy <kubadd475@gmail.com>
Co-authored-by: Kubsy <80340234+Kubsy@users.noreply.github.com>
2023-02-04 10:34:10 +00:00
Lwmte
545612d947 Pass real activator to most instances of legacy TestTriggers 2023-01-28 02:23:25 +02:00
Lwmte
23ffafd396 Fix savegame crash for disabled enemies with partially set activation mask 2023-01-12 19:26:07 +02:00
hispidence
b9a7445d06 Merge branch 'master' into TriggerEnhancements 2023-01-06 20:27:17 +00:00
Lwmte
81914dea14 Add an option to activate lua or node events from legacy triggers, demagic masks 2023-01-03 15:37:12 +02:00
hispidence
8775ad5660 Give RemoveActiveItem a 'killed' arg so determine whether it should call OnKilled callbacks. Allow the distinction between 'killed' and 'destroyed' - a baddy killed with guns is killed, but their body remains, so they are not destroyed. 2023-01-02 19:24:37 +00:00
hispidence
6c78fa231e Initial implementation of trigger/antitrigger stuff for Lua API. 2022-12-30 15:58:52 +00:00
Sezz
b7e2542cc6 Change status flag 2022-12-13 14:00:36 +11:00
Sezz
7fcc453870 Move constants 2022-12-12 20:08:28 +11:00
Anatoly
53ce6192b9
Universal burn (#858)
* Initial Commit
* Fixes
* Process burn for Lara
* Save burn type in savegames
* Generalize burning effects into Effects::Items namespace
* Use flame types instead of ints, beautify item flame effect
* Add missing changes
* Add timeouts, adjust NPC burn speed
* Update TombEngine.vcxproj
* Reorganize AnimateItem to place ProcessSectorFlags there
* Implement real electric sparks
* Don't check for item burning on every frame
* Correct flame emitter size
* Add script function to set moveable effect
* Tune up sparkles
* Occasionally burn enemies on explosive damage
* Update TombEngine.vcxproj
* Add timeouts to effect script functions
* Cleanup
* Update Changes.txt
* Rename effect enums
* Change SetEffect timeout to -1 by default
2022-11-22 19:16:35 +02:00
Anatoly
697aea87eb
Enable mass pickup (#859)
* Enable mass pickup
* Update Changes.txt
* Remove getThisItemPlease
* Fix sarcophagus pickups
* Fix legacy pickup triggers not working
* Update Changes.txt
* Align pickups to surfaces
* Update pickup.cpp
* Update pickup.cpp
* Update Changes.txt
2022-11-20 05:29:08 +02:00
Raildex
0407c57755 Revert "Merge branch 'states_tier_3'"
This reverts commit d9be93c7cc, reversing
changes made to 16c5984002.
2022-11-04 13:10:13 +01:00
Sezz
57429a2233 Merge branch 'master' into states_tier_3 2022-10-11 12:34:52 +11:00
Sezz
1e79b431f8 Reformat LevelCameraInfo 2022-10-01 18:58:36 +10:00
Sezz
aaa8213b34 Merge branch 'master' into states_tier_3 2022-09-13 14:01:01 +10:00
Sezz
5bef92e760 WIP simplify stargate 2022-09-06 20:05:06 +10:00
Sezz
6abdf62acb Merge branch 'ten_beta' into states_tier_3 2022-07-01 13:40:29 +10:00
Lwmte
230dac03ca Remove some extremely old comments, rename function for consistency 2022-06-27 22:35:29 +03:00
Sezz
18f40566fd Merge branch 'ten_beta' into states_tier_3 2022-06-27 20:22:39 +10:00
Lwmte
cb8a4204bf Convert remaining direct HitPoints refs to DoDamage 2022-06-26 18:29:56 +03:00
Lwmte
82ee23b90b Update trigger.cpp 2022-06-23 16:11:37 +03:00
Lwmte
277b2b8ff6 Refactor ProcessSectorFlags, enable rapids drowning 2022-06-23 16:08:43 +03:00
Sezz
57e5ddf9cc Merge branch 'ten_beta' into states_tier_3 2022-06-12 23:02:07 +10:00
Lwmte
8ef2351a7c Bugfixes (tier 2) (#539)
* Use spiky gunflash for MP5 if available

* Make order to Test/Touch/Mesh bits in ItemInfo and convert all to uint64 properly

* Fix TR4 sentry gun using wrong rotations after wad conversion

* Fix find and replace error

* Convert ExplodingDeath to also use all 64-bit range

* Fix stack overflow due to strange compiler quirks

* Fix gunflashes for TR4 enemies

* Reorganize sound condition checking to finally resolve all problems

* Remove weird sound play condition casts

* Update ten_savegame.fbs

* Update ten_savegame_generated.h

* Convert meshbits back to 32 bit

* Update Renderer11DrawEffect.cpp

* Enable multiple blend modes for particles, add poisoned particles support

* Reduce max poison potency

* Add debug box output for pathfinding

* Properly clean and restore game and level statistics

* Fix wrong condition in keyhole collision check which led to infinite inventory call

* Fix keyholes again

* Save particles in savegames

* Update tomb4fx.h

* Clean up particle code, save quadbike info in savegames

* Save UPV info in savegames

* Allow quadbike to ride through shallow water

* Update quad.cpp

* Make slowdown dependent on water depth

* Fix epic bug with calculating water depth

* Clean up quadbike water code

* Remove incorrect debug box drawing

* Tidy up current iteration of joint bit helpers

* Customize drag for water and quicksand separately

* Use auto* instead of auto to make code more readable

* Add quadbike hack for ending up in shallow underwater caverns

Co-authored-by: Sezz
2022-06-12 22:01:24 +10:00
Lwmte
0bc5a082a7 Fix several issues with water level (waterskin, footsteps) 2022-06-08 05:22:34 +03:00
Lwmte
90cb08b63b Demagic FPS 2022-06-05 03:56:08 +03:00
Sezz
12de476681 Merge branch 'ten_beta' into states_tier_3 2022-05-25 14:53:55 +10:00
Lwmte
350f3f0a0b Fix includes 2022-05-24 04:43:36 +03:00
Sezz
4245a77bd2 Merge branch 'ten_beta' into states_tier_3 2022-05-17 16:56:02 +10:00
MontyTRC89
a120c73f96 Added legacy secrets system 2022-05-15 05:53:01 +02:00
Sezz
db2e47a943 Merge branch 'ten_beta' into states_tier_3 2022-05-14 20:14:58 +10:00
Sezz
546ab522ca Rename baddie back to baddy 2022-05-14 13:45:21 +10:00
Lwmte
e64c518602 Update trigger.cpp 2022-05-13 19:02:27 +03:00
Sezz
98449bdbbf Merge branch 'ten_beta' into states_tier_3 2022-05-10 17:27:16 +10:00
MontyTRC89
f1e7c6fbfc All files under the same project; Renamed TR5Main to TombEngine; Cleaned repository; 2022-05-08 06:52:04 +02:00
Renamed from TR5Main/Game/control/trigger.cpp (Browse further)