Commit graph

8102 commits

Author SHA1 Message Date
Sezz
b5b133911f
Initialize with a z (#1077)
* Initialise -> initialize

* Update new functions

* Fix typo
2023-04-21 10:39:31 +01:00
Sezz
4199b296de Use references 2023-04-21 18:02:01 +10:00
Sezz
bdb2388061 Merge branch 'develop' into better_look_camera 2023-04-21 17:18:39 +10:00
Sezz
2ca8812c93 Fix formatting 2023-04-21 14:29:14 +10:00
TokyoSU
da2066f51a
Implemented Claw Mutant from TR3 (#1061)
* Foundation commit for ID_MONSTER_MUTANT

* Implemented claw mutant from TR3

* Fixed vs2019 project

* Fixed scripting for claw mutant

* finished plasma ball effect

* Improved claw mutant

Fixed blood not appearing.
Fixed precision for the projectile.

* Improved precision for claw mutant

Now it take lara being crouch into account.

* Demagic and reformat

* Formatting; use GetAnimData()

* Fix merge error

* Refine claw mutant enums and constants

* Update Changes.txt

* Increased the attack range in idle.

---------

Co-authored-by: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Co-authored-by: Nemoel-Tomo <tomo_669@hotmail.com>
Co-authored-by: Sezz <sezzary@outlook.com>
Co-authored-by: Kubsy <80340234+Kubsy@users.noreply.github.com>
2023-04-20 18:13:43 +01:00
Kubsy
4419345f93 Update Changes.txt 2023-04-19 18:44:51 +01:00
Kubsy
eb0fe2d154 Update Changes.txt 2023-04-19 18:41:54 +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
d936a11496 Remove INVALID_2D_POSITION constant 2023-04-19 13:27:28 +10:00
Sezz
fdf0ef02d8 Merge branch 'develop' into sezz_sprites_in_2d_space 2023-04-19 00:50:27 +10:00
Sezz
f39c6d9d0f Restore missing line 2023-04-17 21:28:00 +10:00
Kubsy
c8fb42fb2f Update Changes.txt 2023-04-15 17:05:45 +01:00
Kubsy
beef5eb7e0
wall mounted blade port (#1067)
* port blade

* fix inverted state enum

* format

* Fixed collision and added blood

- Changed enums name.
- Changed anim name.

* Formatting

* Update collide item

* Update collide_item.cpp

* Fixed collision and damage when not triggered

---------

Co-authored-by: TokyoSU <77746747+TokyoSU@users.noreply.github.com>
Co-authored-by: Sezz <sezzary@outlook.com>
2023-04-15 17:04:33 +01:00
Sezz
319f638b54 Make namespace more specific 2023-04-16 00:04:18 +10:00
Sezz
c75ad39ac9 Use const in HUD methods 2023-04-15 22:18:52 +10:00
Sezz
de14807d55 Remove this-> 2023-04-15 22:03:35 +10:00
Kubsy
74544b3688 Update Changes.txt 2023-04-15 11:41:38 +01:00
Kubsy
1b86ade5f2 Fix spiky wall speed value 2023-04-15 11:39:29 +01:00
Kubsy
96df35ceb6 Update Changes.txt 2023-04-15 10:16:06 +01:00
Sezz
2ba7ba4a79 Remove room decomp comments 2023-04-15 16:02:07 +10:00
Sezz
f0b0fbfe63 Fix cold exposure when dry 2023-04-15 14:13:22 +10:00
Sezz
3107db31b1
Weapon handling refactors (#1035)
* Make some sense of dual weapon code

* Simplify weapon light flash

* Use references in weapon code; simplify flare

* Rename

* Simplify flare light colour calculation

* Organise

* Change elelelelif to switch case

* Remerge

* Simplify

* Make functions static; combine functions

* Add forward declarations

* Simplify

* Split smoke offsets into a getter function

* Use std::array

* Use "for each" loop

* Reduce copy-paste

* Update flare code

* Convert to switch cases

* Update lara_two_guns.cpp

* Simplify

* Merge

* Fix revolver reholstering

* Update lara_two_guns.cpp

* Disambiguate names

* Add GetWeaponAnimData()

* Fix revolver gunflash

* Braces

* Rename variable
2023-04-13 15:33:14 +01:00
Sezz
37d0e4f8af Update Renderer11DrawMenu.cpp 2023-04-14 00:32:20 +10:00
Sezz
707c980688 Update debug stats drawing 2023-04-14 00:31:30 +10:00
Sezz
f61f4dde76 Simplify freefall velocity calculation 2023-04-13 21:10:00 +10:00
Sezz
44512a49f6 Use auto 2023-04-13 20:27:38 +10:00
Sezz
26e4b3d500 Refine footprint sfx getter; use std::unordered_map for streamers 2023-04-13 19:42:46 +10: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
Nemoel-Tomo
e0d982be9b
removed wraith trap animations (#1063)
* wraith trap fix

* fixed a bug with target finding

* note
2023-04-12 14:49:14 +01:00
Sezz
93341ca823
Further split LaraInfo (#1066) 2023-04-12 14:44:13 +01:00
hispidence
5d03947991 Correct some doc comments and regen documentation. 2023-04-11 21:29:59 +01:00
Sezz
ec365f2120 Formatting 2023-04-10 21:49:46 +10:00
Nemoel-Tomo
1c9cf559aa
Tomo hotfix wraiths (#1060)
* hotfix wraith

* hotfix2
2023-04-10 11:35:34 +01:00
Sezz
23b7b6ca6b Remove old comment 2023-04-10 13:01:14 +10:00
Sezz
0309931301 Add comment 2023-04-10 12:59:40 +10:00
Sezz
75f3a880b1 Revert camera swivel when sliding backwards 2023-04-09 20:54:47 +10:00
Sezz
1fe79d3fbc Simplify ResetPlayerLean() 2023-04-09 20:25:31 +10:00
Sezz
7cc43febed Simplify ResetPlayerFlex() 2023-04-09 19:51:14 +10:00
Sezz
73ce16b092 Define all remaining defaults in player structs; remove unused enum 2023-04-09 19:39:39 +10:00
Sezz
05e2d17814 Remove duplicate includes 2023-04-09 19:16:30 +10:00
richardba
2f126f9d98
Cleanup in Visual Studio project files (#1049)
- Cleans up the visual studio vcxproj files
- Make both solutions up to date with each other
- This is the first commit for a series of commits
to create a synced compatibility between vs2019
and vs2022
2023-04-09 09:33:12 +01:00
Kubsy
332354a0fd Update Resources.rc 2023-04-08 19:24:11 +01:00
Sezz
7829a863ca Update Changes.txt 2023-04-06 20:57:51 +10:00
Sezz
fd1e2e4b3c Minor formatting 2023-04-06 20:51:32 +10:00
Kubsy
310cb0a84d Update Changes.txt 2023-04-05 15:06:16 +01:00
Nemoel-Tomo
3222551d37
object tint for TR5 light objects (#1048)
* finished lights

* Fix formatting

* Formatting

* Update itemdata.h

---------

Co-authored-by: Sezz <sezzary@outlook.com>
2023-04-05 14:59:01 +01:00
Kubsy
1a190356ce Update Changes.txt 2023-04-05 11:21:11 +01:00
Sezz
5dca1723e3 Fix big gun barrel rotation and creature bone rotation 2023-04-05 13:12:25 +10:00
Sezz
da0da134f0 Update animation.cpp 2023-04-05 02:18:00 +10:00
Sezz
09475d3ddd Fix TestLastFrame() 2023-04-05 02:15:02 +10:00