scrawl
|
5834b4baa5
|
door markers on the local map
|
2012-08-28 17:30:34 +02:00 |
|
Marc Zinnschlag
|
40d4dad15e
|
Issue #378: Fix (record wasn't build fully)
|
2012-08-28 09:32:38 +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 |
|
scrawl
|
321f7c3419
|
fix an infinite recursion regression on several dialogs.
|
2012-08-27 21:29:04 +02:00 |
|
scrawl
|
5c28a67203
|
broke something in the last commit.
|
2012-08-27 20:55:39 +02:00 |
|
scrawl
|
4f19b7fb9b
|
fix leaks.
|
2012-08-27 20:52:32 +02:00 |
|
scrawl
|
bc36b0e2bd
|
remove the restriction on the last quick key
|
2012-08-27 20:51:13 +02:00 |
|
scrawl
|
6161f81c24
|
last bits of the quick key menu.
|
2012-08-27 20:44:14 +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 |
|
Marc Zinnschlag
|
d0cebea580
|
some cleanup
|
2012-08-26 18:50:47 +02:00 |
|
Marc Zinnschlag
|
450656a890
|
Merge remote-tracking branch 'dgdiniz/MoveSoundtoAction-Task339' into next
|
2012-08-26 18:39:09 +02:00 |
|
Marc Zinnschlag
|
ef4910293b
|
Merge remote-tracking branch 'corristo/osx_f_keys_fix' into next
|
2012-08-26 18:35:26 +02:00 |
|
Douglas Diniz
|
5cbb08fee1
|
Task 339 - Moving all sounds to actions
|
2012-08-26 11:47:45 -03:00 |
|
scrawl
|
c0f27bd5ef
|
magic selection window
|
2012-08-26 11:37:33 +02:00 |
|
scrawl
|
fab4cfecb1
|
some unfinished work on quick keys window
|
2012-08-26 10:52:06 +02:00 |
|
Marc Zinnschlag
|
1fd4d84173
|
Merge remote-tracking branch 'mmd/windowswarnings' into next
|
2012-08-24 15:07:19 +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 |
|
Douglas Diniz
|
82e7c04c0a
|
Changing sounds to Action.
Adding onActor to Action to choose between playSound and playSound3D.
|
2012-08-19 20:11:50 -03: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 |
|
greye
|
e6c3e0744e
|
tvm update and fix
|
2012-08-19 10:37:51 +04:00 |
|
greye
|
5b2b378f25
|
tvm script instruction
|
2012-08-18 18:05:10 +04: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
|
b6954a4e8d
|
use the same height on non-1st person modes
|
2012-08-17 22:08:16 +04:00 |
|
scrawl
|
8817a9634c
|
don't switch to vanity mode as a result of idle time when the gui is opened (e.g. when talking to someone)
|
2012-08-17 16:55:21 +02:00 |
|
Marc Zinnschlag
|
1da56e2832
|
removed some unused variables
|
2012-08-17 15:37:14 +02: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
|
4f10138a04
|
using real player sight angles on ray cast
|
2012-08-17 15:20:57 +04:00 |
|
greye
|
0e6e141fd4
|
camera control related script instructions
|
2012-08-17 15:20:57 +04:00 |
|
greye
|
60fb1e8df6
|
fix sky in preview mode movement
|
2012-08-17 15:19:44 +04:00 |
|
greye
|
6961830efb
|
using real player eye direction when moving
|
2012-08-17 15:19:44 +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 |
|
scrawl
|
34f796c38e
|
removed the far clip distance hack which is not needed anymore
|
2012-08-17 15:19:44 +04:00 |
|
scrawl
|
b97b3d7b71
|
fix sky position when reflection is enabled, fix delay in sky reflection
|
2012-08-17 15:19:44 +04:00 |
|
greye
|
575244bd35
|
fix SkaManager issue
|
2012-08-17 15:19:44 +04:00 |
|
greye
|
783e81afc3
|
fix 1st/preview/1st change; 1st invisible model
|
2012-08-17 15:19:43 +04:00 |
|