Commit graph

8102 commits

Author SHA1 Message Date
Sezz
ec86731d45 Maybe fix climbing through bridges on walls 2023-04-03 21:28:23 +10:00
Sezz
a077b6fa1f Merge branch 'develop' of https://github.com/MontyTRC89/TombEngine into develop 2023-04-03 19:00:38 +10:00
Sezz
6028e42eb5 Formatting 2023-04-03 19:00:17 +10:00
Kubsy
7123bc4680 Update Changes.txt 2023-04-03 09:44:14 +01:00
davidmarr
345ff5bbe8
Added the LUA SetFlags() function (#1036)
* Added the LUA SetFlags()

Added the LUA SetFlags() function. It allows you to change the flags options of a string

* Update DisplayString.cpp

* Update DisplayString.cpp

added usage example

* Added possible parameters in the example

Full example
2023-04-03 09:40:57 +01:00
Sezz
1feef667f3 Use SayNo() 2023-04-03 11:53:31 +10:00
hispidence
c5fa1227d6 Fix #936. It's not the best idea to have error-checking flags on in a release build, but until we do something like distribute a development binary alongside an optimised binary, this is a reasonable solution. 2023-04-01 20:23:38 +01:00
Sezz
8c751421a6 Reorder declarations 2023-04-02 00:01:06 +11:00
Sezz
f08719f2a0 Simplify 2023-04-01 23:59:41 +11:00
Sezz
1adca7768e Revise footprint effect 2023-04-01 23:34:46 +11:00
Sezz
5b791d16a9 Formatting 2023-04-01 16:27:28 +11:00
Sezz
17bbf46ebf Merge branch 'develop' into better_look_camera 2023-04-01 15:03:44 +11:00
Sezz
f7e12279fe Merge branch 'develop' into sezz_sprites_in_2d_space 2023-04-01 14:53:57 +11:00
hispidence
51e083a7de Fixed and regened docs; partial fix for #750 2023-03-31 20:51:44 +01:00
Stranger1992
68cfb24d72 Update Changes.txt 2023-03-30 15:17:24 +01:00
richardba
6e83b4ebbd
inventory transparency and vs2022 support (#1045)
* inventory transparency and vs2022 support

* Tiny formatting changes

---------

Co-authored-by: Sezz <sezzary@outlook.com>
2023-03-31 00:50:15 +11:00
Sezz
5b409aed93 Demagic anim numbers 2023-03-29 13:39:22 +11:00
Sezz
5c53533c7f Update Changes.txt 2023-03-29 12:45:21 +11:00
Sezz
8fdccc4ea7 Update comments 2023-03-29 02:46:30 +11:00
Sezz
151373d397 Fix big gun barrel rotation 2023-03-29 01:26:46 +11:00
Sezz
5dacd77234 Merge branch 'develop' of https://github.com/MontyTRC89/TombEngine into develop 2023-03-29 01:15:35 +11:00
Sezz
cb9440358e Update changelog; rename freshly edited files 2023-03-29 01:15:05 +11:00
Nemoel-Tomo
ac7de10df3
Wraith fix (#1038)
* Bespoke slot for Wraith_Trap (ID_WRAITH_TRAP)(1086)

* progress

* almost finished visuals

* update

* formatting

* formatting

* formatting3

* Updated Object ID for wraith trap:

ID_WRAITH_TRAP ObjID: #1087

* Added Wraith Trap Lua Doc listing

* added wraith_trap, everything works so far

* finished wraith and wraith traps

wraith_trap OCB 0 = without effect
wraith_trap OCB 1 = with effects

* removed wraith3 info

* removed remnant of wraith3Info

* Fix formatting

* fixed burning target when target is floating on water

* removed note

---------

Co-authored-by: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Co-authored-by: Sezz <sezzary@outlook.com>
2023-03-29 01:09:49 +11:00
Sezz
151042c226 Revert "Maybe fix starting fall velocity when sliding off the edge of a slippery slope"
This reverts commit 6fa1692bac.
2023-03-27 17:50:04 +11:00
Sezz
6fa1692bac Maybe fix starting fall velocity when sliding off the edge of a slippery slope 2023-03-27 17:21:47 +11:00
Sezz
6af691d1b4 Tweak pickup summary display 2023-03-27 17:07:59 +11:00
Sezz
74f8775d04 Update Changes.txt 2023-03-27 16:58:43 +11:00
Sezz
32cf1a49be Fix forward velocity clearing when landing 2023-03-27 16:51:31 +11:00
Sezz
0c6ba4bb99 Move surface normal converter to floordata 2023-03-26 17:40:53 +11:00
Sezz
ccf05b75f2 Fix floordata error 2023-03-26 16:48:16 +11:00
Kubsy
c6ce202fb2 * Fix dozy cheat always giving uzi weapons even if not present in wad. 2023-03-25 21:47:20 +00:00
Kubsy
4b3d9acaa1 Update Changes.txt 2023-03-25 15:29:04 +00:00
richardba
cc8e5cac29
Fixing shaders for lighting and inventory (#1042) 2023-03-25 15:26:23 +00:00
Stranger1992
42e38351dc Update Changes.txt 2023-03-25 15:13:27 +00:00
Stranger1992
878ada7a4d Formatting and clarity 2023-03-25 15:12:02 +00:00
Stranger1992
2467c6c4c0 Merge branch 'develop' of https://github.com/MontyTRC89/TombEngine into develop 2023-03-25 14:58:56 +00:00
Stranger1992
810675d7e2 Update Changes.txt 2023-03-25 14:58:43 +00:00
Kubsy
18fd1deb36
Revert "Fixing shaders for lighting and inventory (#1040)" (#1041)
This reverts commit 3423806b60.
2023-03-25 14:40:40 +00:00
richardba
3423806b60
Fixing shaders for lighting and inventory (#1040)
* Fixing shaders for lighting and inventory

* Fixing shaders for lighting and inventory

* Fixing shaders for lighting and inventory

---------

Co-authored-by: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
2023-03-25 14:27:52 +00:00
Sezz
dcabb611c7 Merge branch 'develop' of https://github.com/MontyTRC89/TombEngine into develop 2023-03-26 01:19:47 +11:00
Sezz
e3cb2b0ed0 Slightly improve hair 2023-03-26 01:19:19 +11:00
Kubsy
0f9ac2a323 Update Changes.txt 2023-03-25 14:07:43 +00:00
Nemoel-Tomo
ba47fb1273
Corpse object (#1031)
* start to add visuals to the cadaver effect

* Add new slot - 1086: ID_CORPSE

* store changes so that I can switch to another branch

* update

* progress

* add falling corpse (OCB1)

* fixed hitroutine on not intelligent enemies in los.cpp

fixed Compy idle before die animation, finished corpse object

* formatting

* renamed cadaver to corpse

* Fix formatting

* removed effectID corpse, give the corpse object the effect only

trigger/antitrigger the effect on the corpse object as your wish

* compies now attack only on floor lying cadavers

* corpse object should fall down even if not triggered

---------

Co-authored-by: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Co-authored-by: Sezz <sezzary@outlook.com>
Co-authored-by: Kubsy <80340234+Kubsy@users.noreply.github.com>
2023-03-25 14:03:28 +00:00
Sezz
22aeeb256c Update items.cpp 2023-03-26 00:19:41 +11:00
Sezz
d353c2085b Combine AnimateItem() and AnimateLara() 2023-03-26 00:16:39 +11:00
Sezz
be1742278f
Simple animation refactors (#1034)
* Minor refactors

* Use quaternions for bones

* Use EulerAngles for mutator rotation

* Simplify and add comments

* Simplify; add GetAnimData() wrapper function

* Spaces

* Corrections

* Fix errors

* Maybe fix naming ambiguity

* Add comments

* Fix error

* Fix parameter name

* Fix compass needle

* Add simpler frame interpolation function

* Names

* Update renderer animation routine

* Delete old GetFrame() function.

* Rename function

* Tabulation

* Make pointers const

* Update animation.h

* Remove silly casts

* Fix typo; add comments

* Formatting

* Simplify

* Fix function name ambiguity

* Names
2023-03-25 09:33:33 +00:00
Sezz
a4e07855d8 Rename new file according to conventions; slightly expand neck sphere for hair collision 2023-03-25 13:23:59 +11:00
hispidence
71d2d047b1 Regenerated docs with version bumped to 1.0.8. 2023-03-24 18:27:38 +00:00
Kubsy
cdf8f0b8ec Update Changes.txt 2023-03-24 12:23:19 +00:00
Kubsy
c9c8ade899 Update Changes.txt 2023-03-24 12:21:14 +00:00