1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-24 00:23:53 +00:00
Commit graph

9789 commits

Author SHA1 Message Date
mrcheko
a8fb1ae51c improved, added knockdown after falling 2013-12-31 17:55:04 +02:00
scrawl
764ec9bc5f Closes #716: Use the particle controller's size instead of NiAutoNormalParticlesData particle radius. Same as NifSkope now. 2013-12-31 15:50:27 +01:00
Alexander "Ace" Olofsson
8381cad5a4 Don't try to set a cursor before one exists 2013-12-31 14:13:42 +01:00
scrawl
07a9b7623a Enable skeleton-based bounding boxes added in Ogre 1.10 2013-12-31 13:22:57 +01:00
mrcheko
d6345bce91 added npc hit reactions 2013-12-31 13:24:20 +02:00
scrawl
254eba350e Not handling interpolation type should be an error, since it will fail reading the next record if it hasn't read the previous one completely. 2013-12-31 00:56:04 +01:00
scrawl
94cdc1efd2 Enable mipmap generator for 1.9+ 2013-12-31 00:54:40 +01:00
Lukasz Gromanowski
50b6e828cc Added asserts in Interpreter::installSegmentX methods.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-30 23:51:44 +01:00
Lukasz Gromanowski
cb04f43384 Fixes for "Conditional jump or move depends on uninitialised value(s)"
and memleaks reported by valgrind.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-30 23:08:53 +01:00
Lukasz Gromanowski
6107d5bad2 Updated ffmpeg decoder fix
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-30 22:16:06 +01:00
Lukasz Gromanowski
5c5f87445b Fixes for "Conditional jump or move depends on uninitialised value(s)"
and memleaks reported by valgrind.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-30 21:47:06 +01:00
Marek Kochanowicz
cb723710fe Corrected stupid typo. 2013-12-30 19:24:53 +01:00
scrawl
b8ac37347c Code cleanup for Class::canBeEquipped 2013-12-30 19:04:35 +01:00
Marek Kochanowicz
79bc149c73 reverting refidata.hpp 2013-12-30 18:47:19 +01:00
Marek Kochanowicz
a7de04d0a4 reverting refiddata.cpp 2013-12-30 18:46:18 +01:00
Marek Kochanowicz
4a1987ddec correcting 2013-12-30 18:41:16 +01:00
scrawl
79a440e94a Many additions to 900bc06d2c:
- Fix indentation
 - Consider any kind of light, not just torch_infinite_time
 - Hostile NPCs should also wear lights, if they have nothing else that could use the slot (or a twohanded weapon)
 - Remove redundant code and don't add additional lights to the inventory
 - World::isDark returns false for interiors which are unaffected by weather
