Last change
on this file since 6912 was
5929,
checked in by rgrieder, 15 years ago
|
Merged core5 branch back to the trunk.
Key features include clean level unloading and an extended XML event system.
Two important notes:
Delete your keybindings.ini files! * or you will still get parser errors when loading the key bindings.
Delete build_dir/lib/modules/libgamestates.module! * or orxonox won't start.
Best thing to do is to delete the build folder
|
-
Property svn:eol-style set to
native
|
File size:
798 bytes
|
Rev | Line | |
---|
[5695] | 1 | --- linux/EventHelpers.cpp (revision 5668) |
---|
| 2 | +++ linux/EventHelpers.cpp (working copy) |
---|
| 3 | @@ -35,6 +35,20 @@ |
---|
| 4 | # include <iostream> |
---|
| 5 | #endif |
---|
| 6 | |
---|
| 7 | +// Fixes for missing macros in input.h |
---|
| 8 | +#ifndef FF_EFFECT_MIN |
---|
| 9 | +#define FF_EFFECT_MIN FF_RUMBLE |
---|
| 10 | +#endif |
---|
| 11 | +#ifndef FF_EFFECT_MAX |
---|
| 12 | +#define FF_EFFECT_MAX FF_RAMP |
---|
| 13 | +#endif |
---|
| 14 | +#ifndef FF_WAVEFORM_MIN |
---|
| 15 | +#define FF_WAVEFORM_MIN FF_SQUARE |
---|
| 16 | +#endif |
---|
| 17 | +#ifndef FF_WAVEFORM_MAX |
---|
| 18 | +#define FF_WAVEFORM_MAX FF_CUSTOM |
---|
| 19 | +#endif |
---|
| 20 | + |
---|
| 21 | using namespace std; |
---|
| 22 | using namespace OIS; |
---|
| 23 | |
---|
| 24 | |
---|
[5929] | 25 | --- win32/Win32ForceFeedback.cpp |
---|
| 26 | +++ win32/Win32ForceFeedback.cpp |
---|
| 27 | @@ -25,7 +25,7 @@ |
---|
| 28 | #include <Math.h> |
---|
| 29 | |
---|
| 30 | // 0 = No trace; 1 = Important traces; 2 = Debug traces |
---|
| 31 | -#define OIS_WIN32_JOYFF_DEBUG 1 |
---|
| 32 | +#define OIS_WIN32_JOYFF_DEBUG 0 |
---|
| 33 | |
---|
| 34 | #if (defined (_DEBUG) || defined(OIS_WIN32_JOYFF_DEBUG)) |
---|
| 35 | #include <iostream> |
---|
Note: See
TracBrowser
for help on using the repository browser.