1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-24 02:30:01 +00:00
re3/src/core
Sergeanur a3322f17d5 Merge branch 'master' into miami
# Conflicts:
#	src/animation/CutsceneMgr.cpp
#	src/audio/AudioLogic.cpp
#	src/audio/soundlist.h
#	src/core/ControllerConfig.cpp
#	src/core/ControllerConfig.h
#	src/core/Streaming.cpp
#	src/peds/PedChat.cpp
#	src/render/Weather.cpp
#	src/rw/TexRead.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/Boat.cpp
2020-08-24 21:59:32 +03:00
..
Accident.cpp Squeeze performance option, minor fixes 2020-08-03 16:00:32 +03:00
Accident.h Squeeze performance option, minor fixes 2020-08-03 16:00:32 +03:00
AnimViewer.cpp bla 2020-06-08 13:23:08 +02:00
AnimViewer.h AnimViewer! 2019-08-15 17:51:39 +03:00
Cam.cpp Stats(except displaying), PlayerInfo, marker fix 2020-08-14 01:14:04 +03:00
Camera.cpp implemented extended postfx 2020-08-11 18:40:04 +02:00
Camera.h cleanup 2020-06-29 12:12:43 +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 Update CdStreamPosix.cpp 2020-08-07 17:51:15 +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 rw stuff done & other small things 2020-08-20 12:53:17 +02:00
Collision.h rw stuff done & other small things 2020-08-20 12:53:17 +02:00
ColStore.cpp small stuff 2020-08-19 21:58:00 +02:00
ColStore.h most of animation system done; little stuff here and there 2020-05-08 15:59:57 +02:00
common.h Merge remote-tracking branch 'origin/master' into miami 2020-08-07 12:34:41 +03:00
config.h Merge branch 'master' into miami 2020-08-24 21:59:32 +03:00
ControllerConfig.cpp Merge branch 'master' into miami 2020-08-24 21:59:32 +03:00
ControllerConfig.h Merge branch 'master' into miami 2020-08-24 21:59:32 +03:00
Crime.h CWanted, anim fix, ped objs renaming, remove III beta features 2020-06-22 04:20:56 +03:00
Debug.cpp Revert "FONT_BANK renamed to FONT_STANDARD" 2020-06-07 05:03:06 +03:00
Debug.h implemented skinned peds, no cutscene hands yet 2020-04-24 11:42:38 +02:00
Directory.cpp 64-bit on Windows 2020-07-24 20:26:33 +03:00
Directory.h fixed extra directory issues 2020-04-21 13:56:33 +02:00
EventList.cpp Merge remote-tracking branch 'origin/master' into miami 2020-08-07 12:34:41 +03:00
EventList.h 64-bit on Windows 2020-07-24 20:26:33 +03:00
FileLoader.cpp CCollision done and fixes 2020-07-27 15:38:46 +02:00
FileLoader.h finished CFileLoader; some COcclusion stubs 2020-05-19 10:23:08 +02:00
FileMgr.cpp Fix casepath chaos 2020-07-28 17:56:47 +03:00
FileMgr.h Merge branch 'master' into miami 2020-08-15 15:13:46 +03:00
Fire.cpp Merge branch 'master' into miami 2020-07-29 15:34:57 +03:00
Fire.h rem refs 2020-04-17 08:54:14 +03:00
Frontend.cpp Merge branch 'master' into miami 2020-08-24 21:59:32 +03:00
Frontend.h Merge remote-tracking branch 'origin/master' into miami 2020-08-19 23:44:08 +03:00
Frontend_PS2.cpp Stats(except displaying), PlayerInfo, marker fix 2020-08-14 01:14:04 +03:00
Frontend_PS2.h fixfixfix 2020-06-28 00:31:45 +03:00
FrontEndControls.cpp fixes 2020-06-28 01:57:01 +03:00
FrontEndControls.h fixes 2020-06-28 01:57:01 +03:00
FrontendTriggers.h fixes 2020-06-28 01:57:01 +03:00
Game.cpp CStreaming done, hopefully 2020-08-20 23:44:40 +02:00
Game.h Merge branch 'master' into miami 2020-07-13 18:10:17 +03:00
General.h New math wrappers 2020-07-23 00:31:06 +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 CStreaming done, hopefully 2020-08-20 23:44:40 +02:00
main.h small fixes 2020-08-20 12:55:41 +02:00
MenuScreens.cpp Merge branch 'master' into miami 2020-08-19 23:34:33 +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 Merge remote-tracking branch 'origin/master' into miami 2020-08-19 23:44:08 +03:00
Pad.h 2 new opcodes 2020-08-16 17:10:59 +03: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 Wheelie opcode 2020-08-14 18:54:01 +03:00
PlayerInfo.h Wheelie opcode 2020-08-14 18:54:01 +03:00
Pools.cpp rw stuff done & other small things 2020-08-20 12:53:17 +02:00
Pools.h rw stuff done & other small things 2020-08-20 12:53:17 +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 New math wrappers 2020-07-23 00:31:06 +03:00
Radar.h Stats(except displaying), PlayerInfo, marker fix 2020-08-14 01:14:04 +03:00
Range2D.cpp Restore original logic of CPed::WanderRange 2020-06-04 04:31:04 +03:00
Range2D.h Range2D and Range3D 2020-06-03 04:45:25 +03:00
Range3D.cpp Restore original logic of CPed::WanderRange 2020-06-04 04:31:04 +03:00
Range3D.h Range2D and Range3D 2020-06-03 04:45:25 +03:00
re3.cpp CWeather done 2020-08-23 13:27:56 +02: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
Ropes.cpp CCopPed, except spike traps 2020-07-28 17:04:34 +03:00
Ropes.h CHeli and CRopes done 2020-07-27 14:06:23 +02:00
Stats.cpp CarCtrl finished, minor Script things 2020-08-16 18:39:11 +03:00
Stats.h Stats(except displaying), PlayerInfo, marker fix 2020-08-14 01:14:04 +03:00
Streaming.cpp fix streaming bug 2020-08-21 12:09:45 +02:00
Streaming.h CStreaming done, hopefully 2020-08-20 23:44:40 +02:00
SurfaceTable.cpp small stuff 2020-08-19 21:58:00 +02:00
SurfaceTable.h small stuff 2020-08-19 21:58:00 +02:00
TempColModels.cpp Merge branch 'master' into miami 2020-07-13 18:10:17 +03:00
TempColModels.h update file loader for new VC fields 2020-05-10 18:14:14 +02:00
templates.h rw stuff done & other small things 2020-08-20 12:53:17 +02:00
timebars.cpp Revert "FONT_BANK renamed to FONT_STANDARD" 2020-06-07 05:03:06 +03:00
timebars.h normalized line endings to LF 2020-04-09 20:50:24 +02:00
Timer.cpp DrawStandardMenus, VC menu array and minor fixes 2020-06-01 18:32:34 +03:00
Timer.h Merge remote-tracking branch 'origin/master' into miami 2020-06-29 12:56:50 +03: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 Peds, Hud, CFO 1/2, fixes - including zone names 2020-07-22 15:19:22 +03:00
User.h Peds, Hud, CFO 1/2, fixes - including zone names 2020-07-22 15:19:22 +03:00
vu0Collision.dsm VU0 collision 2020-08-03 17:32:06 +02:00
vu0Collision_1.s VU0 collision 2020-08-03 17:32:06 +02:00
vu0Collision_2.s VU0 collision 2020-08-03 17:32:06 +02:00
Wanted.cpp Stats(except displaying), PlayerInfo, marker fix 2020-08-14 01:14:04 +03:00
Wanted.h CWanted, anim fix, ped objs renaming, remove III beta features 2020-06-22 04:20:56 +03:00
World.cpp Merge remote-tracking branch 'origin/master' into miami 2020-08-07 12:34:41 +03:00
World.h more cleanup 2020-06-14 23:16:22 +02:00
ZoneCull.cpp finished cullzones 2020-08-21 13:28:33 +02:00
ZoneCull.h finished cullzones 2020-08-21 13:28:33 +02:00
Zones.cpp fixes to zones and vehicle comp rules 2020-08-24 17:21:45 +02:00
Zones.h fixes to zones and vehicle comp rules 2020-08-24 17:21:45 +02:00