Commit graph

7329 commits

Author SHA1 Message Date
MontyTRC89
b9045f91c7 Fog bulbs for sky and horizon 2023-05-29 05:56:59 +02:00
Jakub
7e69679ec4
Update Changes.txt 2023-05-28 23:35:19 +01:00
TonyTEN1
8846eb18fc
Fix and improvements. (#1128)
* Fixed crash when rendering lara (pseudorandom crash due to invalid access memory).
· Lara doesn't have MAX_BONES and that's causing an access violation sometimes because memcpy was copying data that actually isn't there into the bones matrices.
* Improved level loading by using std::async.
* Renaming.
* Rename 2 xd
2023-05-29 00:13:57 +02:00
Lwmte
ca76375538 Fix for previous commit 2023-05-29 00:03:20 +02:00
Lwmte
2fae2e2413 Fix soundtrack position not restoring if same track is already playing 2023-05-29 00:00:26 +02:00
MontyTRC89
2964493237 Merge branch 'develop' into renderer_fixes_and_features
# Conflicts:
#	TombEngine/Renderer/Renderer11DrawEffect.cpp
2023-05-27 18:14:18 +02:00
MontyTRC89
18d1144b4a Merge branch 'renderer_fixes_and_features' of https://github.com/MontyTRC89/TombEngine into renderer_fixes_and_features 2023-05-27 18:12:07 +02:00
MontyTRC89
c0f8a17da4 Fixed repository 2023-05-27 18:11:55 +02:00
Sezz
3c19a43993
Sprites in 2D space (#1074)
* Prototype sprites in screen space

* Convert if-else block to switch case

* Correctly scale screen space sprites according to screen aspect ratio

* Add comment

* Add utility function

* Fix NDC conversion

* Maybe fix wrong vertex order

* Perfect 2D sprite scaling; rename functions

* Fix operators

* Fix upside down sprites

* Remove INVALID_2D_POSITION constant

* Update comment

* Remove debug code

* Simplify

* Remove stub function

* Fix error

* Rename parameters

---------

Co-authored-by: Kubsy <kubadd475@gmail.com>
2023-05-27 15:22:50 +01:00
Lwmte
f39f00df39 Fix compiler warning 2023-05-27 13:52:48 +02:00
Lwmte
95d650bd23 Merge branch 'develop' into renderer_fixes_and_features 2023-05-27 13:47:35 +02:00
Lwmte
355ae4a9de Oscillate compass needle in inventory 2023-05-27 12:28:58 +02:00
Lwmte
06182215d7
Resolve compiler warning 4554 (#1123)
* Resolve 4554
* Update TombEngine.vcxproj
* Update tomb4fx.cpp
* Fix warnings as errors flag for release build
* Introduce some fixes for W4 warnings
* Update object_helper.cpp
* Minor formatting
* Also solve 5051

---------

Co-authored-by: Sezz <sezzary@outlook.com>
2023-05-27 11:39:33 +02:00
Lwmte
27e2fe80df Fix missing heavytrigger checks for node events activated from classic triggers 2023-05-27 11:38:15 +02:00
MontyTRC89
27577f00c7 Fixed project paths 2023-05-27 06:27:03 +02:00
MontyTRC89
3070c6e583 Merge branch 'develop' into renderer_fixes_and_features 2023-05-27 06:17:10 +02:00
MontyTRC89
d0b6aad087 Fixed sprites in fog bulbs 2023-05-27 06:16:46 +02:00
Lwmte
2810ef6386 Add nullptr checks 2023-05-26 20:39:14 +02:00
Lwmte
853ab8b826 Use item index instead of weird vector operator in savegame saving 2023-05-26 20:27:33 +02:00
Lwmte
e671f80fac Fix rope drawing again 2023-05-26 19:02:53 +02:00
Kubsy
f2b5fc2197
Update Changes.txt 2023-05-26 08:29:28 +01:00
Lwmte
4e205eb6a7 Remove hardcoded meshswap for SEARCH_OBJECT_4 in flipped rooms 2023-05-26 08:48:46 +02:00
Lwmte
30bb7ae7bc Update Changes.txt 2023-05-26 08:18:39 +02:00
Sezz
74d7d104fa Add notes section to Damocles sword 2023-05-26 15:25:58 +10:00
Lwmte
219b3d78e4
Single flare pickup (#1115)
* Add ability to pick up a single inactive flare as an inventory item

* Fix incorrect pickup of an active flare in a mass pickup

* Fix remaining cases of picking up inactive flare as ordinary item

* Fix some conditions that break flare pickup from a crawl state

* Attempt to fix active flare not picked up in crawl state

* Remove unreachable state checks
2023-05-25 20:17:14 +01:00
Kubsy
e2e02faa16 Update Changes.txt 2023-05-25 12:24:05 +01:00
Sezz
9fd79f0842 Update names 2023-05-25 16:32:08 +10:00
Sezz
5edef6fa80 Make zip line constants local 2023-05-25 16:27:42 +10:00
Sezz
0aef0d2a10 Rename zip line files 2023-05-25 15:41:13 +10:00
Sezz
1db1435d71 Move zip line code to namespace; organise constants; remove AnimateItem() call; use forward decls 2023-05-25 15:37:42 +10:00
Sezz
feab414448 Make player align smoothly to zip line 2023-05-25 15:29:31 +10:00
Sezz
2078d0d0b2 Use references in zip line code; call IsHeld() 2023-05-25 15:06:39 +10:00
Sezz
366ead88f2 Remove default alpha values from math methods 2023-05-25 14:54:49 +10:00
Sezz
8db97e3b8b Adjust fake epsilon default in EulerAngles class 2023-05-25 14:37:59 +10:00
Sezz
8263989599 Fix zipline player lean angle bounds 2023-05-25 14:34:42 +10:00
Lwmte
f2cab33e2f Fix player lean not resetting in idle state, invert zipline condition to simplify code 2023-05-25 01:48:34 +02:00
Lwmte
9ae025ffa2 Refactor classic rollingball code, fix #1108 2023-05-25 01:18:04 +02:00
Kubsy
4f8e606207 delete zipline changelog because they don't work fully 2023-05-24 18:39:14 +01:00
MontyTRC89
92497bef82 Merge branch 'develop' into renderer_fixes_and_features 2023-05-24 14:50:38 +02:00
MontyTRC89
bbfa9f0a7e Merge branch 'develop' into renderer_fixes_and_features
# Conflicts:
#	TombEngine/Renderer/Renderer11.cpp
#	TombEngine/Renderer/Renderer11Draw.cpp
#	TombEngine/TombEngine.vcxproj.user
2023-05-24 14:50:14 +02:00
Lwmte
322d5820b3 Fade flare in instead of flashing in 2023-05-24 09:15:35 +02:00
Sezz
ed7d8bb4dc Add comments 2023-05-24 14:46:27 +10:00
Sezz
188926baa6 Make flare constants as local as possible; define more constants 2023-05-24 14:29:30 +10:00
Lwmte
c7c425466c Fix zipline not working properly 2023-05-23 22:16:41 +02:00
Lwmte
45dbb5bd98 Fix warning MSB8004 2023-05-23 21:45:37 +02:00
Lwmte
5ff674f749 Fix grenade firing angle 2023-05-23 21:36:19 +02:00
Lwmte
926d827f0e Throw flare a bit earlier than actual death 2023-05-23 21:28:39 +02:00
Lwmte
afbb2146f9 Fix flare brightness 2023-05-23 21:13:31 +02:00
Lwmte
8ff5aa39c2 Automatically delete debug info from release build folder 2023-05-23 08:32:30 +02:00
hispidence
96138df360 Remove leading '\\' from regex to fix it. 2023-05-22 23:43:24 +01:00