scrawl
|
32b837ebd4
|
Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics
|
2013-02-19 00:15:54 +01: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Marc Zinnschlag
|
14b4263143
|
Merge remote-tracking branch 'scrawl/alttab'
|
2012-08-27 20:32:56 +02:00 |
|
scrawl
|
dc8f9bd923
|
workaround for alt tab view mode toggle
|
2012-08-27 19:25:30 +02:00 |
|
scrawl
|
9af0b48ad6
|
show/hide crosshair correctly
|
2012-08-27 19:18:55 +02:00 |
|
scrawl
|
a4c1d979d6
|
Merge branch 'master' into quick_keys
|
2012-08-27 18:14:41 +02:00 |
|
scrawl
|
c5e55d3cac
|
fix screenshot function
|
2012-08-27 15:51:01 +02:00 |
|
greye
|
61923349e5
|
resolving conflicts
|
2012-08-27 14:52:54 +04:00 |
|
scrawl
|
5ebcaeb098
|
Merge branch 'next' into quick_keys
|
2012-08-27 11:04:23 +02:00 |
|
scrawl
|
b1a394552d
|
mouse click sounds
|
2012-08-27 10:01:53 +02:00 |
|
scrawl
|
fab4cfecb1
|
some unfinished work on quick keys window
|
2012-08-26 10:52:06 +02:00 |
|
Nikolay Kasyanov
|
71a6ce2202
|
removed cout spam
|
2012-08-20 21:14:29 +04:00 |
|
Nikolay Kasyanov
|
5395721c26
|
more appropriate fix for #189
|
2012-08-20 21:05:02 +04:00 |
|
scrawl
|
f7d537cb28
|
very small correction
|
2012-08-19 22:15:31 +02:00 |
|
scrawl
|
19ae30ee68
|
Merge branch 'master' into next
Conflicts:
apps/openmw/mwbase/inputmanager.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwinput/inputmanagerimp.hpp
apps/openmw/mwinput/mouselookevent.cpp
|
2012-08-19 22:09:22 +02:00 |
|
Marc Zinnschlag
|
d1656b2f5d
|
Merge remote-tracking branch 'greye/player_control'
Conflicts:
apps/openmw/mwrender/player.cpp
|
2012-08-18 13:38:54 +02:00 |
|
greye
|
b8e56d61d3
|
update camera code, add idle time
|
2012-08-18 01:31:57 +04:00 |
|
greye
|
3f3972eb3b
|
no vanity in gui mode (thanks scrawl)
|
2012-08-17 23:44:28 +04:00 |
|
greye
|
d2b451eb7d
|
entering vanity mode
|
2012-08-17 23:25:29 +04:00 |
|
greye
|
14f293882c
|
still resolving
|
2012-08-17 16:42:42 +04:00 |
|
greye
|
83356d5505
|
resolving conflicts
|
2012-08-17 16:25:54 +04:00 |
|
greye
|
7303d595dd
|
resolving conflicts
|
2012-08-17 15:36:51 +04:00 |
|
greye
|
0e6e141fd4
|
camera control related script instructions
|
2012-08-17 15:20:57 +04:00 |
|
greye
|
e8fc942bef
|
reverse Z-axis rotation to make doors happy
|
2012-08-17 15:19:44 +04:00 |
|
greye
|
a453a7f035
|
camera adjustment, fix view mode on start
|
2012-08-17 15:19:44 +04:00 |
|
greye
|
392e6efcb5
|
initial player rendering
|
2012-08-17 15:19:43 +04:00 |
|
greye
|
6f87c0c36d
|
preview mode, advanced vanity support
|
2012-08-17 15:19:43 +04:00 |
|
greye
|
fe1a9ac3c5
|
poor camera with some fixes
|
2012-08-17 15:19:43 +04:00 |
|
greye
|
c46eeaa100
|
initial 3d-person camera support
|
2012-08-17 15:19:43 +04:00 |
|
scrawl
|
f9efd543e4
|
use float for the mouse position tracking, should be more accurate for sensitivity multipliers != 1
|
2012-08-13 21:33:53 +02:00 |
|