MontyTRC89 865202b33c Merge branch 'doors_refactoring' ... # Conflicts: # TR5Main/Game/door.cpp # TR5Main/Game/door.h # TR5Main/Game/memory/malloc.cpp # TR5Main/Objects/Generic/Switches/cog_switch.cpp # TR5Main/Objects/Generic/Switches/crowbar_switch.cpp # TR5Main/Objects/Generic/Switches/generic_switch.h # TR5Main/Objects/Generic/Switches/turn_switch.cpp # TR5Main/Objects/TR4/Object/tr4_obelisk.cpp # TR5Main/Renderer/Renderer11Draw.cpp # TR5Main/Specific/level.cpp # TR5Main/TombEngine.vcxproj # TR5Main/TombEngine.vcxproj.filters		2021-09-11 05:38:26 +02:00
..
Effects	Merge branch 'master' into item_data	2021-09-09 11:10:25 +03:00
Generic	Merge branch 'doors_refactoring'	2021-09-11 05:38:26 +02:00
TR1	Merge branch 'master' into item_data	2021-09-09 11:10:25 +03:00
TR2	Merge branch 'master' into item_data	2021-09-09 11:10:25 +03:00
TR3	Fix merge conflicts	2021-09-09 11:25:03 +03:00
TR4	Merge branch 'doors_refactoring'	2021-09-11 05:38:26 +02:00
TR5	Merge branch 'doors_refactoring'	2021-09-11 05:38:26 +02:00
Utils	Assign hitEffect for most objects	2021-08-02 14:21:41 +03:00
objectslist.h	Fixed crowbar switch	2021-09-08 06:10:38 +02:00