Commit graph

3526 commits

Author SHA1 Message Date
Sezz
758b8d34c2 Fix corner shimmy; fix immobile UPV; cleanup 2022-03-22 20:41:01 +11:00
Sezz
0538d8f13b Fix instance of search-and-replace going beyond its scope; cleanup 2022-03-21 18:00:19 +11:00
Sezz
f128004c36 Fix slide stutter when sliding back 2022-03-20 16:19:54 +11:00
Sezz
0fd94f2dbc Fix level load crash with certain items present; cleanup 2022-03-20 14:18:36 +11:00
Sezz
d215e572a6 aaaa 2022-03-19 23:31:09 +11:00
Sezz
352fb81082 Merge branch 'master' into state_cleaning_tier_2 2022-03-19 23:17:33 +11:00
Sezz
c8587e290d Manual cherrypick. ;) 2022-03-19 23:07:40 +11:00
Sezz
280e625227 Revert "Fix flare bug and escape a calamity; cleanup"
This reverts commit c40b9f635f.
2022-03-19 23:05:40 +11:00
Sezz
872e4dfcd5 Merge branch 'master' into state_cleaning_tier_2 2022-03-19 22:58:09 +11:00
Sezz
d0031cc271 Fix leaning underwater; cleanup 2022-03-19 22:55:23 +11:00
Stranger1992
958950b549 Merge branch 'TEN_Sound_Refactor' 2022-03-18 22:31:10 +00:00
Stranger1992
a5c9a3ece4 Revert "Squashed commit of the following:"
This reverts commit 419055d073.
2022-03-18 22:30:57 +00:00
Sezz
c40b9f635f Fix flare bug and escape a calamity; cleanup 2022-03-18 21:13:48 +00:00
Sezz
7fa0b9ceb3 Fix swandive into water; move some functions; cleanup 2022-03-19 02:32:22 +11:00
Sezz
50b722ee42 Allow crouch roll while holding weapons; hold flare out in front in soft splat state; cleanup 2022-03-18 22:51:53 +11:00
Sezz
8091b18bd2 Fix flare bug and escape a calamity; cleanup 2022-03-18 20:48:39 +11:00
Sezz
891fe3b203 Make turning in water tread states smoother; cleanup 2022-03-18 19:49:25 +11:00
Sezz
08ebe58110 Merge branch 'master' into state_cleaning_tier_2 2022-03-18 17:21:41 +11:00
Sezz
86be0cfad6 Merge branch 'Sezz_StateChange2+Stranger1992_SoundRefactor' into state_cleaning_tier_2 2022-03-18 17:02:23 +11:00
Stranger1992
419055d073 Squashed commit of the following:
commit be73c50d6b
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Sun Feb 27 23:48:19 2022 +0000

    Forgot to add in HK_STOP.

commit fbfc1d6666
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Sun Feb 27 18:52:02 2022 +0000

    TR5 Hard coded sounds retargeted. Project 👍

commit 15a909bd35
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Sun Feb 27 18:10:29 2022 +0000

    All Tr5 sounds listed in Sound_Effects.h

commit 03bd650038
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Sat Feb 26 19:58:13 2022 +0000

    Update sound_effects.h

commit c6a298a8ad
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Sat Feb 26 19:46:16 2022 +0000

    Milestone 3: TR3 Sounds complete!

commit b29fc94a8b
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Sat Feb 26 18:07:48 2022 +0000

    Update sound_effects.h

commit 61a910d01d
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Thu Feb 24 08:53:04 2022 +0000

    All Tr3 sounds in, need renaming ect

commit e214beaa37
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Tue Feb 22 22:25:23 2022 +0000

    Added all Mutants , Shiva and Tiger to soundmap

commit af1c45abde
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Tue Feb 22 09:10:41 2022 +0000

    Tr3 Enemies Added WIP

commit 1b72ba9845
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Thu Feb 17 13:51:05 2022 +0000

    Adjusted All Tr3 Hardcoded Vehicle Sounds

commit 1b70522707
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Thu Feb 17 13:21:23 2022 +0000

    Tr3- All bosses and vehicles updated in Sound_effects.h

commit 01cd0817ec
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Tue Feb 15 09:07:19 2022 +0000

    Start of Tr3 - Tony and Puna Boss sounds updated in SoundEffects.H

