1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-25 05:51:55 +00:00
re3/src/core
Sergeanur 0ce2af7a0d Merge remote-tracking branch 'origin/master' into miami
# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/control/Garages.cpp
#	src/core/SurfaceTable.cpp
#	src/core/SurfaceTable.h
#	src/core/World.cpp
#	src/core/main.cpp
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/Ped.cpp
#	src/render/Timecycle.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/Heli.cpp
#	src/vehicles/Vehicle.cpp
#	src/weapons/Weapon.cpp
#	src/weapons/WeaponInfo.h
2020-05-26 17:24:47 +03:00
..
Accident.cpp Remove patches 2020-04-17 16:31:11 +03:00
Accident.h rem refs 2020-04-17 08:54:14 +03:00
AnimViewer.cpp Merge branch 'master' into miami 2020-05-13 00:55:52 +03:00
AnimViewer.h AnimViewer! 2019-08-15 17:51:39 +03:00
Cam.cpp eSurfaceType 2020-05-26 11:37:46 +02:00
Camera.cpp CVehicle 2020-05-25 18:33:34 +02:00
Camera.h CVehicle 2020-05-25 18:33:34 +02:00
CdStream.cpp Linux build support 2020-05-11 21:00:55 +03:00
CdStream.h Linux build support 2020-05-11 21:00:55 +03:00
CdStreamPosix.cpp Fix calloc in CdStreamPosix 2020-05-13 17:48:07 +02:00
Clock.cpp Remove patches 2020-04-17 16:31:11 +03:00
Clock.h rem refs 2020-04-17 08:54:14 +03:00
Collision.cpp eSurfaceType 2020-05-26 11:37:46 +02:00
Collision.h CVehicle 2020-05-25 18:33:34 +02:00
ColStore.cpp new script commands - mostly stubs 2020-05-22 02:42:04 +03:00
ColStore.h most of animation system done; little stuff here and there 2020-05-08 15:59:57 +02:00
common.h Merge branch 'master' into miami 2020-05-11 21:07:12 +03:00
config.h Merge remote-tracking branch 'upstream/miami' into miami 2020-05-24 00:19:25 +03:00
ControllerConfig.cpp some fixes 2020-05-23 01:43:12 +03:00
ControllerConfig.h some fixes 2020-05-23 01:43:12 +03:00
Crime.h Try to build with mingw 2020-04-20 18:18:46 +02:00
Debug.cpp implemented skinned peds, no cutscene hands yet 2020-04-24 11:42:38 +02:00
Debug.h implemented skinned peds, no cutscene hands yet 2020-04-24 11:42:38 +02:00
Directory.cpp fixed extra directory issues 2020-04-21 13:56:33 +02:00
Directory.h fixed extra directory issues 2020-04-21 13:56:33 +02:00
EventList.cpp peds starting to work 2020-05-09 17:05:26 +02:00
EventList.h Melee weapons(half-working), Ped and Hud bits 2020-05-19 17:43:16 +03:00
FileLoader.cpp finished CFileLoader; some COcclusion stubs 2020-05-19 10:23:08 +02:00
FileLoader.h finished CFileLoader; some COcclusion stubs 2020-05-19 10:23:08 +02:00
FileMgr.cpp Linux build support 2020-05-11 21:00:55 +03:00
FileMgr.h rem refs 2020-04-17 08:54:14 +03:00
Fire.cpp Linux build support 2020-05-11 21:00:55 +03:00
Fire.h rem refs 2020-04-17 08:54:14 +03:00
Frontend.cpp Menu borders and weapon fixes 2020-05-24 03:05:48 +03:00
Frontend.h Menu borders and weapon fixes 2020-05-24 03:05:48 +03:00
FrontEndControls.cpp PS2 Frontend Controls 2020-04-05 21:21:53 +02:00
FrontEndControls.h PS2 Frontend Controls 2020-04-05 21:21:53 +02:00
Game.cpp Merge pull request #583 from erorcun/miami 2020-05-24 10:47:17 +02:00
Game.h scuffed InitAfterFocusLoss implementation 2020-05-21 14:23:12 +03:00
General.h ccarctrl big fix 2020-05-09 20:21:13 +03:00
IniFile.cpp Try to build with mingw 2020-04-20 18:18:46 +02:00
IniFile.h More refs removed 2020-04-16 15:30:47 +03:00
Lists.cpp the great reorganization 2019-07-07 13:09:11 +02:00
Lists.h More audio (to hook and test) 2019-10-26 13:05:00 +02:00
main.cpp all my fixes live in exes 2020-05-24 16:41:29 +03:00
main.h Fix linux warnings 2020-05-12 23:18:54 +02:00
MenuScreens.h Merge pull request #574 from Xinerki/miami 2020-05-22 15:49:37 +03:00
obrstr.cpp normalized line endings to LF 2020-04-09 20:50:24 +02:00
obrstr.h normalized line endings to LF 2020-04-09 20:50:24 +02:00
Pad.cpp Compatibility with VC weapon.dat + new shotguns 2020-05-23 16:53:20 +03:00
Pad.h vehicle cheats and debug cheat string display 2020-05-21 17:28:03 +03:00
patcher.cpp Linux build support 2020-05-11 21:00:55 +03:00
patcher.h Remove assembly from patcher.h 2020-03-27 21:25:39 +01:00
Placeable.cpp CEntity and friends 2020-05-19 20:56:42 +02:00
Placeable.h CEntity and friends 2020-05-19 20:56:42 +02:00
PlayerInfo.cpp new script commands - mostly stubs 2020-05-22 02:42:04 +03:00
PlayerInfo.h CVehicle 2020-05-25 18:33:34 +02:00
Pools.cpp Weapon layer in Peds 2020-05-15 21:21:25 +03:00
Pools.h removed cutscene heads 2020-05-09 13:00:39 +02:00
Profile.cpp Fix linux warnings 2020-05-12 23:18:54 +02:00
Profile.h Fix linux warnings 2020-05-12 23:18:54 +02:00
Radar.cpp Merge pull request #574 from Xinerki/miami 2020-05-22 15:49:37 +03:00
Radar.h approach separation differently 2020-05-21 12:45:45 +03:00
re3.cpp Merge remote-tracking branch 'origin/master' into miami 2020-05-26 17:24:47 +03:00
References.cpp replays bug fix 2020-04-18 23:50:37 +03:00
References.h rem refs 2020-04-17 08:54:14 +03:00
Stats.cpp CPhysical 2020-05-22 14:27:16 +02:00
Stats.h fixes for CPhysical and friends 2020-05-22 14:34:44 +02:00
Streaming.cpp fixed compiler errors 2020-05-24 17:27:12 +02:00
Streaming.h Weapon layer in Peds 2020-05-15 21:21:25 +03:00
SurfaceTable.cpp eSurfaceType 2020-05-26 11:37:46 +02:00
SurfaceTable.h eSurfaceType 2020-05-26 11:37:46 +02:00
TempColModels.cpp eSurfaceType 2020-05-26 11:37:46 +02:00
TempColModels.h update file loader for new VC fields 2020-05-10 18:14:14 +02:00
templates.h Small unification 2020-05-10 01:14:00 +03:00
timebars.cpp Try to build with mingw 2020-04-20 18:18:46 +02:00
timebars.h normalized line endings to LF 2020-04-09 20:50:24 +02:00
Timer.cpp Linux build support 2020-05-11 21:00:55 +03:00
Timer.h fixes for CPhysical and friends 2020-05-22 14:34:44 +02:00
TimeStep.cpp rem refs 2020-04-17 08:54:14 +03:00
TimeStep.h rem refs 2020-04-17 08:54:14 +03:00
User.cpp new zone stuff 2020-05-06 12:23:57 +02:00
User.h rem refs 2020-04-17 08:54:14 +03:00
Wanted.cpp garages + script 2020-05-11 21:04:35 +03:00
Wanted.h sync with upstream 2020-05-11 21:21:09 +03:00
World.cpp small fixes 2020-05-25 20:36:23 +02:00
World.h CVehicle 2020-05-25 18:33:34 +02:00
ZoneCull.cpp Linux build support 2020-05-11 21:00:55 +03:00
ZoneCull.h new zone stuff 2020-05-06 12:23:57 +02:00
Zones.cpp fixed compiler errors 2020-05-24 17:27:12 +02:00
Zones.h Fix linux warnings 2020-05-12 23:18:54 +02:00