scrawl
41ab7329a8
Store keybindings as keycode, not keyname. Also use SDL_GetKeyName instead of a manually created map. Fixes #1202
...
Note: breaks compatibility with input.xml, so the filename was changed.
2014-06-11 19:47:42 +02:00
Fil Krynicki
cd693b6d37
Fixed mouse closing containers, and injection/gui test order
...
Called setEnabled on channels now effects whether those channels
notify listeners, rather than whether they register changes to
their controls. This was making channels get stuck on "1" when the
GUI was activated.
Also ensured GUI activity can invalidate player controls even if
that activity is closing the GUI, by re-ordering a check.
And fixed a comment.
2014-06-07 20:08:29 -04:00
Fil Krynicki
97caa1f8a4
Alternative fix strategy by checking for binding state
2014-06-06 22:25:23 -04:00
Fil Krynicki
bbb7ceab43
Merge branch 'master' into bug1196jumpdialog
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
2014-05-31 19:58:21 -04:00
Fil Krynicki
cd131e7f86
1196/1217 fix
...
Fixes an issue where inputs could be processed by both GUI and
gameplay systems. An enabled/disable has been added to OIS
channels, and OpenMW now disables player gameplay hotkeys when
a GUI element has focus. GUI hotkeys are left enabled.
2014-05-31 19:51:21 -04:00
Marc Zinnschlag
be88168e91
Merge remote-tracking branch 'scrawl/master'
2014-05-30 10:07:18 +02:00
scrawl
afc1fa49f6
Use mouse release instead of press for binding actions
...
Resolves difficulties binding actions to mouse buttons (Fixes #1364 )
2014-05-29 20:35:57 +02:00
cc9cii
bbe77d656a
Minor fixes from static analysis.
2014-05-28 21:15:50 +10:00
greye
663d5c314e
be more verbose on change reasons
2014-05-22 16:35:57 +04:00
greye
3721174ae4
proof-of-concept boost::wave iteration policy
2014-05-21 23:50:58 +04:00
greye
1b7ed98325
fix typos, reset memory before using
2014-05-20 12:41:45 +04:00
greye
a46662043a
tinyxml convert path to UTF-16 on Windows
2014-05-20 09:17:32 +04:00
scrawl
eff648e3ab
Show unhandled SDL events in hexadecimal (easier to compare with the enum)
2014-05-03 16:16:27 +02:00
scrawl
e7b9b6d87a
Fix a confusing variable name
2014-05-02 23:07:01 +02:00
scrawl
a3dffd5d57
Add some missing SDL to MyGUI key translations.
...
Most importantly to allow numpad enter as alternative to return key.
2014-04-18 14:13:29 +02:00
scrawl
edb5a54092
Include some more required Ogre headers explicitely.
2014-03-05 21:46:37 +01:00
Bret Curtis
ab224f93c9
remove our stdint.h version that uses boost and force usage of system stdint.h
2014-03-05 17:08:58 +01:00
cc9cii
5539c75ef0
Typo fix to avoid divide by zero.
2014-03-05 22:12:59 +11:00
scrawl
439018e706
Get rid of useless return values
2014-02-19 11:23:03 +01:00
scrawl
c004fb778f
Get rid of underscore defines. They are reserved by the standard.
2014-01-05 18:22:29 +01:00
scrawl
6d27ebabb6
Integrate AddGlow with material controllers
2013-12-26 20:53:45 +01:00
scrawl
19e5978a01
Merge branch 'master' of https://github.com/zinnschlag/openmw
...
Conflicts:
apps/openmw/main.cpp
2013-12-16 13:35:31 +01:00
scrawl
4bc4af6bf0
Enable microcode caching for Ogre 1.9+
2013-12-14 22:01:24 +01:00
Lukasz Gromanowski
bfd79bfbe6
Various fixes for CppCheck warnings.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-06 07:36:16 +01:00
scrawl
bcf61331ab
Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger.
2013-11-29 20:06:54 +01:00
scrawl
7f735c2c4c
Release and show the cursor when focus lost
2013-11-20 16:07:14 +01:00
scrawl
3452bd2e0b
Add glow effect for enchanted items
2013-11-20 00:13:12 +01:00
Marc Zinnschlag
b7bb7d6902
Merge remote-tracking branch 'scrawl/master'
...
Conflicts:
apps/opencs/editor.cpp
2013-11-10 11:49:48 +01:00
scrawl
c3d9bc31bb
Fix exiting OpenMW via the window close button (regression)
2013-11-05 03:02:28 +01:00
scrawl
e6960d915a
Add simple Ogre widget
2013-11-02 02:51:38 +01:00
scrawl
2fb059e2fa
Don't destroy the SDL window twice
2013-10-13 18:20:55 +02:00
Marc Zinnschlag
6f64b1b9db
cmake option to use system tinyxml instead of embedded one
2013-09-13 15:11:17 +02:00
Marc Zinnschlag
b737d958e1
Merge remote-tracking branch 'kcat/master'
...
Conflicts:
extern/sdl4ogre/cursormanager.hpp
2013-09-02 10:54:18 +02:00
Chris Robinson
1026e89810
Don't assume TexturePtr is a class
2013-08-29 17:41:20 -07:00
scrawl
f12d5b728a
Ogre 1.9 compatibility changes
2013-08-29 17:14:25 +02:00
scrawl
d3d6dfbde8
Refactored loading screen
...
- Add loading progress for data files, global map, terrain
- Refactored and improved cell loading progress
2013-08-27 15:48:13 +02:00
scrawl
6dc216af3d
Fix a typo, caused occasional white spots on local map render
2013-08-09 21:29:43 +02:00
Nikolay Kasyanov
e7500b22ba
Fixed listener call issue spotted by @scrawl
2013-08-01 07:16:00 -07:00
Marc Zinnschlag
b8cd3f3915
Merge remote-tracking branch 'corristo/master'
2013-08-01 09:06:34 +02:00
Nikolay Kasyanov
3849c8488c
Use SDL_False instead of -1
2013-08-01 10:54:53 +04:00
Nikolay Kasyanov
4e9ef31375
Added missing(?) break
2013-08-01 10:53:28 +04:00
Nikolay Kasyanov
98216544de
screw tabs
2013-08-01 10:52:50 +04:00
Marc Zinnschlag
130141ecac
Merge remote-tracking branch 'corristo/master'
2013-07-31 22:17:14 +02:00
Nikolay Kasyanov
e552eccaa4
Fixed endless message loop after trying to resize window on OS X
2013-07-31 23:26:46 +04:00
Nikolay Kasyanov
66608d5c92
Fixed compilation os OS X after moving SDL windowing code to extern/sdl4ogre
2013-07-31 22:30:52 +04:00
scrawl
7dc30a01cd
Some changes suggested by cppcheck
2013-07-31 18:46:32 +02:00
scrawl
6164e5bae6
Restored window resizing
2013-07-29 02:32:08 +02:00
scrawl
50a0d16f8f
Pass only the X11 window to Ogre, otherwise it would treat it as parentWindowHandle instead of externalWindowHandle. parentWindowHandle does not seem to play nice with SDL and occasionally crashes with a GLXBadDrawable error on startup.
2013-07-07 20:22:41 +02:00
scrawl
b16bc69479
Removed the no longer needed --debug switch
2013-06-16 20:39:40 +02:00
scrawl
b16c92c2f5
Better handle SDL_TEXTINPUT events
2013-06-16 19:43:59 +02:00
