Commit graph

190 commits

Author SHA1 Message Date
Sezz
d9614e415b Refactor camera.cpp 2021-11-14 20:10:15 +11:00
Sezz
52b962f0e8 Merge branch 'master' into lara_state_cleaning_etc 2021-11-10 23:26:55 +11:00
Sezz
d875bc9084 Replace STOP_SIZE where appropriate 2021-11-10 22:48:00 +11:00
Sezz
2193927774 Merge branch 'master' into lara_state_cleaning_etc 2021-11-10 12:37:18 +11:00
Sezz
be1ee111bf Refactor camera.cpp 2021-11-10 11:26:58 +11:00
Sezz
a48996f511 Merge branch 'master' into lara_state_cleaning_etc 2021-11-09 17:12:18 +11:00
Lwmte
980e26a726 Cleanup camera code more 2021-11-08 19:35:17 +03:00
Lwmte
75621fb729 Cleanup camera code more 2021-11-08 19:28:14 +03:00
Lwmte
22e0e9e40f Cleanup camera code 2021-11-08 19:18:33 +03:00
Sezz
c5dd714e51 Merge branch 'master' into lara_state_cleaning_etc 2021-11-08 22:27:12 +11:00
Lwmte
08153f11c4 Demagic camera code 2021-11-07 14:58:02 +03:00
Lwmte
73d5825636 Merge branch 'master' into items_camera_collision 2021-11-07 12:57:42 +03:00
Sezz
a2ee10a9a0 Merge branch 'master' into lara_state_cleaning_etc 2021-11-07 13:40:54 +11:00
Sezz
80b9b3d131 Merge branch 'master' into lara_state_cleaning_etc 2021-11-07 13:28:00 +11:00
Lwmte
58dbc45be3 Fix combat camera flicker on entering quicksand 2021-11-07 05:09:03 +03:00
Lwmte
e442c6caee Fix quicksand 2021-11-07 04:54:48 +03:00
Lwmte
27a9009f33 Remove more unused globals, refactor ObjectOnLOS 2021-11-04 20:23:26 +03:00
Lwmte
5d3e58e85e Remove hardcoded sniper overlay camera mode 2021-11-04 20:03:28 +03:00
Sezz
a0abdc5a17 Merge branch master into 'lara_state_cleaning_etc' 2021-11-03 21:16:06 +11:00
Lwmte
e6e3eb2d4a Merge branch 'master' into items_camera_collision 2021-11-03 12:06:01 +03:00
Lwmte
8e42d77243 Move savegames to separate folder, organize savegame code 2021-10-31 21:36:51 +03:00
Sezz
ae5fe2168f Merge branch 'master' into 'lara_state_cleaning_etc' 2021-10-28 23:33:12 +11:00
MontyTRC89
e4329c4974 Merge branch 'errors'
# Conflicts:
#	TR5Main/Game/effects/flmtorch.cpp
#	TR5Main/Game/objects.cpp
#	TR5Main/Objects/Effects/enemy_missile.cpp
#	TR5Main/Objects/TR4/Entity/tr4_demigod.cpp
#	TR5Main/Objects/TR4/Entity/tr4_wraith.cpp
2021-10-28 11:06:02 +02:00
MontyTRC89
e5c8c1010e Merge branch 'entities_fixings'
# Conflicts:
#	TR5Main/Renderer/Renderer11Draw.cpp
#	TR5Main/TombEngine.vcxproj.filters
2021-10-28 10:43:09 +02:00
Lwmte
1b45e42515 Merge branch 'master' into items_camera_collision 2021-10-27 19:07:00 +03:00
Lwmte
f592f36a24 Merge branch 'master' into errors 2021-10-27 19:05:50 +03:00
Lwmte
fb0de37d32 Move rumble timer to camera code 2021-10-22 16:33:15 +03:00
Lwmte
2842fc58ef Merge branch 'master' into items_camera_collision 2021-10-10 04:19:33 +03:00
Lwmte
097ed62d4a Styling 2021-10-10 03:51:26 +03:00
Sezz
b1d47b9073 Merge branch 'master' into lara_state_cleaning_etc 2021-10-09 14:06:43 +11:00
Lwmte
ef0bcf950a Merge branch 'master' into errors 2021-10-08 16:47:59 +03:00
MontyTRC89
fbd15b520d Merge remote-tracking branch 'origin/master' into entities_fixings 2021-10-07 05:30:35 +02:00
Lwmte
daf23132c9 Cleanup control.cpp 2021-10-04 03:14:05 +03:00
MontyTRC89
ff3b1b44d4 Fixing ID_BURNING_TORCH_ITEM; Namespace rename for generic objects; 2021-09-30 12:03:39 +02:00
Sezz
6a53be0a52 Improved ResetLook() 2021-09-28 22:05:47 +10:00
Troye
552352dd21 W1 2021-09-25 16:03:28 -05:00
Lwmte
971d1b203f Cleanup 2 2021-09-25 16:04:16 +03:00
Lwmte
e6fc5aba77 Cleanup 2021-09-25 16:00:30 +03:00
Raildex
2b0b1ff282 Added newlines 2021-09-25 11:27:47 +02:00
Raildex
7b070e75ad Fixed duplicated ITEM_INFO definition 2021-09-24 07:53:42 +02:00
Lwmte
e52cae57e2 Remove one more hardcoded camera speed hack 2021-09-20 01:11:36 +03:00
Troye
a7124c8924 Use Vectors; collide with statics; 2021-09-16 18:51:21 -05:00
Lwmte
8d86c2e97d Rename draw.cpp to animation.cpp which makes more sense, some more edits 2021-09-16 05:06:03 +03:00
Lwmte
68923228dd Remove unused globals and move others from control.cpp to needed source files 2021-09-15 21:09:09 +03:00
Lwmte
4a551c0918 Move LOS stuff out of control.cpp 2021-09-15 17:20:42 +03:00
Lwmte
26cd489da6 Move FlashFader to environment controller 2021-09-15 12:58:07 +03:00
Lwmte
c181da1f89 Update camera.cpp 2021-09-14 17:11:21 +03:00
Lwmte
60bcdfab48 Fix division by zero 2021-09-14 17:10:09 +03:00
Lwmte
eb2f33217c Convert static position to PHD_3DPOS, fix crossbow bolt shatter, read/write proper shatter type 2021-09-13 23:15:02 +03:00
Lwmte
bb775ff6c2 Demagic NO_LOS_ITEM 2021-09-13 10:22:00 +03:00