Sergeanur 7d8ffa9ebd Merge remote-tracking branch 'origin/master' into miami ... # Conflicts: # src/control/RoadBlocks.cpp # src/core/Collision.h # src/core/Pad.cpp # src/core/SurfaceTable.h # src/core/main.cpp # src/core/re3.cpp # src/peds/Population.cpp # src/render/Fluff.cpp # src/render/Shadows.cpp # src/render/Shadows.h # src/render/Sprite2d.cpp # src/weapons/BulletInfo.cpp		2020-08-07 12:34:41 +03:00
..
CivilianPed.cpp	Rename LEVEL_NONE to LEVEL_GENERIC	2020-07-13 17:43:09 +03:00
CivilianPed.h	removed duplicate code	2020-05-16 10:53:20 +03:00
CopPed.cpp	Squeeze performance option, minor fixes	2020-08-03 16:00:32 +03:00
CopPed.h	CCopPed, except spike traps	2020-07-28 17:04:34 +03:00
DummyPed.h	Fixed typos and made all assert functions optional	2020-05-10 21:49:33 +06:00
EmergencyPed.cpp	Rename LEVEL_NONE to LEVEL_GENERIC	2020-07-13 17:43:09 +03:00
EmergencyPed.h	Fixed typos and made all assert functions optional	2020-05-10 21:49:33 +06:00
Gangs.cpp	Melee weapons(half-working), Ped and Hud bits	2020-05-19 17:43:16 +03:00
Gangs.h	gangs, script and replay fixes	2020-05-16 17:00:40 +03:00
Ped.cpp	Merge pull request #1 from GTAmodding/miami	2020-07-29 12:20:02 +03:00
Ped.h	Merge pull request #1 from GTAmodding/miami	2020-07-29 12:20:02 +03:00
PedAttractor.cpp	90% fixes, 10% skel refactoring	2020-07-24 21:02:55 +03:00
PedAttractor.h	64-bit on Windows	2020-07-24 20:26:33 +03:00
PedChat.cpp	Peds & fixes	2020-07-04 15:31:28 +03:00
PedDebug.cpp	Peds, Hud, CFO 1/2, fixes - including zone names	2020-07-22 15:19:22 +03:00
PedIK.cpp	Compatibility with VC weapon.dat + new shotguns	2020-05-23 16:53:20 +03:00
PedIK.h	more CCam	2020-06-15 20:50:01 +02:00
PedPlacement.cpp	CCopPed, except spike traps	2020-07-28 17:04:34 +03:00
PedPlacement.h	CCopPed, except spike traps	2020-07-28 17:04:34 +03:00
PedRoutes.cpp	Remove patches	2020-04-17 16:31:11 +03:00
PedRoutes.h	missing endlines	2020-03-22 19:19:07 +03:00
PedStats.cpp	64-bit on Windows	2020-07-24 20:26:33 +03:00
PedStats.h	Merge branch 'master' into miami	2020-05-11 21:07:12 +03:00
PedType.cpp	64-bit on Windows	2020-07-24 20:26:33 +03:00
PedType.h	Fixed typos and made all assert functions optional	2020-05-10 21:49:33 +06:00
PlayerPed.cpp	Peds, Hud, CFO 1/2, fixes - including zone names	2020-07-22 15:19:22 +03:00
PlayerPed.h	Peds, Hud, CFO 1/2, fixes - including zone names	2020-07-22 15:19:22 +03:00
Population.cpp	Merge remote-tracking branch 'origin/master' into miami	2020-08-07 12:34:41 +03:00
Population.h	Some wait states	2020-06-06 22:16:59 +03:00