Sergeanur acdc52116e Merge branch 'master' into miami ... # Conflicts: # src/animation/RpAnimBlend.cpp # src/audio/oal/stream.cpp # src/audio/sampman.h # src/control/Pickups.cpp # src/core/Collision.cpp # src/core/Collision.h # src/core/FileLoader.cpp # src/core/FileMgr.cpp # src/core/FileMgr.h # src/core/Streaming.cpp # src/core/Streaming.h # src/core/SurfaceTable.h # src/modelinfo/VehicleModelInfo.h # src/peds/Ped.cpp # src/rw/RwHelper.cpp # src/rw/RwHelper.h # src/skel/glfw/glfw.cpp # src/skel/platform.h # src/text/Text.cpp # src/text/Text.h # src/vehicles/CarGen.cpp # src/vehicles/Heli.cpp		2020-07-29 15:34:57 +03:00
..
ClumpRead.cpp	Remove patches	2020-04-17 16:31:11 +03:00
Lights.cpp	VC CMenuManager struct, ctor etc.	2020-05-22 03:48:12 +03:00
Lights.h	Link with RW libs	2020-04-11 23:37:04 +03:00
NodeName.cpp	64-bit on Windows	2020-07-24 20:26:33 +03:00
NodeName.h	Link with RW libs	2020-04-11 23:37:04 +03:00
RwDualPass.cpp	Add forgotten file	2020-07-29 15:25:57 +03:00
RwHelper.cpp	Merge branch 'master' into miami	2020-07-29 15:34:57 +03:00
RwHelper.h	Merge branch 'master' into miami	2020-07-29 15:34:57 +03:00
RwMatFX.cpp	Dual pass rendering for RW 3.3	2020-07-29 15:24:42 +03:00
TexRead.cpp	Revert "FONT_BANK renamed to FONT_STANDARD"	2020-06-07 05:03:06 +03:00
TxdStore.cpp	fixes for glfw	2020-04-26 20:16:31 +02:00
TxdStore.h	More refs removed	2020-04-16 11:50:45 +03:00
VisibilityPlugins.cpp	64-bit on Windows	2020-07-24 20:26:33 +03:00
VisibilityPlugins.h	64-bit on Windows	2020-07-24 20:26:33 +03:00