Marc Zinnschlag
0c5f886683
Merge remote branch 'greye/player_control'
2012-08-04 21:55:13 +02:00
greye
16ad97610d
add support for some scripting player control switches
2012-08-04 11:54:42 +04:00
Marc Zinnschlag
994e33e3d2
fixed object rotation code
2012-08-04 09:34:49 +02:00
Marc Zinnschlag
e4dc01832b
fixing object rotation script instructions (wrong argument type and missing error handling)
2012-08-04 09:18:20 +02:00
greye
ff62770657
World::isUnderwater(), World::isSwimming()
2012-08-03 14:42:09 +04:00
Marc Zinnschlag
c251fbdf23
Merge branch 'master' into HEAD
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
libs/openengine/ogre/renderer.cpp
2012-08-02 14:57:35 +02:00
Michael Mc Donnell
7f802a22b5
Compare with stream position instead of int.
...
Fixes compilation of Debug build on Windows.
2012-08-01 17:52:20 -04:00
gugus
e9aac4512b
Build fix for Windows
...
Fixes a number of places where uint was used and not defined. This commit
was originally authored by gus. It rebased by Michael Mc Donnell to take
recent commit fixes into account.
2012-08-01 11:47:36 -04:00
Michael Mc Donnell
18fd14ff75
Workaround for FindMyGUI.cmake path space bug on Windows.
...
See bug 353 http://bugs.openmw.org/issues/353
2012-08-01 11:45:29 -04:00
gugus
ebd8b064f6
getStartingAngle script instruction
2012-08-01 12:21:42 +02:00
Marc Zinnschlag
f6d657a5f4
Merge branch 'osx_fix'
2012-08-01 09:09:29 +02:00
Marc Zinnschlag
f8e54b401b
fixed linkage problem
2012-08-01 09:09:00 +02:00
scrawl
15a16aeba1
Fixed DirectX HLSL shaders and re-enabled them in the gui
2012-08-01 04:11:16 +02:00
Nikolay Kasyanov
3b776cb3ca
fixed submodule version
2012-08-01 00:01:57 +04:00
greye
f2a2e5f57d
remove MWWorld::Player::setPos()
2012-07-31 19:30:24 +04:00
Nikolay Kasyanov
32d2326b4d
Update components/files/ogreplugin.hpp
...
removed #error directive
2012-07-31 18:15:09 +04:00
Nikolay Kasyanov
03cccee0e4
bug #348 : workaround for boost older than 1.44
2012-07-31 10:51:34 +04:00
Nikolay Kasyanov
defab0e4b5
Merge remote-tracking branch 'upstream/master' into osx_fix
...
Conflicts:
CMakeLists.txt
2012-07-31 01:06:18 +04:00
Nikolay Kasyanov
b05dfeae70
bug #348 : cleanup
...
moved files to appropriate component, moved function to namespace,
added docs
2012-07-31 01:01:00 +04:00
Michael Mc Donnell
e7a1ab9fa6
Define OGRE_PLUGIN_DEBUG_SUFFIX in all cases.
2012-07-30 15:04:14 -04:00
gugus
d37d0b1947
build fix for windows
2012-07-30 19:45:40 +02:00
gugus
b1fac1b00a
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling
...
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
2012-07-30 14:43:25 +02:00
Marc Zinnschlag
db10baafe1
Merge branch 'scriptconsole'
2012-07-30 12:43:48 +02:00
Marc Zinnschlag
2ccecd839b
improved the help text for --script-run; updated readme.txt
2012-07-30 12:43:23 +02:00
Marc Zinnschlag
fd6c155118
Issue #352 : added --script-run switch
2012-07-30 12:37:46 +02:00
Marc Zinnschlag
23f8595b87
Issue #352 : refactored script execution in console
2012-07-30 11:57:19 +02:00
Marc Zinnschlag
90de02b901
Issue #350 : console only script instructions
2012-07-30 11:43:28 +02:00
Nikolay Kasyanov
a84d8e83cd
add const specifier to first argument, also made it reference
2012-07-28 02:39:49 +04:00
Nikolay Kasyanov
7161361b52
cleanup
2012-07-28 02:38:37 +04:00
Nikolay Kasyanov
b0b2064232
always add debug suffix in plugin loader
...
also removed cout spam
2012-07-28 02:31:30 +04:00
Nikolay Kasyanov
23e44a86c6
another attempt to fix
2012-07-28 02:13:57 +04:00
Nikolay Kasyanov
a0a086f69d
fixed redefining macro
2012-07-28 02:11:14 +04:00
Nikolay Kasyanov
0cdb651c5e
removed excess invocation
2012-07-28 02:05:06 +04:00
Nikolay Kasyanov
e9d4195500
removed cout spam
2012-07-28 02:03:34 +04:00
Nikolay Kasyanov
fbe9a94568
bug #348 : fixed OS X deployment
...
just enable CMake option "OPENMW_OSX_DEPLOYMENT" and it will search
plugins inside application bundle instead of Ogre prefix
2012-07-28 01:55:37 +04:00
Marc Zinnschlag
0da3f2cb59
Issue #314 : Playing drink sound when using a potion
2012-07-27 12:27:22 +02:00
Marc Zinnschlag
8b08928dae
Issue #351 : Added sound playing to Action
2012-07-27 12:19:25 +02:00
Marc Zinnschlag
78fe6fdce5
Issue #351 : Refactoring Action class
2012-07-27 12:00:10 +02:00
scrawl
281e15f58e
consider all material properties for nif material sharing, instead of just the texture
2012-07-26 23:40:55 +02:00
scrawl
7cf2fc4009
Merge branch 'master' into shadersystem
2012-07-26 23:11:16 +02:00
scrawl
6077965d27
fix the directx startup issue on windows
2012-07-26 23:09:46 +02:00
scrawl
c4ee3219c7
Merge branch 'master' into shadersystem
2012-07-26 23:01:29 +02:00
Marc Zinnschlag
bb03121edd
Merge branch 'drop'
2012-07-26 19:10:03 +02:00
Marc Zinnschlag
7725190f89
removed some redundant code
2012-07-26 19:09:45 +02:00
greye
d5e63a767e
replace sprintf() with boost::format
2012-07-26 19:38:33 +04:00
Marc Zinnschlag
04ae3cbadd
Merge remote branch 'scrawl/master'
2012-07-26 17:29:30 +02:00
scrawl
620b6bf27b
change url to work without publickey
2012-07-26 17:08:39 +02:00
greye
aa5f63ffcc
disabled items placing handling
2012-07-26 19:06:48 +04:00
greye
26595f22f6
float* -> Vector3, moveToCell -> copyToCell, fixed placeObject()
2012-07-26 16:14:11 +04:00
greye
b734460dc9
Merge branch 'master' of https://github.com/zinnschlag/openmw
2012-07-26 16:02:58 +04:00