vorenon
1a43d86d9e
Close messages boxes with the activation key (Bug #589 )
2013-02-26 15:58:32 +01:00
scrawl
d4264353a3
Merge branch 'z-up' into graphics
...
Conflicts:
apps/openmw/mwrender/localmap.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/water.cpp
files/materials/water.shader
2013-02-26 14:54:53 +01:00
scrawl
5c0c5854e8
Unrelated change: we always want the XAutoRepeat workaround, regardless of using exclusive input or not
2013-02-26 12:01:10 +01:00
scrawl
b1fc68d44d
Merge branch 'master' into graphics
2013-02-25 17:36:33 +01:00
scrawl
73d48a95f6
Add message box when the player tries to move when being overencumbered.
2013-02-25 16:31:48 +01:00
scrawl
cacdb33b42
Merge branch 'master' into graphics
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/sky.cpp
2013-02-25 15:12:03 +01:00
Marc Zinnschlag
cd40d167ce
Merge remote-tracking branch 'chris/animation2'
2013-02-25 14:56:03 +01:00
scrawl
dfe29db9cb
Fix bug #591 : Don't allow opening new windows (main menu, console) if there's any modal widget active. Also made some windows modal that should be (character creation)
2013-02-25 06:57:32 +01:00
scrawl
32b837ebd4
Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics
2013-02-19 00:15:54 +01:00
Chris Robinson
bea460955d
Merge remote-tracking branch 'zini/next' into animation2
2013-02-17 16:03:39 -08:00
scrawl
b52df83d84
Pressing Enter should skip _one_ message box, not skip all message boxes until the key is released again
2013-02-17 20:23:22 +01:00
Marc Zinnschlag
31bfe62bbc
Merge remote-tracking branch 'scrawl/bug_562' into next
2013-02-17 17:41:19 +01:00
scrawl
5a11ddc485
Pressing F1 again hides the quick keys menu.
2013-02-17 16:01:36 +01:00
Chris Robinson
e2d7cc49e3
Merge remote-tracking branch 'zini/next' into animation2
2013-02-17 03:42:37 -08:00
scrawl
c4f17f5596
playercontrols switch now disables activation in general (Chris' suggestion)
2013-02-17 03:03:41 +01:00
Marc Zinnschlag
910858c300
Merge remote-tracking branch 'sergeyshambir/guiconvience' into next
2013-02-16 14:50:42 +01:00
scrawl
6a49ea9b4f
Cleaning out some old bits
2013-02-13 18:39:36 +01:00
Chris Robinson
6a9755778e
Merge remote-tracking branch 'zini/next' into animation2
2013-02-12 18:14:46 -08:00
Tom Mason
158c6fc9fa
pressing enter when a messagebox is prompting for "ok", will activate ok button
2013-02-10 14:58:46 +00:00
Sergey Shambir
bba024d6ad
Right mouse button click now stops Container GuiMode.
2013-02-10 08:37:45 +04:00
Chris Robinson
ebc7bc9427
Rename A_AlwaysRun to A_Run
...
Note that there is an "always run" key, but its functionality is handled by
A_ToggleWalk.
2013-02-06 18:22:16 -08:00
Chris Robinson
a8f0ce43a5
Add a run key
2013-02-06 17:51:47 -08:00
scrawl
31f760ccce
Fixing issues from last commit: restored input and occlusion queries
2013-02-05 20:26:13 +01:00
scrawl
c4d518132f
With the 1x1 background window trick, we can apply VSync without restart. Some issues left though.
2013-02-05 19:22:08 +01:00
Chris Robinson
3251796ba0
Fix left/right movement
2013-02-05 09:57:08 -08:00
Jordan Milne
10a3caa504
more resizing fixes from scrawl, share an SDLWindow between the input wrapper and the engine
2013-01-13 23:38:46 -04:00
Jordan Milne
5a6589af01
extract cursor management to a separate class, have windowmanager communicate with it. Initialize SDL during engine start
2013-01-12 11:57:29 -04:00
Jordan Milne
f9b064d1bc
add preliminary hardware cursor support into sdl4ogre and windowmanagerimp, handle alt-tabbing away from fullscreen gracefully
2013-01-11 08:27:59 -04:00
Jordan Milne
a030c03513
support the printscreen button properly
2013-01-10 23:53:19 -04:00
Jordan Milne
403b6756f5
remove dependency on boost::locale, use system mouse position in in-game menus
2013-01-10 23:29:51 -04:00
Jordan Milne
601d79ef3f
fix the mouse wheel in mygui
2013-01-10 17:59:49 -04:00
Jordan Milne
ed644259ce
Move SDL helpers to their own package in extern/, allow conversion from sdl to ois keycodes, (maybe) fix unicode handling
2013-01-10 17:21:47 -04:00
Jordan Milne
cb01df49c0
begin to support text input
2013-01-09 11:30:33 -04:00
Jordan Milne
53cff0ba68
use native relative mouse movements where available, have the cursor follow the hardware cursor in the main menu
2013-01-09 09:05:47 -04:00
Jordan Milne
02ccb75894
Wrap the mouse to the window (except in debug mode)
...
Grab the mouse when not in the main menu (except in debug mode)
Always hide the cursor when it's over the window
Allow warping the mouse around
Handle ^C properly
2013-01-09 06:10:05 -04:00
Jordan Milne
6b49b8ab47
MyGUI doesn't care for SDL's mouse button ordering, send it what it expects
2013-01-08 22:14:30 -04:00
Jordan Milne
3b1d285cf3
fix compile errors, work with unmodified SDL
2013-01-08 21:01:58 -04:00
Jordan Milne
6449f68d61
Merge branch 'master' into sdl_input
2013-01-08 06:24:31 -04:00
Jordan Milne
884d3ea4d8
Rip out OIS, fill the holes with SDL goodness. WIP.
2013-01-08 06:19:05 -04:00
scrawl
f1b138d0a8
Merge branch 'master' into videoplayback
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2013-01-07 13:25:15 +01:00
scrawl
ddbe13e569
Workaround for http://bugs.openmw.org/issues/475
2013-01-03 01:07:17 +01:00
scrawl
faad64b254
Esc cancels the video
2012-12-12 01:13:53 +01:00
Marc Zinnschlag
5eb0f489e2
Issue 476: fixed auto-move bypassing disabled player controls
2012-11-27 18:39:12 +01:00
scrawl
21e0cde914
changed OIS includes since OIS_INCLUDE_DIR is already an include directory
2012-11-06 15:26:51 +01:00
scrawl
896428c129
enableRestMenu & enableLevelupMenu
2012-09-15 20:18:41 +02:00
scrawl
76b494100e
finished?
2012-09-15 17:12:42 +02:00
scrawl
2b339f6c0f
loading screen
2012-09-11 16:37:54 +02:00
scrawl
9448ce5968
implemented "get<Control>Disabled" functions
2012-09-10 18:44:59 +02:00
scrawl
760f05c454
the HUD can be toggled with F12 key; useful for screenshots
2012-08-30 20:47:39 +02:00
Marc Zinnschlag
160b52162b
Merge remote-tracking branch 'scrawl/quick_keys'
...
Conflicts:
apps/openmw/mwgui/windowmanagerimp.cpp
2012-08-28 09:06:40 +02:00
