Marc Zinnschlag
578691ed4c
Merge remote-tracking branch 'scrawl/crosshair'
2012-08-27 20:32:47 +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
Marc Zinnschlag
4ee9453445
Merge remote-tracking branch 'mmd/windowswarnings'
2012-08-27 19:09:11 +02:00
scrawl
a4c1d979d6
Merge branch 'master' into quick_keys
2012-08-27 18:14:41 +02:00
Michael Mc Donnell
eff2799c1b
Update UTF 8 table generator to print char values
...
This patch is in relation to commit 25fa8165f97 (Use char literals in
UTF 8 conversion to fix 798 warnings), which changed the UTF 8 table
to have char integer values instead of unsigned chars. Those values were
converted using a custom Python script. This patch changes the original
table generator so it can now output the same format.
2012-08-27 10:55:39 -04: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
cc4d55a755
updated credits.txt
2012-08-26 20:59:19 +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
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
Lukasz Gromanowski
65678b95f0
Added support for make install.
...
Added support for make install based on patch from Hasufells
repository:
https://github.com/hasufell/hasufell-overlay/tree/master/games-engines/openmw/files
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-08-22 21:11:03 +03: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
Lukasz Gromanowski
770f747eec
Added fix for not visible pthreads functions for linker with glibc 2.15
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-08-20 00:18:40 +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
Lukasz Gromanowski
34513cf16b
Added support for code coverage checking and unittests.
...
Added support for code coverage checking with gcov and
unittests with Google C++ unittest and GMock frameworks.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-08-19 22:23:46 +03: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
Jason Hooks
5202b11235
just moving a comment
2012-08-18 15:31:54 -04:00
Jason Hooks
4a219404fc
Super smooth animations; 100 PERCENT COMPLETE
2012-08-18 15:21:43 -04:00
Jason Hooks
f21df64808
changing a few things around
2012-08-18 14:48:18 -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
b8e56d61d3
update camera code, add idle time
2012-08-18 01:31:57 +04:00
Jason Hooks
cc776810e2
smoother animations
2012-08-17 17:10:21 -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
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
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
