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
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
gugus
ebd8b064f6
getStartingAngle script instruction
2012-08-01 12:21:42 +02:00
scrawl
15a16aeba1
Fixed DirectX HLSL shaders and re-enabled them in the gui
2012-08-01 04:11:16 +02:00
greye
f2a2e5f57d
remove MWWorld::Player::setPos()
2012-07-31 19:30:24 +04:00
gugus
d37d0b1947
build fix for windows
2012-07-30 19:45:40 +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
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
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
Marc Zinnschlag
7725190f89
removed some redundant code
2012-07-26 19:09:45 +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
scrawl
06bd2cd919
Merge branch 'master' into shadersystem
2012-07-25 23:54:22 +02:00
greye
cd04911f3c
dropping on the ground
2012-07-25 20:31:39 +04:00
greye
49b1d5e127
fix object placing
2012-07-25 20:31:39 +04:00
greye
e7666d3a7f
move responsibility for cell changing from CellStore::insertObject to Class::moveToCell
2012-07-25 20:31:39 +04:00
greye
bcc47cd5fb
local scripts, move placing to World::placeObject(Ptr, CellStore, Position)
2012-07-25 20:31:39 +04:00
greye
d5fe378a66
Revert "local script registration"
...
This reverts commit 0686399a306319a4c49e1009d10215a9c0e65ec2.
2012-07-25 20:31:39 +04:00
greye
aff05b9d36
local script registration
2012-07-25 20:31:39 +04:00
greye
e1c7d1f529
fixed item sinking
2012-07-25 20:31:39 +04:00
greye
6a3a728a56
Class::getModel implementation
2012-07-25 20:31:39 +04:00
greye
87050e48c8
physics getObjectHeight(), MWWorld::Class::getModel() definition
2012-07-25 20:31:39 +04:00
greye
71253c64ab
moving part 2, adding position parameter, stable
2012-07-25 20:31:39 +04:00
greye
61cb012ee7
moving Scene::insertObject to CellStore::insertObject, part 1
2012-07-25 20:31:39 +04:00
Chris Robinson
9f0c1eeb7b
Support playgroup mode 0
2012-07-24 14:54:12 -07:00
Chris Robinson
13ab2baef0
Use a struct to hold the current animation times and remaining loop count
2012-07-24 14:42:01 -07:00
Chris Robinson
fd1e3f6ec5
Add support for playgroup mode 2
2012-07-24 14:14:32 -07:00
Chris Robinson
20121f3b0a
Remove some unused stuff
2012-07-24 13:56:28 -07:00
Chris Robinson
9a7a629d0f
Add support for playing animation groups
2012-07-24 13:51:48 -07:00
Chris Robinson
f953d7f8c0
Store text keys from base NIF animations
2012-07-23 17:27:35 -07:00
Chris Robinson
36be1536d9
Return text keys from NIFs when creating entities
2012-07-23 17:20:47 -07:00
scrawl
8c8228a15c
fix terrain num lights setting
2012-07-24 00:08:53 +02:00
Chris Robinson
44975854e5
Merge remote branch 'zini/master' into nif-cleanup
...
Conflicts:
apps/openmw/mwrender/sky.cpp
2012-07-23 13:46:05 -07:00
Chris Robinson
f67983bbee
Don't assume one sub-entity for the night sky entities
2012-07-23 13:37:05 -07:00
Marc Zinnschlag
2d080ce4ef
compile fix
2012-07-23 21:47:53 +02:00
Marc Zinnschlag
483a6d8605
Merge remote branch 'scrawl/shadersystem'
2012-07-23 21:46:06 +02:00
scrawl
02a52c0ff1
fixed some more settings bugs
2012-07-23 21:39:22 +02:00