Commit graph

837 commits

Author SHA1 Message Date
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
8158b5a8df Improved flame emitter 3; Added legacy way for drawing darts, waiting for mesh; 2021-09-24 05:34:44 +02:00
MontyTRC89
f4803aa343 Fixed negative OCBs for all objects; Added InitialiseFlameEmitter3(); 2021-09-23 05:56:23 +02:00
MontyTRC89
14d4ad67ec Fixed lightning draw; Improved darts emitter; 2021-09-22 10:55:48 +02:00
MontyTRC89
8428a0ae0e Merge branch 'master' of https://github.com/MontyTRC89/TombEngine 2021-09-22 05:51:37 +02:00
MontyTRC89
4b0d76ed95 Refactored flame emitters, Lara burn and lightning bolts; 2021-09-22 05:51:25 +02:00
Stranger1992
7f7bf4357d Update tr3_tony.cpp
Tony does not burn lara anymore. Temporarily made him 1 bullet kill for testing purposes (line 54)
2021-09-21 17:18:21 +01:00
Stranger1992
7b1a4e35c4 Update tr3_tony.cpp 2021-09-21 13:35:14 +01:00
Stranger1992
38082c0570 Update tr3_tony.cpp 2021-09-21 13:24:11 +01:00
Lwmte
fc14708e4e Fix optional pitch and gain multipliers for SoundEffect 2021-09-20 21:47:42 +03:00
MontyTRC89
6cf4db33f1 Merge branch 'entities_fixings'
# Conflicts:
#	TR5Main/Game/item.h
#	TR5Main/Objects/TR4/Entity/tr4_sentrygun.cpp
#	TR5Main/Objects/TR4/Object/tr4_element_puzzle.cpp
#	TR5Main/Objects/TR4/Trap/tr4_blade.cpp
#	TR5Main/Objects/TR4/Trap/tr4_joby_spikes.cpp
#	TR5Main/Objects/TR4/Trap/tr4_mine.cpp
#	TR5Main/Objects/TR5/Trap/tr5_teethspike.cpp
#	TR5Main/TombEngine.vcxproj.filters
2021-09-20 06:15:39 +02:00
MontyTRC89
8ccccf083b Cleaned ID_MAPPER, ID_ELEMENT_PUZZLE and ID_MINE 2021-09-20 05:50:47 +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
e70b87ca90 Merge branch 'master' into coll_info_reorganize 2021-09-19 23:47:31 +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
add6629267 Swap BadHeightUp/Down 2021-09-19 17:48:32 +03:00
Raildex
c793c0a180 Fixed incorrect storage of LaraInfo as Item data 2021-09-19 12:20:08 +02:00
MontyTRC89
194a7f58e3 Fixed crash in ID_JOBY_SPIKES; Changed triggerFlags from ushort to short; Fixed ID_SETH_BLADE; 2021-09-19 05:54:18 +02:00
Lwmte
b3898b7940 Embed height data into COLL_INFO, fix issues with rolling under statics and statics submerged into water 2021-09-19 06:42:24 +03:00
MontyTRC89
7c7db1ca1c Cleaned SENTRY_GUN 2021-09-18 11:15:01 +02:00
MontyTRC89
1ec7f8a58b Cleaned ID_JOBY_SPIKES and ID_MOVING_BLADE 2021-09-18 10:56:40 +02:00
MontyTRC89
234bc02b2f Fixed ID_TEETH_SPIKES and ID_SETH_BLADE 2021-09-18 06:20:56 +02:00
Lwmte
d59a73ba62 Update motorbike.cpp 2021-09-18 02:00:50 +03:00
Lwmte
015815c5d3 Fix embedding into diagonal walls and steps, fix Lara freeze on triangle slopes 2021-09-17 22:55:09 +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
MontyTRC89
1744c0ae12 Fixed GenericSphereBoxCollision(); Fixed ID_BIRD_BLADE and ID_PLOUGH; 2021-09-17 06:01:15 +02:00
Lwmte
29ee7e73fb Fix CreatureAIInfo returning wrong angles for Lara 2021-09-17 02:28:47 +03:00
Lwmte
0a67b43841 Fix wall door collision positioning 2021-09-17 01:46:06 +03:00
MontyTRC89
22ea3f636c Fixed ID_CATWALK_BLADE and ID_PLINTH_BLADE 2021-09-16 05:44:49 +02: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
d8aa65260f Make Lara targetable again 2021-09-16 03:56:04 +03:00
Lwmte
383ed1b9f6 Fix #337 2021-09-16 02:39:25 +03:00
Lwmte
1d0ceb0ff4 Fix more stuff 2021-09-16 01:12:19 +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
2e62725933 Move flipmap stuff out of control.cpp 2021-09-15 17:40:00 +03:00
Lwmte
4a551c0918 Move LOS stuff out of control.cpp 2021-09-15 17:20:42 +03:00
Lwmte
f79d6436a3 Remove optional TestTriggers argument 2021-09-15 16:58:53 +03:00
Lwmte
153816264d Update tr4_cog.cpp 2021-09-15 14:38:12 +03:00
Lwmte
ec84760f80 Merge branch 'master' into coll_info_reorganize 2021-09-15 14:38:05 +03:00
Lwmte
1284d34f68 Implement basic flash, fix func names 2021-09-15 14:24:03 +03:00
Lwmte
26cd489da6 Move FlashFader to environment controller 2021-09-15 12:58:07 +03:00
Lwmte
e289644e87 Move flipeffect global to filpeffect.cpp 2021-09-15 11:38:55 +03:00
Lwmte
7f16b66dfc Simplify trigger handling code 2021-09-15 10:12:42 +03:00
MontyTRC89
fa720f000d Merge branch 'entities_fixings' 2021-09-15 06:09:16 +02:00
MontyTRC89
08691fc6ee Fixed bug in GenericSphereBoxCollision(); Fixed ID_SPIKEY_BALL, ID_FLOOR_4BLADES, ID_CEILING_4BLADES; 2021-09-15 06:08:48 +02:00