This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/blocktypes/random_image.py b/blocktypes/random_image.py | |
index 8234f50..9a8be3a 100644 | |
--- a/blocktypes/random_image.py | |
+++ b/blocktypes/random_image.py | |
@@ -2,6 +2,7 @@ from random import choice | |
from django.template import Context, Template | |
from django.template.loader import get_template, render_to_string | |
+from django.core.exceptions import ObjectDoesNotExist | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/CMakeLists.txt b/CMakeLists.txt | |
index 98808fd..af75d90 100644 | |
--- a/CMakeLists.txt | |
+++ b/CMakeLists.txt | |
@@ -504,6 +504,8 @@ if(UNIX) | |
else() | |
list(APPEND LIBS ${SDL_LIBRARIES}) | |
endif(USE_SDL_2) | |
+ | |
+ list(APPEND LIBS xkbcommon) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[xboxdrv] | |
# Read from evdev device but don't grab for exclusive access. antimicro needs access | |
# to original device. Use chmod on device after starting xboxdrv and antimicro to hide it. | |
evdev = /dev/input/event6 | |
evdev-grab = false | |
# A lot of games with gamepad support expect xpad device. | |
mimic-xpad = true | |
[axismap] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/WiiTUIO/Input/WiiProvider/Keymap/WiiKeyMap.cs b/WiiTUIO/Input/WiiProvider/Keymap/WiiKeyMap.cs | |
index 4e2f131..bcc6014 100644 | |
--- a/WiiTUIO/Input/WiiProvider/Keymap/WiiKeyMap.cs | |
+++ b/WiiTUIO/Input/WiiProvider/Keymap/WiiKeyMap.cs | |
@@ -161,12 +161,12 @@ public void updateAccelerometer(AccelState accelState) | |
updateStickHandlers(outConfig, 0); | |
} | |
- if (accelState.Values.X * 2 > outConfig.Threshold && !PressedButtons["AccelX+"]) | |
+ if (accelState.Values.X > outConfig.Threshold && !PressedButtons["AccelX+"]) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Makefile b/Makefile | |
index 0350d14..c937f90 100644 | |
--- a/Makefile | |
+++ b/Makefile | |
@@ -1,5 +1,6 @@ | |
LINK_LIBS += -ludev | |
LINK_LIBS += -lxwiimote | |
+LINK_LIBS += -lm | |
EXTRA_CFLAGS += $(CONFIG_FLAGS) | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/sh | |
## This script is used to launch Windows games by using | |
## the Windows Steam client in a Wine virtual desktop. | |
## Credit goes to iVaN, dubigrasu, and Ryochan7 for creating various portions | |
## of this script. Discussion of this technique is currently being done at | |
## https://steamcommunity.com/groups/steamuniverse/discussions/1/494632768626127072/. | |
########################################## | |
# # |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/sh | |
## This script is used to launch Windows games by using | |
## the Windows Steam client in a Wine virtual desktop. | |
## Credit goes to iVaN, dubigrasu, and Ryochan7 for creating various portions | |
## of this script. Discussion of this technique is currently being done at | |
## https://steamcommunity.com/groups/steamuniverse/discussions/1/494632768626127072/. | |
########################################## | |
# # |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/glade/app.glade b/glade/app.glade | |
index 4cd57dc6..db6cb750 100644 | |
--- a/glade/app.glade | |
+++ b/glade/app.glade | |
@@ -565,7 +565,6 @@ | |
<property name="visible">True</property> | |
<property name="can_focus">False</property> | |
<property name="orientation">vertical</property> | |
- <signal name="drag-data-received" handler="on_drag_data_received" swapped="no"/> | |
<child> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/source/core/devices/device.h b/source/core/devices/device.h | |
index b18ea24..7e548f1 100644 | |
--- a/source/core/devices/device.h | |
+++ b/source/core/devices/device.h | |
@@ -15,11 +15,10 @@ | |
#include "../../plugin/plugin.h" | |
- | |
class event_translator; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Preferred gamepad assistance profile for MoltenGamepad. | |
move wm1 to virtpad1 | |
wiimote.?nk_accel_active = true | |
# Nunchuk mapping | |
wiimote.nk_stick_x = left_x | |
wiimote.nk_stick_y = left_y | |
wiimote.nk_accel_x = right_x | |
wiimote.nk_accel_y = right_y |
OlderNewer