Sergeanur 12fbf8cede Merge branch 'master' into miami ... # Conflicts: # src/core/Game.cpp		2020-05-05 18:33:32 +03:00
..
Building.cpp	Make CBaseModelInfo fields protected	2020-05-05 15:06:55 +03:00
Building.h	cleaned up patching of virtual functions; started CAutomobile	2019-07-08 08:46:42 +02:00
Dummy.cpp	Remove patches	2020-04-17 16:31:11 +03:00
Dummy.h	cleaned up patching of virtual functions; started CAutomobile	2019-07-08 08:46:42 +02:00
Entity.cpp	Merge branch 'master' into miami	2020-05-05 18:33:32 +03:00
Entity.h	Merge branch 'master' into miami	2020-05-05 18:33:32 +03:00
Physical.cpp	Revert "Remove Miami stuff"	2020-05-05 18:04:43 +03:00
Physical.h	Rename m_phy_flagA80 to bSkipLineCol	2020-04-30 18:58:15 +03: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	Revert "Remove Miami stuff"	2020-05-05 18:04:43 +03:00