Commit graph

877 commits

Author SHA1 Message Date
Sezz
46d0470c04 Merge branch 'master' into lara_state_cleaning_etc 2021-12-16 22:14:32 +11:00
Lwmte
c2751f392b Update objectslist.h 2021-12-15 18:14:51 +03:00
Lwmte
21fb703d96 Increase elec damage 2021-12-15 18:01:19 +03:00
Lwmte
f642b0aa39 Add sparks glow to electric wires 2021-12-15 17:37:02 +03:00
Lwmte
e00a92e834 Remove unused declarations 2021-12-15 04:23:23 +03:00
Lwmte
56b1ba5e34 Update tr5_electricity.cpp 2021-12-15 04:04:32 +03:00
Lwmte
de87557ca9 Refactor electricity wires 2021-12-15 03:33:16 +03:00
Lwmte
972980d136 Update boat.cpp 2021-12-14 15:22:58 +03:00
Lwmte
9aacc7c799 Merge branch 'master' into lara_state_cleaning_etc 2021-12-14 15:10:45 +03:00
Sezz
11d4a68794 Refactor boat.cpp 2021-12-14 19:39:38 +11:00
Lwmte
6e2051abd4 Refactor rollingball 2021-12-13 14:19:14 +03:00
Sezz
899418215b Merge branch 'master' into lara_state_cleaning_etc 2021-12-10 12:33:59 +11:00
Lwmte
22f2f03288 Fix boat collision, refactor boat a bit 2021-12-10 01:27:53 +03:00
Sezz
ea4a2992bd Merge branch 'master' into lara_state_cleaning_etc 2021-12-10 09:09:09 +11:00
Lwmte
9e15105db0 Fix boat reenter 2021-12-09 20:58:52 +03:00
Sezz
72a64fa718 Merge branch 'master' into lara_state_cleaning_etc 2021-12-09 21:41:28 +11:00
Lwmte
edb4e130cd Fix polerope ghost grab in reach state 2021-12-09 12:48:54 +03:00
Sezz
40c8e63cf6 Merge branch 'master' into lara_state_cleaning_etc 2021-12-09 02:28:10 +11:00
Sezz
a79c6df007 Refactor lara_flare.cpp 2021-12-09 00:48:55 +11:00
Sezz
933a3fa8b0 Minor UPV enhancements 2021-12-08 22:02:02 +11:00
Sezz
43cde72079 Merge branch 'master' into lara_state_cleaning_etc 2021-12-08 20:51:40 +11:00
Sezz
49f0c88251 Fix UPV mounting; cleanup upv.cpp 2021-12-08 15:27:46 +11:00
Sezz
dc45376fdf Merge branch 'master' into lara_state_cleaning_etc 2021-12-02 12:58:18 +11:00
Sezz
19921c31f3 Merge branch 'master' into lara_state_cleaning_etc 2021-12-02 12:47:07 +11:00
Lwmte
313cf0a764 Minor cleanups 2021-12-01 18:12:04 +03:00
Lwmte
b183543d42 Use TestLastFrame in corner anim transitions 2021-11-30 03:24:50 +03:00
Lwmte
508cefa35c Work 2021-11-29 18:09:34 +03:00
Sezz
d85eea8c1f Rename basic state functions; rename some state enum members; rename LG_NO_ARMS to LG_HANDS_FREE; move lara_as_gymnast() to lara_hang.cpp; minor corrections 2021-11-25 23:38:59 +11:00
Sezz
9d1eb23a9c Merge branch 'master' into lara_state_cleaning_etc 2021-11-23 12:43:20 +11:00
Lwmte
d14d8d484c Cold breath 2021-11-22 18:55:29 +03:00
Sezz
68a5240a30 Merge branch 'master' into lara_state_cleaning_etc 2021-11-21 21:03:05 +11:00
Sezz
a036810db9 Refactor lara_fire.cpp 2021-11-20 15:39:05 +11:00
Sezz
f30ae8839e Refactor lara_flare.cpp 2021-11-20 13:18:59 +11:00
Sezz
b3c33d5d8d Merge branch 'master' into lara_state_cleaning_etc 2021-11-19 14:52:30 +11:00
Sezz
2e81fe9293 Refactor snowmobile.cpp 2021-11-17 23:56:34 +11:00
Sezz
d2cc5f8aa8 Merge branch 'master' into lara_state_cleaning_etc 2021-11-17 18:19:40 +11:00
Lwmte
ad7feec88a Merge pull request #371 from MontyTRC89/gui_refactor
Gui refactor
2021-11-17 09:53:58 +03:00
Sezz
b1788f07a0 Merge branch 'master' into lara_state_cleaning_etc 2021-11-17 15:21:28 +11:00
Sezz
c0fbb7ffa3 Refactor rubberboat.cpp 2021-11-17 14:59:21 +11:00
Lwmte
7efbcb28b2 Merge branch 'master' into gui_refactor 2021-11-16 17:25:47 +03:00
Sezz
27b8f3486e Refactor quad.cpp 2021-11-17 00:17:25 +11:00
Lwmte
e05f0b89a2 Rename newinv2 to gui 2021-11-16 15:51:50 +03:00
Lwmte
dedb938b24 Tier 1 2021-11-16 14:38:04 +03:00
Sezz
f68b5334e0 Refactor biggun.cpp and quad.cpp 2021-11-16 22:30:37 +11:00
Sezz
2ed0dbeddc Rename quad state 2021-11-16 19:03:49 +11:00
Sezz
d493933ce5 Refactor quad.cpp 2021-11-16 14:19:22 +11:00
Sezz
aaccfb44da Merge branch 'master' into lara_state_cleaning_etc 2021-11-16 00:41:38 +11:00
Sezz
4f4b12d5d4 Revert "Refactor quad.cpp"
This reverts commit cecfbda6e6.
2021-11-15 23:54:22 +11:00
Sezz
1dbf5e2206 Merge branch 'master' into lara_state_cleaning_etc 2021-11-15 19:51:18 +11:00
Sezz
cecfbda6e6 Refactor quad.cpp 2021-11-15 19:43:50 +11:00