Commit graph

908 commits

Author SHA1 Message Date
hispidence
e171d407ca More includes; stuff to get it compiling. 2022-02-10 18:32:29 +00:00
hispidence
cf610245f1 Move more files. Define MINMAX. 2022-02-10 18:31:35 +00:00
MontyTRC89
bdde390302 Cleaning renderer code 2022-01-29 05:55:09 +01:00
MontyTRC89
171ca2992b Merge branch 'master' into renderer_refactor 2022-01-25 05:43:45 +01:00
Lwmte
fd49d561b7 Fix pushable pushed on slopes 2022-01-14 23:24:27 +03:00
MontyTRC89
d8eb60a533 Merge branch 'animation_integers' into renderer_refactor 2022-01-11 13:21:02 +01:00
MontyTRC89
f72d801019 Merge branch 'master' into renderer_refactor 2022-01-11 05:38:06 +01:00
Sezz
9b5834d11f Refactor biggun.cpp 2022-01-09 13:44:37 +11:00
Sezz
7e85eee544 Refactor kayak.cpp 2022-01-07 16:27:50 +11:00
MontyTRC89
c3a748cc78 Merge branch 'master' into renderer_refactor
# Conflicts:
#	TR5Main/Renderer/Renderer11.cpp
2021-12-24 15:19:12 +01:00
Lwmte
1b78c08d57 Merge branch 'master' into animation_integers 2021-12-24 11:25:51 +03:00
Lwmte
b86d3b872c Reorganize includes tier 4 2021-12-24 11:08:16 +03:00
Lwmte
42380b737c Fix lock in some more cases 2021-12-24 03:38:01 +03:00
Lwmte
903260ca39 Merge branch 'master' into animation_integers 2021-12-24 03:34:53 +03:00
Lwmte
b71fa516f2 Fix some more includes 2021-12-24 03:34:05 +03:00
Lwmte
8f4ba68f30 Reorganize includes tier 3 2021-12-24 03:32:19 +03:00
Lwmte
70320ba0ba Merge branch 'master' into animation_integers 2021-12-22 16:24:12 +03:00
Lwmte
2101d3e65f Reorganize includes tier 2 2021-12-22 16:23:57 +03:00
Lwmte
412f788eb5 Also convert moveable animation index to int 2021-12-22 12:35:30 +03:00
Lwmte
a1bb992145 First commit 2021-12-22 12:17:59 +03:00
MontyTRC89
651709d759 Merge branch 'master' into renderer_refactor
# Conflicts:
#	TR5Main/Renderer/RenderView/RenderView.h
#	TR5Main/TombEngine.vcxproj.filters
2021-12-19 08:00:40 +01:00
Lwmte
2671ca453b Collide code reorganizing (#393)
* Tier 1

* Tier 2

* Remove old GetRoomList implementation and use CollectConnectedRooms one

* Tier 3

* Tier 4

* Tier 5

* Tier 6

* Tier 7

Co-authored-by: Lwmte <initiator@nm.ru>
2021-12-19 05:24:12 +03:00
Lwmte
a2c282f0f4 Fix UPV 2021-12-19 03:54:13 +03:00
MontyTRC89
ecb6a4668a Merge branch 'master' into renderer_refactor 2021-12-17 13:28:55 +01:00
MontyTRC89
9c48aa227b Merge branch 'master' into renderer_refactor 2021-12-17 05:57:19 +01:00
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
MontyTRC89
36300d301c Converted MESH* to int in SHATTER_ITEM; Fixed rendering of items and statics; 2021-12-14 17:20:13 +01: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
MontyTRC89
42bf78d14c Merge branch 'master' into renderer_refactor 2021-12-10 09:18:41 +01: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
MontyTRC89
3805bf20ab Merge branch 'master' into renderer_refactor 2021-12-09 06:34:00 +01: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
MontyTRC89
71e4403ac5 Merge branch 'master' into renderer_refactor
# Conflicts:
#	TR5Main/TombEngine.vcxproj
2021-12-08 06:52:49 +01:00