Sergeanur 0d20f1c364 Merge branch 'master' into miami ... # Conflicts: # src/audio/AudioLogic.cpp # src/control/RoadBlocks.cpp # src/entities/Entity.h # src/entities/Physical.cpp # src/peds/Ped.cpp # src/render/Renderer.cpp # src/vehicles/Automobile.cpp # src/vehicles/CarGen.cpp # src/weapons/BulletInfo.cpp # src/weapons/Weapon.cpp		2020-10-18 17:15:49 +03:00
..
Building.cpp	Merge branch 'master' into miami	2020-07-13 18:10:17 +03:00
Building.h	script revision	2020-05-19 01:49:09 +03:00
Dummy.cpp	Fix sniper and water creatures bug, mark some files	2020-10-09 12:24:21 +03:00
Dummy.h	script revision	2020-05-19 01:49:09 +03:00
Entity.cpp	CWaterCreatures	2020-10-10 17:49:54 -07:00
Entity.h	Merge branch 'master' into miami	2020-10-18 17:15:49 +03:00
Physical.cpp	Merge branch 'master' into miami	2020-10-18 17:15:49 +03:00
Physical.h	fixes for CPhysical and friends	2020-05-22 14:34:44 +02:00
Solid.h	normalized line endings to LF	2020-04-09 20:50:24 +02:00
Treadable.cpp	Remove patches	2020-04-17 16:31:11 +03:00
Treadable.h	Fixed typos and made all assert functions optional	2020-05-10 21:49:33 +06:00