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
Marc Zinnschlag
1fd4d84173
Merge remote-tracking branch 'mmd/windowswarnings' into next
2012-08-24 15:07:19 +02:00
Michael Mc Donnell
5fa8165f97
Use char literals in UTF 8 conversion to fix 798 warnings
...
The data type is specified as char but the literals are unsigned char. This
results in 798 truncation warnings in vs2010. The literals were converted
with a simple python script to signed char while taking two's complement and
the overflow into account.
Also tested on Ubuntu 12.04 with gcc 4.6.
2012-08-22 16:42:53 -04: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
Marc Zinnschlag
e9b80c34fe
Merge remote-tracking branch 'greye/rc0-17'
2012-08-19 15:36:35 +02:00
greye
e6c3e0744e
tvm update and fix
2012-08-19 10:37:51 +04:00
Nikolay Kasyanov
609a45258b
updated changelog with newly created bug for laggy input on OS X
2012-08-18 21:26:57 +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
Marc Zinnschlag
3036b63175
Merge remote-tracking branch 'scrawl/master'
2012-08-18 13:04:30 +02:00
Marc Zinnschlag
98219323b7
Merge remote-tracking branch 'mmd/vsdebugfixes'
2012-08-18 12:56:59 +02: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
Michael Mc Donnell
7952d38e6c
Use debug dlls when debugging in vs2010 (try 2)
...
Using the Debug build in vs2010 is not working because the debug dlls are
not loaded when debugging. The reason they are not loaded is that
CMAKE_BUILD_TYPE is not defined when doing multiple builds. This in turns
causes OGRE_PLUGIN_DEBUG_SUFFIX not to be set. This patch makes sure that
OGRE_PLUGIN_DEBUG_SUFFIX is always set but only used when debugging.
It also defines DEBUG to make it easier turn things on and off when
debugging.
There are still other bugs that have broken Debug mode in vs2010 but those
will be addressed in other patches.
2012-08-17 10:47:20 -04:00
Marc Zinnschlag
296b61f476
updated changelog
2012-08-17 15:40:46 +02:00
Marc Zinnschlag
3112bfb54f
incremented version number
2012-08-17 15:37:54 +02:00
Marc Zinnschlag
1da56e2832
removed some unused variables
2012-08-17 15:37:14 +02: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
40c7a850bf
fix pmove BB shape origin
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
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
db94018865
far better camera movement
2012-08-17 15:19:43 +04:00
greye
a7aeda9a3b
initial vanity mode support
2012-08-17 15:19:43 +04:00
greye
c46eeaa100
initial 3d-person camera support
2012-08-17 15:19:43 +04:00
Marc Zinnschlag
2a11a28e81
Revert "Use debug dlls when debugging in vs2010"
...
This reverts commit ebe131b326
2012-08-17 10:05:29 +02:00
Marc Zinnschlag
7610a330ef
Merge remote-tracking branch 'edmondo/master'
2012-08-16 22:07:29 +02:00
Edmondo Tommasina
d576985019
credits.txt: fix name
2012-08-16 20:52:08 +02:00
Marc Zinnschlag
573cc169a1
Merge remote-tracking branch 'mmd/vsdebugfixes'
2012-08-16 20:37:16 +02:00
Michael Mc Donnell
ebe131b326
Use debug dlls when debugging in vs2010
...
Using the Debug build in vs2010 is not working because the debug dlls are
not loaded when debugging. The reason they are not loaded is that
CMAKE_BUILD_TYPE is not defined when doing multiple builds. This in turns
causes OGRE_PLUGIN_DEBUG_SUFFIX not to be set. This patch makes sure that
OGRE_PLUGIN_DEBUG_SUFFIX is always set but only used when debugging.
There are still other bugs that have broken Debug mode in vs2010 but those
will be addressed in other patches.
2012-08-16 11:18:16 -04:00
Marc Zinnschlag
e97d23e626
Issue #361 : reset skill level in race selection stage
2012-08-16 15:42:37 +02:00
scrawl
132da92391
Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem
2012-08-16 13:20:53 +02:00
