Commit graph

8102 commits

Author SHA1 Message Date
Sezz
5a38dc465d Major cleanup 2023-05-30 00:45:16 +10:00
Sezz
df1afd6994 Pulse crosshair when entity is hit 2023-05-29 21:36:20 +10:00
Sezz
1205eab140 Presentation tweaks 2023-05-29 21:15:55 +10:00
Sezz
21d56a7cd3 Adjust values 2023-05-29 20:47:45 +10:00
Sezz
dfc843ec26 Fancier crosshairs 2023-05-29 17:55:17 +10:00
Sezz
ffa5627834 Update object ID enum; minor target highlighter cleanup 2023-05-29 16:26:38 +10:00
MontyTRC89
71d2beb1a7 Merge branch 'develop' into renderer_fixes_and_features 2023-05-29 05:57:13 +02:00
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
Lwmte
ee0baafd0f Fix drawing 2023-05-28 23:21:42 +02:00
Sezz
9b15ffa82a Change sprite ID 2023-05-29 01:57:43 +10:00
Sezz
cfcefaaf2e Renames 2023-05-29 00:57:30 +10:00
Sezz
5019e5261e Update TargetHighlighter.cpp 2023-05-29 00:41:36 +10:00
Sezz
e9ff9deda6 Minor changes 2023-05-29 00:05:06 +10:00
Sezz
7afaaedb89 Simplify 2023-05-28 23:01:18 +10:00
Sezz
69da6fe202 Corrections 2023-05-28 22:42:15 +10:00
Sezz
d769f38787 Improve presentation 2023-05-28 22:17:13 +10:00
Sezz
b3aae3706b Add scaling in and out 2023-05-28 18:53:52 +10: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
Sezz
85b7d396e7 Clear targets when reholstering weapon 2023-05-28 00:02:08 +10:00
Sezz
ffeece371e Initial commit 2023-05-27 23:23:39 +10: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
Sezz
12b140cdc3 Rename parameters 2023-05-27 15:24:51 +10:00
Sezz
04ec27ea20 Fix error 2023-05-27 15:22:07 +10:00
Sezz
5a963aa1ea Remove stub function 2023-05-27 14:57:58 +10:00
Sezz
d22fd9ddf8 Simplify 2023-05-27 14:57:01 +10: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
Kubsy
bca2016bb7 Merge branch 'develop' into sezz_sprites_in_2d_space 2023-05-26 20:49:56 +01: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
Sezz
a480d04cf2 Remove debug code 2023-05-27 01:30:08 +10:00
Sezz
a8e90e82d6 Update comment 2023-05-26 23:33:34 +10:00
Sezz
3a1b62811d Merge branch 'develop' into sezz_sprites_in_2d_space 2023-05-26 23:12:19 +10: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