commit 6c25463abb
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Sun Feb 13 23:11:37 2022 +0000

    Hack to create a playable build midproject.

commit 49dd17e0b7
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Thu Feb 10 23:57:47 2022 +0000

    All Tr2 Sounds listed in Sound_Effects.h

commit bc721fdfbf
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Wed Feb 9 14:55:03 2022 +0000

    Temp changes to preview work ingame

    May be weeks until I can see it and i am impatient so a big hack for now.

commit 229cad1b2a
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Wed Feb 9 14:28:00 2022 +0000

    TR2 hardcoded "Crunch" sounds added. Entities fixed

commit 2250f80585
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Wed Feb 9 14:14:41 2022 +0000

    Tr2 Vehicle Hardcoded Sounds enabled and redefined.

commit 549abe07da
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Wed Feb 9 13:46:47 2022 +0000

    Reassigned UPV Harpoon Fire Sound (now working with new soundmap)

commit 0bcb63d85d
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Wed Feb 9 13:46:15 2022 +0000

    Fixed spelling mistake

commit c09104832f
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Wed Feb 9 13:45:45 2022 +0000

    WIP Tr2 Sounds Added to Sounds.h

commit 2f22ecce46
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Wed Feb 9 00:58:59 2022 +0000

    WIP Update of Sounds.H enum names.

    AS I progress with the project , this will be changed continuously

commit 5030ae10b5
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Wed Feb 9 00:52:33 2022 +0000

    TR2 Monk Hardcoded sounds fixed

commit ef57790067
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Wed Feb 9 00:27:41 2022 +0000

    Enabled Binoc / Lasersight zoom in sound

commit 023f6746d8
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Wed Feb 9 00:24:59 2022 +0000

    Redefined Lara hard coded death sounds - TR3 Tube Train Trap

commit 6efcd8763e
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Wed Feb 9 00:24:22 2022 +0000

    Removed Tr5 prefix to HK Gun - now enabled in new soundmap

commit e748eb7a03
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Wed Feb 9 00:19:48 2022 +0000

    HK Fire and Silenced fixed and linked to new Soundmap

commit 380bd559db
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Wed Feb 9 00:19:03 2022 +0000

    Snow and Ice footsteps now enabled

commit d5ed11b33f
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Tue Feb 8 23:31:27 2022 +0000

    Changed hardcoded sounds.

    This all may have to be rolled back

commit fe2392344e
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Tue Feb 8 22:33:35 2022 +0000

    Updated Sound_Effects.h with new TR1 sound map

commit 6644d942c0
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Sun Feb 27 03:28:25 2022 +0000

    Revert "Replaced hardcoded Animating 2 for Minecraft switch with new item ID_MINECRAFT_SWITCH"

    This reverts commit bb976c82dd.

commit 523254893b
Merge: bb976c82 d00aa9b5
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Sun Feb 20 20:38:20 2022 +0000

    Merge branch 'master' into Stranger1992s-Testings-

commit bb976c82dd
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Sun Feb 20 20:38:14 2022 +0000

    Replaced hardcoded Animating 2 for Minecraft switch with new item ID_MINECRAFT_SWITCH

commit 21bbafe469
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Fri Feb 4 22:31:15 2022 +0000

    Added some object IDs

commit f629a5366b
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Thu Feb 3 23:48:01 2022 +0000

    Fixed Shiva Killing Lara Anmation

commit 27a3854a4b
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Thu Feb 3 23:32:27 2022 +0000

    Rollback Shiva errors.

    I made an error so reverting all changes.

commit a58d5b8176
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Thu Feb 3 23:09:20 2022 +0000

    Add Lara Shiva Death routine...possibly (WIP)

commit 36b032dfa1
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Thu Feb 3 14:27:24 2022 +0000

    Fixed TREX Chomp attack.

commit 31caf8d3c2
Author: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
Date:   Thu Feb 3 14:10:45 2022 +0000

    Fixed GIANT_MUTANT so it grabs Lara and kills her. Also adjusted the turning angle to make it more fluid and responsive.
