1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-09-20 22:46:40 +00:00
re3/src/peds
Sergeanur d0f5464200 Merge branch 'master' into miami
# Conflicts:
#	src/control/CarAI.cpp
#	src/control/Phones.cpp
#	src/control/Phones.h
#	src/control/Record.cpp
#	src/control/Restart.cpp
#	src/control/Script.cpp
#	src/core/Collision.cpp
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/Game.h
#	src/core/Streaming.cpp
#	src/core/TempColModels.cpp
#	src/core/Wanted.cpp
#	src/core/Zones.cpp
#	src/core/config.h
#	src/core/main.cpp
#	src/core/re3.cpp
#	src/entities/Entity.cpp
#	src/entities/Physical.cpp
#	src/extras/frontendoption.cpp
#	src/modelinfo/ModelInfo.cpp
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/CivilianPed.cpp
#	src/peds/CopPed.cpp
#	src/peds/EmergencyPed.cpp
#	src/peds/Ped.cpp
#	src/peds/Ped.h
#	src/peds/Population.cpp
#	src/render/Renderer.cpp
#	src/save/GenericGameStorage.cpp
#	src/skel/win/win.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/Boat.cpp
#	src/vehicles/Boat.h
#	src/vehicles/Vehicle.cpp
2020-07-13 18:10:17 +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 Rename LEVEL_NONE to LEVEL_GENERIC 2020-07-13 17:43:09 +03:00
CopPed.h VC fighting, Peds, many fixes including ghost bikes 2020-07-09 17:01:07 +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 Rename LEVEL_NONE to LEVEL_GENERIC 2020-07-13 17:43:09 +03:00
Ped.h VC fighting, Peds, many fixes including ghost bikes 2020-07-09 17:01:07 +03:00
PedAttractor.cpp ice cream attractor + bike respray 2020-07-03 11:08:19 +03:00
PedAttractor.h more attractor fixes 2020-05-16 11:30:58 +03:00
PedChat.cpp Peds & fixes 2020-07-04 15:31:28 +03:00
PedDebug.cpp Peds & fixes 2020-07-04 15:31:28 +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 CCarCtrl::GenerateOneRandomCar 2020-05-08 23:29:43 +03:00
PedPlacement.h CCarCtrl::GenerateOneRandomCar 2020-05-08 23:29:43 +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 Remove patches 2020-04-17 16:31:11 +03:00
PedStats.h Merge branch 'master' into miami 2020-05-11 21:07:12 +03:00
PedType.cpp Remove patches 2020-04-17 16:31:11 +03:00
PedType.h Fixed typos and made all assert functions optional 2020-05-10 21:49:33 +06:00
PlayerPed.cpp VC fighting, Peds, many fixes including ghost bikes 2020-07-09 17:01:07 +03:00
PlayerPed.h Peds & fixes continues 2020-06-15 23:43:20 +03:00
Population.cpp Merge branch 'master' into miami 2020-07-13 18:10:17 +03:00
Population.h Some wait states 2020-06-06 22:16:59 +03:00