Merge branch 'master' into stubs

# Conflicts:
#	engine/Windows/VisualStudio/uniquake.vcxproj

engine/UniQuake/in_uniquake.c

@@ -0,0 +1,61 @@
+#ifndef USE_LIBSDL
+#include "quakedef.h"
+
+void IN_Init(void)
+{
+
+}
+
+void IN_Shutdown(void)
+{
+
+}
+
+// oportunity for devices to stick commands on the script buffer
+void IN_Commands(void)
+{
+
+}
+
+// mouse moved by dx and dy pixels
+void IN_MouseMotion(int dx, int dy)
+{
+
+}
+
+// used as a callback for Sys_SendKeyEvents() by some drivers
+void IN_SendKeyEvents(void)
+{
+
+}
+
+// do stuff if input mode (text/non-text) changes matter to the keyboard driver
+void IN_UpdateInputMode(void)
+{
+
+}
+
+// add additional movement on top of the keyboard move cmd
+void IN_Move(usercmd_t *cmd) 
+{
+
+}
+
+// restores all button and position states to defaults
+void IN_ClearStates(void)
+{
+
+}
+
+// called when the app becomes active
+void IN_Activate()
+{
+
+}
+
+// called when the app becomes inactive
+void IN_Deactivate(qboolean free_cursor)
+{
+
+}
+#endif	// !USE_LIBSDL

engine/Windows/VisualStudio/uniquake.vcxproj

@@ -361,6 +361,7 @@ copy "$(SolutionDir)\..\SDL2\lib64\*.dll" "$(TargetDir)"</Command>
     <ClCompile Include="..\..\Quake\zone.c" />
     <ClCompile Include="..\..\UniQuake\gl_uniquake.c" />
     <ClCompile Include="..\..\UniQuake\stub\stub_opengl.c" />
+    <ClCompile Include="..\..\UniQuake\in_uniquake.c" />
     <ClCompile Include="..\..\UniQuake\net_uniquake.c" />
     <ClCompile Include="..\..\UniQuake\sys_uniquake.c" />
     <ClCompile Include="..\..\UniQuake\uniquake.c" />

engine/Windows/VisualStudio/uniquake.vcxproj.filters

@@ -235,6 +235,9 @@
     <ClCompile Include="..\..\UniQuake\net_uniquake.c">
       <Filter>uniquake</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\UniQuake\in_uniquake.c">
+      <Filter>uniquake</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Quake\anorm_dots.h">