Commit graph

118 commits

Author SHA1 Message Date
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
1ac1fec4e1 Remove LaraItem global usage in lara_flare.cpp + minor cleanup 2021-11-12 19:52:48 +11:00
Lwmte
b7e5a81322 Tests and fixes, removed unnecessary flags from SetAnimation 2021-11-10 11:59:54 +03:00
Lwmte
8f51243ca4 First commit 2021-11-10 02:41:59 +03:00
Lwmte
22e0e9e40f Cleanup camera code 2021-11-08 19:18:33 +03: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
27c4dee8b2 Merge branch 'master' into errors 2021-10-28 11:28:24 +03:00
Troye
af287cdf6d InventoryClass; 2021-10-12 04:15:22 -05:00
Troye
acc4281555 purge ring inventory; 2021-10-12 00:26:46 -05: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
MontyTRC89
ff3b1b44d4 Fixing ID_BURNING_TORCH_ITEM; Namespace rename for generic objects; 2021-09-30 12:03:39 +02:00
MontyTRC89
7a4b9aed5f Refactored rope files; Fixed ID_POLE_ROPE; 2021-09-30 05:10:30 +02:00
Lwmte
6fa86f59c3 Temporarily flip X/Z room dimensions in UpdateBridgeItem 2021-09-29 18:10:12 +03:00
Lwmte
29ad4442c0 Work 2021-09-29 03:41:36 +03:00
Lwmte
788ce04661 First commit 2021-09-27 07:12:30 +03: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
Lwmte
b7cf7be08c Merge branch 'master' into item_info_include_fix 2021-09-25 15:59:51 +03:00
Raildex
2b0b1ff282 Added newlines 2021-09-25 11:27:47 +02:00
Lwmte
b97d56f09d Update falling_block.cpp 2021-09-25 05:24:56 +03:00
Lwmte
21d93d8a86 Update falling_block.cpp 2021-09-25 05:15:35 +03:00
Lwmte
daeb2f622d Update falling_block.cpp 2021-09-25 05:00:06 +03:00
Lwmte
bf87abd8c3 Use actual mesh bounds for trapdoor and falling floor/ceiling objects 2021-09-24 18:17:06 +03:00
Lwmte
c2c2abc42e Reduce falling block thickness 2021-09-24 17:02:16 +03:00
Lwmte
147c62728a Update falling_block.cpp 2021-09-24 15:52:27 +03:00
Lwmte
9a58aedda2 Update falling_block.cpp 2021-09-24 15:51:32 +03:00
Lwmte
1c20cefd4e Fix merge and small things 2021-09-24 13:58:56 +03:00
Lwmte
e17a8a0d99 Merge branch 'master' into mesh_mutator 2021-09-24 13:53:39 +03:00
Lwmte
6c29ba5442 Fix everything 2021-09-24 13:50:31 +03:00
Raildex
7b070e75ad Fixed duplicated ITEM_INFO definition 2021-09-24 07:53:42 +02:00
MontyTRC89
14d4ad67ec Fixed lightning draw; Improved darts emitter; 2021-09-22 10:55:48 +02:00
Lwmte
0ca822eb9e Fix ceiling trapdoor opening from top 2021-09-20 03:02:54 +03:00
Lwmte
6c0c0db43b Fix multiple openings of floor/ceiling trapdoors 2021-09-20 02:44:06 +03:00
Lwmte
cefc60c7ea Move around some files 2021-09-19 23:41:26 +03:00
Lwmte
016be41f97 Move anim structs to animation.h 2021-09-19 18:29:25 +03:00
Lwmte
32b48e9c24 Rename some functions 2021-09-17 16:07:53 +03:00
Lwmte
5ae79a461e Remove legacy RoomBelow/Above helper funcs, fix door offset 2021-09-17 15:32:55 +03:00
Lwmte
0a67b43841 Fix wall door collision positioning 2021-09-17 01:46:06 +03: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
383ed1b9f6 Fix #337 2021-09-16 02:39:25 +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
f79d6436a3 Remove optional TestTriggers argument 2021-09-15 16:58:53 +03:00
Lwmte
7f16b66dfc Simplify trigger handling code 2021-09-15 10:12:42 +03:00
Lwmte
ededdc0c1d Fix jumping into objects 2021-09-14 11:09:29 +03:00
Lwmte
f2f20ad36d "Fix" door collision 2021-09-14 10:59:09 +03:00
Lwmte
9d25db4ca9 Merge branch 'master' into coll_info_reorganize 2021-09-13 09:48:59 +03:00