1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-18 07:37:46 +00:00
re3/src/core
Sergeanur 9647901ba0 Merge branch 'miami' into lcs
# Conflicts:
#	src/control/Script.h
#	src/modelinfo/SimpleModelInfo.cpp
#	src/modelinfo/VehicleModelInfo.cpp
#	src/rw/VisibilityPlugins.cpp
#	src/rw/VisibilityPlugins.h
2021-01-25 19:35:03 +02:00
..
Accident.cpp get rid of most --MIAMI comments 2021-01-22 11:43:29 +01:00
Accident.h Squeeze performance option, minor fixes 2020-08-03 16:00:32 +03:00
AnimViewer.cpp CPedModelInfo and CTempColModels 2021-01-24 17:14:16 +01:00
AnimViewer.h
Cam.cpp Merge branch 'miami' into lcs 2021-01-25 19:35:03 +02:00
Camera.cpp Merge remote-tracking branch 'origin/miami' into lcs 2021-01-22 15:04:09 +02:00
Camera.h sync 2021-01-20 21:14:12 +03:00
CdStream.cpp make building with Codewarrior 7 possible 2021-01-24 17:08:34 +01:00
CdStream.h Linux build support 2020-05-11 21:00:55 +03:00
CdStreamPosix.cpp memorymgr fix 2020-12-18 14:33:54 +01:00
Clock.cpp Merge remote-tracking branch 'origin/miami' into lcs 2021-01-22 15:04:09 +02:00
Clock.h some useless code 2021-01-11 20:20:08 +01:00
common.h Merge branch 'miami' into lcs 2021-01-25 19:35:03 +02:00
config.h Merge branch 'miami' into lcs 2021-01-25 19:35:03 +02:00
ControllerConfig.cpp Merge pull request #977 from withmorten/miami-cw 2021-01-25 14:06:53 +01:00
ControllerConfig.h No more resetting bindings for joypad, create .ini at the first start, joystick hotplug for Linux 2021-01-23 16:18:19 +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 trivial fix 2020-12-27 06:03:38 +03:00
Directory.h fixed extra directory issues 2020-04-21 13:56:33 +02:00
EventList.cpp get rid of most --MIAMI comments 2021-01-22 11:43:29 +01:00
EventList.h signed/unsigned fixes, and some other fixes 2020-12-27 05:23:37 +03:00
FileLoader.cpp CPedModelInfo and CTempColModels 2021-01-24 17:14:16 +01:00
FileLoader.h finished CFileLoader; some COcclusion stubs 2020-05-19 10:23:08 +02:00
FileMgr.cpp little fixes 2021-01-08 13:51:42 +01:00
FileMgr.h little fixes 2021-01-08 13:51:42 +01:00
Fire.cpp get rid of most --MIAMI comments 2021-01-22 11:43:29 +01:00
Fire.h Hud, Fire, OnscreenBlaBla 2020-10-12 06:42:54 +03:00
Frontend.cpp Merge branch 'miami' into lcs 2021-01-25 19:35:03 +02:00
Frontend.h Store all settings in .INI 2021-01-23 15:59:38 +03:00
Frontend_PS2.cpp sync with re3 2021-01-09 01:01:41 +03:00
Frontend_PS2.h Fix build without CFO, NO_ISLAND_LOADING, save postfx/pipeline mults 2020-11-07 21:58:23 +03:00
FrontEndControls.cpp sync with re3 2021-01-09 01:01:41 +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 CVehicleModelInfo 2021-01-24 22:50:16 +01:00
Game.h CutsceneMgr done + use original VB audio + make interiors visible + use hashed model info names a bit 2021-01-11 19:53:15 +02:00
General.h make building with Codewarrior 7 possible 2021-01-24 17:08:34 +01:00
IniFile.cpp Merge remote-tracking branch 'origin/miami' into lcs 2021-01-22 15:04:09 +02:00
IniFile.h More refs removed 2020-04-16 15:30:47 +03:00
KeyGen.cpp More linux fix 2021-01-09 13:33:45 +02:00
KeyGen.h CKeyGen 2021-01-08 20:51:31 +02:00
Leeds.cpp CSimpleModelInfo 2021-01-24 13:47:33 +01:00
Leeds.h CSimpleModelInfo 2021-01-24 13:47:33 +01:00
Lists.cpp
Lists.h Includes overhaul, fix some compiler warnings 2021-01-23 03:23:16 +03:00
main.cpp Merge branch 'miami' into lcs 2021-01-25 19:35:03 +02:00
main.h CVehicleModelInfo 2021-01-24 22:50:16 +01:00
MenuScreens.cpp fix to !PC_PLAYER_CONTROLS 2021-01-04 23:29:23 +01:00
MenuScreensCustom.cpp No more resetting bindings for joypad, create .ini at the first start, joystick hotplug for Linux 2021-01-23 16:18:19 +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/miami' into lcs 2021-01-23 17:54:46 +02:00
Pad.h sync 2021-01-18 22:20:44 +03:00
Placeable.cpp CEntity and friends 2020-05-19 20:56:42 +02:00
Placeable.h make building with Codewarrior 7 possible 2021-01-24 17:08:34 +01:00
PlayerInfo.cpp Merge remote-tracking branch 'origin/miami' into lcs 2021-01-22 15:04:09 +02:00
PlayerInfo.h Includes overhaul, fix some compiler warnings 2021-01-23 03:23:16 +03:00
Pools.cpp get rid of most --MIAMI comments 2021-01-22 11:43:29 +01: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 Merge branch 'miami' into lcs 2021-01-25 19:35:03 +02:00
Radar.h Load LCS radar blips 2021-01-22 04:00:17 +02: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 Merge branch 'miami' into lcs 2021-01-25 19:35:03 +02:00
References.cpp Reorder CEntity functions into their original order 2020-12-29 13:55:26 +02:00
References.h rem refs 2020-04-17 08:54:14 +03:00
Ropes.cpp make building with Codewarrior 7 possible 2021-01-24 17:08:34 +01:00
Ropes.h CHeli and CRopes done 2020-07-27 14:06:23 +02:00
Stats.cpp get rid of most --MIAMI comments 2021-01-22 11:43:29 +01:00
Stats.h make building with Codewarrior 7 possible 2021-01-24 17:08:34 +01:00
Streaming.cpp colstore done 2021-01-23 12:40:23 +01:00
Streaming.h colstore done 2021-01-23 12:40:23 +01:00
SurfaceTable.cpp get rid of most --MIAMI comments 2021-01-22 11:43:29 +01:00
SurfaceTable.h fixed shoot through collision 2021-01-13 20:39:00 +01:00
templates.h Get rid of bitfields in CPool 2021-01-20 19:24:08 +02:00
timebars.cpp Fixes, mouse AUX buttons, joystick detect menu 2020-09-30 20:03:01 +03:00
timebars.h clean up timebar ifdefs 2020-10-25 16:17:31 +01:00
Timer.cpp get rid of most --MIAMI comments 2021-01-22 11:43:29 +01: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 get rid of most --MIAMI comments 2021-01-22 11:43:29 +01:00
User.h Peds, Hud, CFO 1/2, fixes - including zone names 2020-07-22 15:19:22 +03:00
Wanted.cpp get rid of most --MIAMI comments 2021-01-22 11:43:29 +01:00
Wanted.h fix CPed struct, GetWantedLevel 2021-01-11 18:43:04 +01:00
World.cpp Merge remote-tracking branch 'origin/lcs' into lcs 2021-01-23 15:14:24 +02:00
World.h Merge remote-tracking branch 'origin/miami' into lcs 2021-01-23 15:14:15 +02:00
ZoneCull.cpp get rid of most --MIAMI comments 2021-01-22 11:43:29 +01:00
ZoneCull.h garage cam fix 2020-12-26 13:45:53 +01:00
Zones.cpp Merge remote-tracking branch 'origin/miami' into lcs 2021-01-22 15:04:09 +02:00
Zones.h Includes overhaul, fix some compiler warnings 2021-01-23 03:23:16 +03:00