2013-12-30 17:57:41 +01:00
scrawl
f3a7321a43 Closes #856: More aggressive supression of skeleton base: only create for keyframe controllers, not any controllers 2013-12-30 16:44:07 +01:00
Marek Kochanowicz
3758fe3834 reformatted 2013-12-30 13:23:16 +01:00
Marek Kochanowicz
c89608f390 Check for head and hair. Correct faction check. 2013-12-30 11:39:03 +01:00
Scott Howard
2f082ef796 remove unneeded libraries 2013-12-29 16:25:49 -05:00
Lukasz Gromanowski
60fb75b03a Fixed valgrind warning about uninitialized variable:
==16814== Conditional jump or move depends on uninitialised value(s)
==16814==    at 0xA945B8: Terrain::QuadTreeNode::update(Ogre::Vector3 const&, Loading::Listener*) (quadtreenode.cpp:269)
==16814==    by 0xA94A77: Terrain::QuadTreeNode::update(Ogre::Vector3 const&, Loading::Listener*) (quadtreenode.cpp:354)
==16814==    by 0xA77541: Terrain::World::update(Ogre::Vector3 const&) (world.cpp:159)
==16814==    by 0x6EBA17: MWRender::RenderingManager::requestMap(MWWorld::CellStore*) (renderingmanager.cpp:649)
==16814==    by 0x8A25C4: MWWorld::Scene::loadCell(MWWorld::CellStore*, Loading::Listener*) (scene.cpp:157)
==16814==    by 0x8A2CEA: MWWorld::Scene::changeCell(int, int, ESM::Position const&, bool) (scene.cpp:296)
==16814==    by 0x8A2DE0: MWWorld::Scene::changeToExteriorCell(ESM::Position const&) (scene.cpp:440)
==16814==    by 0x85AC17: MWWorld::World::changeToExteriorCell(ESM::Position const&) (worldimp.cpp:761)
==16814==    by 0x927E38: OMW::Engine::prepareEngine(Settings::Manager&) (engine.cpp:436)
==16814==    by 0x92843D: OMW::Engine::go() (engine.cpp:483)
==16814==    by 0x6C6B3F: main (main.cpp:279)
==16814==  Uninitialised value was created by a heap allocation
==16814==    at 0x4C27CC2: operator new(unsigned long) (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==16814==    by 0xA93E60: Terrain::QuadTreeNode::createChild(Terrain::ChildDirection, float, Ogre::Vector2 const&) (quadtreenode.cpp:178)
==16814==    by 0xA7733E: Terrain::World::buildQuadTree(Terrain::QuadTreeNode*) (world.cpp:139)
==16814==    by 0xA76B18: Terrain::World::World(Loading::Listener*, Ogre::SceneManager*, Terrain::Storage*, int, bool, bool) (world.cpp:94)
==16814==    by 0x6EC6EB: MWRender::RenderingManager::enableTerrain(bool) (renderingmanager.cpp:1013)
==16814==    by 0x8A2A00: MWWorld::Scene::changeCell(int, int, ESM::Position const&, bool) (scene.cpp:206)
==16814==    by 0x8A2DE0: MWWorld::Scene::changeToExteriorCell(ESM::Position const&) (scene.cpp:440)
==16814==    by 0x85AC17: MWWorld::World::changeToExteriorCell(ESM::Position const&) (worldimp.cpp:761)
==16814==    by 0x927E38: OMW::Engine::prepareEngine(Settings::Manager&) (engine.cpp:436)
==16814==    by 0x92843D: OMW::Engine::go() (engine.cpp:483)
==16814==    by 0x6C6B3F: main (main.cpp:279)

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-29 21:58:55 +01:00
Marek Kochanowicz
842e26b8e5 added comment 2013-12-29 21:53:33 +01:00
Marek Kochanowicz
13637e7166 Dynamic_casting, checking rank. Commented out faction check, since it will not work. 2013-12-29 21:45:09 +01:00
Marek Kochanowicz
e321d571e1 Added faction check. 2013-12-29 21:06:08 +01:00
Marek Kochanowicz
9df6d23afc removing member size values, since this does not work properly. 2013-12-29 20:15:00 +01:00
Lukasz Gromanowski
c65f018760 Fixes #417: Apply weather instantly when teleporting
Corrected constant name.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-29 15:09:49 +01:00
mrcheko
783c2ec716 Merge remote-tracking branch 'upstream/master' 2013-12-29 16:03:56 +02:00
Marc Zinnschlag
6de39a7329 Merge remote-tracking branch 'lgro/issue845_NPCs_hold_torches_whole_day'
Conflicts:
	apps/openmw/mwmechanics/character.cpp
2013-12-29 15:00:31 +01:00
Marc Zinnschlag
56a80da70c Merge remote-tracking branch 'ace/win-fix' 2013-12-29 14:50:09 +01:00
Marc Zinnschlag
456b41f05b Merge remote-tracking branch 'scrawl/master' 2013-12-29 14:45:22 +01:00
Lukasz Gromanowski
faf8011c48 Fixes #417: Apply weather instantly when teleporting
Removed changing speed of weather transition introduced in previous
commit. Instead try to detect player "teleporting" (ie. coc),
and then switch instantly to the next weather type.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-29 12:47:44 +01:00
scrawl
c0dba2834b Closes #855: Don't try to look up bone if there's no skeleton 2013-12-29 01:20:57 +01:00
scrawl
04f9f7af56 Closes #990: Add option to unlock mouse cursor when in any menu 2013-12-29 00:58:48 +01:00
scrawl
17ff8165d2 Closes #1065: Don't apply fall damage when landing in water 2013-12-29 00:36:36 +01:00
Alexander "Ace" Olofsson
b50151cb38 Quick build fix for windows 2013-12-28 18:16:01 +01:00
Marek Kochanowicz
bf0383fe05 Last fixes. 2013-12-28 18:07:01 +01:00
Marek Kochanowicz
147ee0ace3 small oops + added new variables to the constructor 2013-12-28 17:35:04 +01:00
scrawl
2a8ab932ef Bug #951: Only recalculate derived stats when attributes change 2013-12-28 17:19:35 +01:00
Marc Zinnschlag
f1be4656ec Merge remote-tracking branch 'lgro/issue1042_TES3_header_data_wrong_encoding' 2013-12-28 17:14:41 +01:00
Marc Zinnschlag
60a8a9e684 Merge remote-tracking branch 'scrawl/master' 2013-12-28 17:03:54 +01:00
scrawl
27b45dd3cd Remove unused input 2013-12-28 16:34:32 +01:00
Marek Kochanowicz
b9d1047ad6 Small fix for lights. 2013-12-28 16:18:16 +01:00
Lukasz Gromanowski
100edda8c0 Fixes #417: Apply weather instantly when teleporting
Change speed of weather transition from blight to other (twice fast as normal)
and from other to blight (four times faster than normal).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-28 16:15:34 +01:00
Marek Kochanowicz
be6e47bcb6 Corrections 2013-12-28 15:51:38 +01:00
Lukasz Gromanowski
9b73d23139 Fix warning about uninitialized variable inside stream.peak():
openmw/mwgui/bookpage.cpp:394:13: warning: ‘*((void*)& stream +24)’ may be used uninitialized in this function [-Wmaybe-uninitialized]

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-12-28 13:55:54 +01:00
Marek Kochanowicz
5406a70fdd still working on npc check 2013-12-28 11:34:51 +01:00
scrawl
6d47d710a0 Reimplement NiGeomMorpherController using Ogre's pose animation system 2013-12-28 00:51:09 +01:00
Marek Kochanowicz
da3dda896a Code compiles now 2013-12-27 22:57:36 +01:00
scrawl
596c9b80a9 Check if threads are joinable before joining (issue with boost 1.52) 2013-12-27 22:38:30 +01:00