greye
38b06aee6c
resolving conflicts
2012-08-09 21:49:00 +04:00
Marc Zinnschlag
de35999891
Merge branch 'boostfix'
2012-08-09 16:12:42 +02:00
Marc Zinnschlag
10527e0784
Merge branch 'player_control'
2012-08-09 16:12:36 +02:00
Marc Zinnschlag
aca08eb4c2
Merge branch 'decouple' into player_control
...
Conflicts:
apps/openmw/mwsound/soundmanagerimp.hpp
2012-08-09 16:12:10 +02:00
greye
b5bc7bc424
SoundManager dependency on camera pos/dir
2012-08-09 17:01:03 +04:00
Marc Zinnschlag
6bd48d12af
Issue #107 : SoundManager is accessed only through the interface class from now on
2012-08-09 14:33:21 +02:00
Marc Zinnschlag
d00d40cc3f
Issue #107 : Journal is accessed only through the interface class from now on
2012-08-09 12:56:03 +02:00
Marc Zinnschlag
a84145a087
Issue #107 : minor corrections
2012-08-09 12:05:47 +02:00
greye
181d45661f
fix rotation angles
2012-08-09 13:43:52 +04:00
greye
6b996d8c34
fix disabled camera on start
2012-08-09 13:29:13 +04:00
greye
df60f4bf92
stub for soundmanager, adjust rotation mode
2012-08-09 13:27:32 +04:00
Marc Zinnschlag
923109b260
Issue #107 : DialogueManager is accessed only through the interface class from now on
2012-08-09 10:35:53 +02:00
Marc Zinnschlag
e6ede480c7
Issue #107 : fixed up some interfaces
2012-08-09 09:41:17 +02:00
greye
378fcc2460
fix DisablePlayerControl logic
2012-08-09 11:10:18 +04:00
greye
1511eb3549
implemented enable/disable player looking switch
2012-08-09 10:55:49 +04:00
greye
a2d87d5f5b
added camera flip control, fixed input rotation axis
2012-08-09 10:24:18 +04:00
greye
ec9cf4d3c6
rotateObject() added, input system rewritten
2012-08-09 00:15:52 +04:00
Marc Zinnschlag
28ecfb4290
Issue #107 : ScriptManager is accessed only through the interface class from now on
2012-08-08 15:18:55 +02:00
Marc Zinnschlag
9b567e4ba6
Issue #107 : Removed a redundant function in world interface; added a comment
2012-08-08 14:54:35 +02:00
Marc Zinnschlag
4977fafb9c
updated credits.txt
2012-08-08 14:27:14 +02:00
greye
b6f7f21bcf
fix player cell assertion fail, moveObject(Ptr&, CellStore&, f, f, f) added
2012-08-08 14:51:33 +04:00
Marc Zinnschlag
7cc2de3e21
boost filesystem compatibility fix
2012-08-08 08:52:08 +02:00
scrawl
993c7150dc
tweaked depth bias
2012-08-07 22:43:11 +02:00
greye
79b7487c87
fix using deleted objects
2012-08-07 22:21:46 +04:00
greye
d32a61b928
fix object moving
2012-08-06 18:20:48 +04:00
greye
ee97a204f2
fix npc animation key update
2012-08-06 15:26:37 +04:00
Marc Zinnschlag
dbcd4a8b5b
compatibility fix
2012-08-05 00:06:19 +02:00
Marc Zinnschlag
f5ee5a5414
Merge remote branch 'edmondo/master'
2012-08-05 00:03:16 +02:00
Edmondo Tommasina
20deb97a09
nif_file.hpp: add stdint.h include to fix build
...
It fixes such compile errors as:
* error: ‘uint8_t’ does not name a type
* error: ‘uint16_t’ does not name a type
* error: ‘uint32_t’ does not name a type
2012-08-04 23:14:53 +02:00
Edmondo Tommasina
c08e098d7f
esm_reader.cpp: fix std::runtime_error compile error
2012-08-04 23:02:34 +02:00
Edmondo Tommasina
32b167ce2b
Revert "nif_file.hpp: include type definitions to fix build"
...
This reverts commit b0b3ebe123
.
2012-08-04 23:02:27 +02:00
Edmondo Tommasina
a63fd77ccc
Revert "esm_reader.hpp: fix std::runtime_error compile error"
...
This reverts commit 0f3cb5667f
.
2012-08-04 22:58:26 +02:00
Marc Zinnschlag
1db7978361
silenced a warning
2012-08-04 22:03:14 +02:00
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
Edmondo Tommasina
b0b3ebe123
nif_file.hpp: include type definitions to fix build
2012-08-03 22:42:59 +02:00
Edmondo Tommasina
11d0761528
terrainmaterial.cpp: fix std::runtime_error compile error
2012-08-03 22:42:28 +02:00
Edmondo Tommasina
0f3cb5667f
esm_reader.hpp: fix std::runtime_error compile error
2012-08-03 22:41:51 +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