2022-03-17 23:32:56 +00:00
Sezz
01e899a265 Lara swim state cleanup 2022-03-18 02:35:03 +11:00
Sezz
d06f766c2b Merge branch 'state_cleaning_tier_2' into Sezz_StateChange2+Stranger1992_SoundRefactor 2022-03-17 20:57:18 +11:00
Sezz
4a82931467 Increase vault and ledge grab angle tolerance; deprecate Lara dive count and query debounced input instead; allow surface dive from any surface tread state; update savegame schema; cleanup 2022-03-17 18:57:46 +11:00
Sezz
18a3775d7c Remove LaraCollisionAboveFront() 2022-03-17 01:19:21 +11:00
Sezz
527d75062e Merge branch 'state_cleaning_tier_2' into Sezz_StateChange2+Stranger1992_SoundRefactor 2022-03-16 21:59:19 +11:00
Sezz
2d74a7b601 Organise lara_tests.cpp 2022-03-16 21:56:25 +11:00
Sezz
8296364f63 Combine TestLaraMoveTolerance() and TestLaraCrawlMoveTolerance() 2022-03-16 20:50:36 +11:00
Sezz
305c17684f Update TestLaraKeepLow(); fix minor errors; cleanup 2022-03-16 13:55:56 +11:00
Sezz
d6645d5155 Entity file cleanup 2022-03-16 12:48:07 +11:00
Sezz
9d9aecf92b Merge branch 'state_cleaning_tier_2' into Sezz_StateChange2+Stranger1992_SoundRefactor 2022-03-15 21:32:25 +11:00
Sezz
244fc6a79b Entity file cleanup. 2022-03-15 21:28:32 +11:00
Sezz
cacdddbd4d Refactor TestLaraCrawlVault() 2022-03-15 20:42:35 +11:00
Sezz
ca8c58b50c Introduce HasChange(); make vault dispatch functionally more secure 2022-03-15 19:53:16 +11:00
Sezz
34d9318707 Entity file cleanup 2022-03-15 17:08:36 +11:00
Sezz
f132eb9fe5 Refine slide functionality; refine landing test 2022-03-15 16:20:56 +11:00
Sezz
79cabfe63b Merge branch 'state_cleaning_tier_2' into Sezz_StateChange2+Stranger1992_SoundRefactor 2022-03-14 22:54:56 +11:00
Sezz
0c65382576 Preserve momentum when sliding into a pit; cleanup 2022-03-14 22:44:10 +11:00
Sezz
cb8435ee6a Move key functions from control.cpp to collide_room.cpp; cleanup 2022-03-14 15:18:11 +11:00
Sezz
93e62d3e64 Update extra velocity handling; snap to floor height upon entering slope state; cleanup 2022-03-14 01:20:51 +11:00
Sezz
85df2ed1b1 ITEM_INFO cleanup; rename some structs to comply with TEN conventions; LaraInfo cleanup 2022-03-13 02:04:24 +11:00
Sezz
3951bab37c Do smooth step adjustment on slopes; fix double call to LaraDeflectEdge() in walk state; fix wrong turn slow turn state dispatch; cleanup 2022-03-13 00:50:10 +11:00
Sezz
f55266f70f Merge branch 'state_cleaning_tier_2' into Sezz_StateChange2+Stranger1992_SoundRefactor 2022-03-12 01:22:28 +11:00
Sezz
4b15e93946 Cleanup 2022-03-12 01:17:00 +11:00
Sezz
f9f79a2178 Cleanup 2022-03-12 00:40:05 +11:00
Sezz
e1aed5cbb7 Simplify SetLaraSlideState() 2022-03-12 00:30:57 +11:00
Stranger1992
607133671f SFX ENUMS updated.
@Sezzary Please cherry pick this commit into your state change branch. It is just updating the hardcoded sounds to the new sound map .
2022-03-10 14:05:31 +00:00
Stranger1992
aea5c1c53d Forgot to add in HK_STOP. 2022-03-10 13:59:07 +00:00
Stranger1992
fc75f30e0d Merge branch 'state_cleaning_tier_2' into Sezz_StateChange2+Stranger1992_SoundRefactor 2022-03-10 13:44:46 +00:00
Sezz
fec2a5af8f Adjust camera position in crouch and crawl states 2022-03-10 14:26:18 +11:00
Sezz
e9bbc0782a Fix vault bug when holding JUMP input after completing a vault 2022-03-10 13:54:28 +11:00