Commit graph

8102 commits

Author SHA1 Message Date
Sezz
1bb101207f Make pushable collision getter return struct 2023-09-29 15:37:27 +10:00
Sezz
9a119a7f52 Rename folder 2023-09-29 14:45:50 +10:00
Sezz
04aa1faf16 Minor renames 2023-09-29 14:43:11 +10:00
MontyTRC89
d650521af8 Allow dot = 0 door check pass in rooms collector 2023-09-28 10:16:32 +02:00
Lwmte
1ecf28e691 Fix zipline not following correct trajectory 2023-09-27 14:54:30 +02:00
Sezz
31b2fac4f8 Remove constant 2023-09-27 17:11:15 +10:00
Sezz
5d6e280185 Organising 2023-09-27 17:08:17 +10:00
Sezz
1f4d9a042d Don't display 0-count pickups 2023-09-27 15:50:44 +10:00
Sezz
df5c5c0d66 Update Renderer11DrawMenu.cpp 2023-09-26 22:06:23 +10:00
Sezz
7f5ec171ae
Update Changes.txt 2023-09-26 21:28:49 +10:00
davidmarr
b2a9bb5e07
Excess argument removed (#1220)
* Update InventoryHandler.cpp

Excess argument removed

* Update InventoryHandler.cpp

---------

Co-authored-by: Sezz <sezzary@outlook.com>
2023-09-26 20:22:30 +10:00
Sezz
6e0e71937e Update recently modified files 2023-09-26 20:16:21 +10:00
davidmarr
4ec2d60693
BLINK flag added for DisplayString (#1219)
* BLINK flag added for DisplayString

Added BLINK flag for DisplayString for blinking effect

* Initial commit

* Update Changes.txt

---------

Co-authored-by: Lwmte <3331699+Lwmte@users.noreply.github.com>
2023-09-26 08:30:29 +01:00
davidmarr
d5f84d0b89
Add display option in inventoryAdd function (#1215)
* Update InventoryHandler.cpp

added option to display item added to inventory

* Update InventoryHandler.cpp

* Update InventoryHandler.cpp

* Update InventoryHandler.cpp

missed closing parenthesis

* Update InventoryHandler.cpp

* Added argument to choose whether to execute the PickedUpObject() function within AddDisplayPickup()

added default argument to not execute PickedUpObject() function within AddDisplayPickup()

* Update InventoryHandler.cpp

* Restore comment

* Use value_or()

* Simplify optionals handing

* Increment count properly

* Update InventoryHandler.cpp

---------

Co-authored-by: Sezz <sezzary@outlook.com>
Co-authored-by: Lwmte <3331699+Lwmte@users.noreply.github.com>
2023-09-26 08:27:01 +01:00
Adngel
2164ba8d6b Added OCB check during the loop movement.
(So if pushable it taken to the "goal" position, builder can deactivate putting a negative ocb, and lara won't keep pushing/pulling them.
2023-09-25 14:32:19 +02:00
Kubsy
473cc96454 add EnableLoadSave to gameflow 2023-09-25 11:10:06 +01:00
Jakub
bfe545e375
Savegame functions (#1217)
* Possibly make loading work

* fix compile error

* Move LevelComplete reset to more appropriate place

* Implement Delete save and move functions to FlowHandler

* Fixes and optimizations

* Rename global

* rename func names to more meaningful ones, correct grammar.

* add a check to see if file actually exists before loading

* correct.

* add LogLevel for Delete() func

* Revert "correct."

This reverts commit 5e332bba95.

* Revert "add a check to see if file actually exists before loading"

This reverts commit ef9fb63aa2.

* Fix attempts to load savegames from incorrect slots

* Simplify savegame delete function

* Update Changes.txt

* Minor changes

* Disable Save/Load quick actions when EnableLoadSave is false

* Formatting

* Implement enable load/save into lua

* Fix merge

* Update Changes.txt

* Update savegame.cpp

* Fix savegame count not properly increasing, don't reload headers every frame in menu

* Update savegame.cpp

* Set TimeInMenu default value to -1.0f

* Minor changes

---------

Co-authored-by: Lwmte <3331699+Lwmte@users.noreply.github.com>
Co-authored-by: Sezz <sezzary@outlook.com>
2023-09-25 11:06:40 +01:00
Sezz
9cdfa7e57b Update EffectsFunctions.cpp 2023-09-24 15:23:34 +10:00
Sezz
28847f6ce8 Update screen sprite doc comment 2023-09-24 15:23:08 +10:00
Sezz
4743235527 Further renames; apply origin type 2023-09-24 15:14:38 +10:00
Sezz
cbe464e8a6 Further renames and organisation 2023-09-24 14:40:33 +10:00
Sezz
82a7a5d5c7 Rename screen sprites to display sprites; prepare structures 2023-09-24 14:20:41 +10:00
Lwmte
1bd134258e Fix DisplayScreenSprite function 2023-09-24 00:15:12 +02:00
Lwmte
40c4ec538d Seemingly implement all 3 display sprite scaling modes except tile 2023-09-23 23:03:28 +02:00
Lwmte
285f3ee0ab Change scale calculation for display sprites 2023-09-23 14:41:03 +02:00
Adngel
75f50d59d0 Fix: Bounding box for assymetrical pushables. 2023-09-23 13:51:02 +02:00
Kubsy
e7378c7145 Merge branch 'develop' into renderer 2023-09-23 10:23:25 +01:00
Sezz
ae03c3e046 Update pickup summary handling 2023-09-23 18:22:01 +10:00
Lwmte
1d256322cf Make SystemStrings.lua loading optional 2023-09-23 08:34:27 +02:00
Adngel
44177ff11f Merge branch 'develop' into Adngel-pushables-remake 2023-09-22 19:12:52 +02:00
Adngel
1a80aca1f0 Hack: Water climbing onto dynamic bridge collider
To review once the floor data get refactored.
2023-09-22 18:20:25 +02:00
Adngel
24dc4fd02d Fix: orientation bug.
There was a problem that the pushable orientation was not resetting when it was raised from the water with a raising block.
2023-09-22 16:08:54 +02:00
Sezz
7881e4cf83 Update scale mode name 2023-09-20 18:26:40 +10:00
Sezz
ea869f1d1a Add dormant functionality for screen sprite scale modes 2023-09-20 16:35:43 +10:00
Sezz
bf3e6c4ce0 Update lara.cpp 2023-09-20 16:33:52 +10:00
Sezz
1c9c509dd8 Update PushableObject.h 2023-09-20 16:29:27 +10:00
Sezz
cf703f7be2 Update PushableObject.cpp 2023-09-20 16:28:52 +10:00
Sezz
7cd9763d37 Move anims; update anim names 2023-09-20 16:28:32 +10:00
Lwmte
2a2545d863 Update Changes.txt 2023-09-20 08:10:39 +02:00
Lwmte
484190cde4
Allow to access node events from scripting (#1213)
* Initial commit
* Use sol::optional instead of TypeOrNil
* Minor fix
* Decopypaste level file event loading
* Minor formatting

---------

Co-authored-by: Sezz <sezzary@outlook.com>
2023-09-20 09:06:39 +03:00
Sezz
5adc86253d Pushable bridge cleanup 2023-09-20 15:02:17 +10:00
Sezz
cfe88b6dc9 Rename files 2023-09-20 14:42:01 +10:00
Sezz
a47ad5370f More cleanup 2023-09-20 14:26:16 +10:00
Sezz
ae82010bb4 Minor changes 2023-09-18 12:49:43 +10:00
MontyTRC89
4c7a240e1e Possible fix for sprites sorting reported bugs 2023-09-14 11:45:06 +02:00
Sezz
a30e991b8a Update sprite scaling 2023-09-12 15:53:58 +10:00
Sezz
555e826429 scale 2023-09-11 19:49:12 +10:00
Sezz
909ef929dc Merge branch 'renderer' of https://github.com/MontyTRC89/TombEngine into renderer 2023-09-11 15:41:58 +10:00
Sezz
1b2529a3e5 Scale properly 2023-09-11 15:41:07 +10:00
Sezz
38d3c49886
Add newline 2023-09-10 23:17:57 +10:00