Merge branch 'master' into miami

# Conflicts:
#	premake5.lua
#	src/control/Script.cpp
#	src/core/SurfaceTable.cpp
#	src/core/config.h
#	src/entities/Physical.cpp
#	src/entities/Physical.h
#	src/objects/Object.h
#	src/skel/skeleton.h
#	src/vehicles/Vehicle.h
This commit is contained in:
Sergeanur
2020-05-23 21:14:16 +03:00
14 changed files with 41 additions and 36 deletions

View File

@ -241,19 +241,19 @@ extern RsEventStatus RsEventHandler(RsEvent event, void *param);
extern RsEventStatus RsKeyboardEventHandler(RsEvent event, void *param);
extern RsEventStatus RsPadEventHandler(RsEvent event, void *param);
extern RwBool
extern RwBool
RsInitialize(void);
extern RwBool
extern RwBool
RsRegisterImageLoader(void);
extern RwBool
extern RwBool
RsRwInitialize(void *param);
extern RwBool
extern RwBool
RsSelectDevice(void);
extern RwBool
extern RwBool
RsInputDeviceAttach(RsInputDeviceType inputDevice,
RsInputEventHandler inputEventHandler);