mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-30 20:15:35 +00:00
Code Issues Releases Wiki Activity
8972 commits 109 branches 66 tags 134 MiB
Commit graph

1436 commits

Author SHA1 Message Date
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
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
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
scrawl
c0dba2834b Closes #855: Don't try to look up bone if there's no skeleton 2013-12-29 01:20:57 +01:00
Alexander "Ace" Olofsson
b50151cb38 Quick build fix for windows 2013-12-28 18:16:01 +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
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
scrawl
6d47d710a0 Reimplement NiGeomMorpherController using Ogre's pose animation system 2013-12-28 00:51:09 +01:00
Marek Kochanowicz
03235bf0a2 NPC. Still WIP. 2013-12-27 22:13:55 +01:00
scrawl
a9526622b1 Particle improvements: particle systems now move with the particle bone, not the scene node. This difference is not noticable if the particle bone is static, but it makes the code *much* nicer and mirrors more closely what NifSkope does. 2013-12-27 18:58:24 +01:00
scrawl
9877db413c Connect particle systems to the particle node, not the emitter node 2013-12-26 20:53:52 +01:00
scrawl
eab2c89346 Issue #983: Fix controllers to affect objects attached to the base node 2013-12-26 20:53:52 +01:00
scrawl
5931fdcbde Implement NiBillboardNode. Flags not handled yet. 2013-12-26 20:53:52 +01:00
scrawl
33389b9b63 XDG compliant paths 2013-12-26 20:53:51 +01:00
scrawl
aef0fd1460 Rename some path methods 2013-12-26 20:53:51 +01:00
scrawl
e68e2f82a2 Implement DarkTexture slot. Fix an issue with incorrect transparency override when base texture is empty. 2013-12-26 20:53:51 +01:00
scrawl
0050e6e67b Support materials with no base (diffuse) texture (should be white). Support alternate UV set for diffuse texture. 2013-12-26 20:53:51 +01:00
scrawl
c5c3248376 Compile fixes for Ogre 1.10 2013-12-26 20:53:51 +01:00
scrawl
6d27ebabb6 Integrate AddGlow with material controllers 2013-12-26 20:53:45 +01:00
Marek Kochanowicz
e4e7d50623 Added creatureCheck. I don't know meaning of all data fields here. 2013-12-23 12:32:35 +01:00
Lukasz Gromanowski
18a9878bdd Fixes #1042: TES3 header data wrong encoding 
Changed loading of HEDR structure from all-in-once to field-by-field
so author and descryption could be converted to UTF-8.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-21 09:33:05 +01:00
scrawl
5fd98d7c3a Add an assertion 2013-12-19 01:41:36 +01:00
scrawl
18c002a21d Fix an awful typo. 2013-12-19 01:31:42 +01:00
scrawl
19e5978a01 Merge branch 'master' of https://github.com/zinnschlag/openmw 
Conflicts:
	apps/openmw/main.cpp
 2013-12-16 13:35:31 +01:00
scrawl
530d06ab54 Remove unused code 2013-12-14 05:07:08 +01:00
scrawl
0c3c3ed8e9 Fix wind gravity affector 2013-12-11 15:15:30 +01:00
Marc Zinnschlag
77a2179d1e Merge remote-tracking branch 'scrawl/master' 2013-12-09 18:39:34 +01:00
scrawl
57a33c957e Add possibly missing include 2013-12-09 14:26:08 +01:00
scrawl
37a7ee8fcd Set alpha value of character animations according to Invisibility / Chameleon effects. 2013-12-08 23:05:21 +01:00
Lukasz Gromanowski
594cc693b2 Fixes #1006: Many NPCs have 0 skill 
Added calculation of skill values for NPC with mNpdtType
set to NPC_WITH_AUTOCALCULATED_STATS (their NPDT is 12).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-08 21:47:43 +01:00
scrawl
9fcb4fad5c Implement NiFlipController 2013-12-08 18:51:56 +01:00
scrawl
51a9f0111c Implement NiAlphaController and NiMaterialColorController 2013-12-08 16:38:13 +01:00
scrawl
1624e0fd8a Rename ObjectList to ObjectScene. Wrap it in a SharedPtr so we can automate the destruction routine. 2013-12-07 20:15:39 +01:00
Marc Zinnschlag
ef8c0fab73 Merge remote-tracking branch 'scrawl/master' 2013-12-07 16:26:52 +01:00
scrawl
c5e543b91b Implement NiGeomMorpherController 2013-12-07 14:10:33 +01:00
Lukasz Gromanowski
bfd79bfbe6 Various fixes for CppCheck warnings. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-06 07:36:16 +01:00
Marc Zinnschlag
07f692bdd2 Merge remote-tracking branch 'scrawl/master' 2013-12-05 16:04:50 +01:00
scrawl
062ea627b3 Add parallax mapping for objects 2013-12-05 15:51:07 +01:00
scrawl
69c0bb1723 Add normal, specular & parallax mapping for terrain 2013-12-05 15:51:01 +01:00
Alexander "Ace" Olofsson
47c60a7037 Fix C4716 (Must return a value) error on Windows MSVC 2013-12-04 21:48:25 +01:00
scrawl
3a82f8c193 Fix incorrect log file name for launcherOgre.log 2013-12-03 15:56:00 +01:00
pvdk
1512ac11ad Fixed the content selector checkboxes appearing as partially checked 2013-11-30 12:16:57 +01:00
scrawl
e7ad503e30 Merge branch 'particles' into projectiles 2013-11-28 17:16:59 +01:00
scrawl
9f5ff033d7 Handle the "GetLOS" alias for GetLineOfSight 2013-11-25 14:06:59 +01:00
scrawl
58dce88c7d Handle the "tai" alias for ToggleAI 2013-11-25 14:03:51 +01:00
scrawl
6b81fd78f1 Particle improvements: Handle LocalSpace flag. Attach particle systems to the base node, since they need to be relative to that when LocalSpace is enabled. Get the bone in emitters/affectors so that resulting particle positions are the same. TODO: Fix Controllers to affect particle systems. 2013-11-25 13:50:33 +01:00
scrawl
3452bd2e0b Add glow effect for enchanted items 2013-11-20 00:13:12 +01:00
Marc Zinnschlag
11e254aac8 Merge remote-tracking branch 'gus/AICombat' 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
 2013-11-19 09:10:48 +01:00
gus
dff3cf162d ToggleAI script instruction 2013-11-18 23:03:44 +01:00
scrawl
7fd5f1df83 Change setKeepParticlesInLocalSpace to false. Not correct for all particles, but the opposite isn't either. Plus it breaks pretty much all magic VFX. 2013-11-17 23:31:08 +01:00
scrawl
aa84ce3f0d Copy paste mistake (oops) 2013-11-16 14:44:31 +01:00
scrawl
c5f1bbcc5f Add functions to get the effect affecting resistance and weakness for another effect 2013-11-15 19:43:25 +01:00
scrawl
956d8adb99 Merge branch 'master' of https://github.com/zinnschlag/openmw into magic 
Conflicts:
	apps/openmw/mwgui/inventoryitemmodel.cpp
 2013-11-14 14:25:22 +01:00
Marc Zinnschlag
d49b8e7443 Merge branch 'dialogue' 2013-11-14 11:40:50 +01:00
scrawl
a6e2f43b75 Stop continuous VFX when the effect is no longer active. 2013-11-13 15:44:43 +01:00
scrawl
ffdb91bb21 Add particles for Cast + Hit. Not looking quite right yet. 2013-11-11 23:43:28 +01:00
Marc Zinnschlag
2fff7fc843 save info records 2013-11-11 12:21:26 +01:00
scrawl
afafaf73e8 Fix a build error 2013-11-10 22:40:46 +01:00
Marc Zinnschlag
8c4303399f Merge branch 'master' into dialogue 
Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loadinfo.hpp
 2013-11-10 13:21:39 +01:00
Marc Zinnschlag
418ccf705d Merge branch 'openmw-27' 
Conflicts:
	apps/launcher/graphicspage.hpp
	components/CMakeLists.txt
 2013-11-06 10:21:25 +01:00
Marc Zinnschlag
2d4a6c0edf cleaned up ID handling in INFO record (including a ESMTool bug fix) 2013-11-05 12:56:20 +01:00
Marc Zinnschlag
9d7695ea88 added missing columns to topic info table 2013-11-05 11:41:48 +01:00
graffy76
ed913936f8 Eliminated game & addon keys from profile configuration 2013-11-03 21:36:41 -06:00
graffy76
1d4b5a2425 Fix broken launcher content file display / selection scheme 
Disable selection of content files with missing dependencies (grayed
out)
 2013-11-03 14:02:41 -06:00
graffy76
12c06a5615 Fixed broken dependency check 2013-11-03 06:21:28 -06:00
graffy76
973803eb2f Fixed pathing issues in launcher 2013-11-03 00:02:46 -05:00
graffy76
8d12e2b99d fixed merge conflicts 
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector

Conflicts:
	apps/launcher/datafilespage.cpp
	apps/launcher/settings/gamesettings.hpp
	components/contentselector/model/contentmodel.cpp
 2013-11-02 09:31:23 -05:00
graffy76
cddece4f9e Another stab at fixing the pathing problem... 2013-11-01 21:47:26 -05:00
Marc Zinnschlag
767cb54e7c added missing columns to journal info table 2013-10-31 12:54:55 +01:00
gus
d587f3c946 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat 
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwscript/docs/vmformat.txt
 2013-10-31 09:51:17 +01:00
scrawl
636d399c7f Refactored Ogre initialisation into a component 2013-10-30 14:04:33 +01:00
Marc Zinnschlag
ba88c94d58 first attempt at an info record collection 2013-10-29 13:18:22 +01:00
graffy76
b51bef0d98 fixed missing adjuster widget in file dialog open view 2013-10-27 20:21:19 -05:00
Lukasz Gromanowski
d51c9b64dd Issue #913: Merge --master and --plugin switches 
Launcher part of master/plugin switches merge.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-10-27 20:03:12 +01:00
graffy76
9ce4a04a2d merge from saving 
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector

Conflicts:
	apps/launcher/datafilespage.cpp
	apps/opencs/editor.cpp
	apps/opencs/view/doc/filedialog.cpp
	apps/opencs/view/doc/filedialog.hpp
 2013-10-25 14:44:22 -05:00
graffy76
16d87ea1d1 Merge branch 'master' into esxSelector 2013-10-25 08:11:24 -05:00
graffy76
2ca7f24731 Fixed filedialog new / edit content path issue 2013-10-24 17:33:28 -05:00
graffy76
b48f066f33 Reimplemented content selector for filedialog and datafilespage classes 2013-10-23 17:39:17 -05:00
graffy76
ba3589bc76 Revert "Implemented ContentSelector as a singleton "charm" modifier for" 
This reverts commit 24b167b755.

Conflicts:
	apps/launcher/datafilespage.cpp
	apps/opencs/editor.cpp
	apps/opencs/view/doc/filedialog.cpp
	apps/opencs/view/doc/filedialog.hpp
	components/contentselector/view/contentselector.cpp
	components/contentselector/view/contentselector.hpp
 2013-10-22 22:20:21 -05:00
graffy76
f9591ddda6 Reimplemented constentselector view class 2013-10-22 21:52:35 -05:00
Marc Zinnschlag
c995533e07 Merge branch 'dialogue' into saving 
Conflicts:
	apps/opencs/model/world/columnimp.hpp
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loaddial.hpp
 2013-10-21 16:45:43 +02:00
Marc Zinnschlag
adf3a41a83 added topic and journal tables 2013-10-20 17:15:32 +02:00
Marc Zinnschlag
3c580fbc59 Merge remote-tracking branch 'jordan-ayers/topic/MagicEffectDisplayFormat' 2013-10-12 13:40:29 +02:00
Jordan Ayers
296b2ab870 Magic Effect: Recognize other display types. 
Fill out the list of effects which use percentage formatting.
Add in types which use Feet and level labels.
 2013-10-08 23:55:14 -05:00
Jordan Ayers
6ab7002908 MagicEffect: Put magnitude type into ESM::MagicEffect helper. 2013-10-07 22:28:55 -05:00
graffy76
4c72a9ffdf Fixed non-loading files 2013-10-06 22:10:38 -05:00
graffy76
217a4d75b4 Implemented profile function in launcher datafiles page 
Implemented dependency sorting to ensure dependent files appear latest
in the list.
 2013-10-06 21:13:47 -05:00
Emanuel Guevel
496f786c2a Implement Disable/EnableLevitation script functions 
Totally copied on Disable/EnableTeleporting implementation.
Thanks KittyCat!
 2013-10-02 15:33:20 +02:00
graffy76
a5a0f61533 Fixed missing profiles combobox 2013-10-01 22:36:49 -05:00
graffy76
00c78a4aa1 Implementing ContentSelector class in DataFilesPage 
Moved AdjusterWidget / FileWidget to ContentSelectorView
 2013-10-01 21:29:45 -05:00
graffy76
24b167b755 Implemented ContentSelector as a singleton "charm" modifier for 
FileDialog...
 2013-09-29 12:19:07 -05:00
Marc Zinnschlag
baae548106 added project scope filter saving 2013-09-27 13:56:40 +02:00
Marc Zinnschlag
4ea5191d7d fixed write function for ESM variant type 2013-09-27 13:17:04 +02:00
Marc Zinnschlag
5779f799ab create project file when saving content file 2013-09-27 11:36:06 +02:00
Marc Zinnschlag
c42e74dadf make 4 byte record type accessable from record struct 2013-09-24 13:17:28 +02:00
graffy76
3b40192e90 Merge branch 'master' into esxSelector 2013-09-23 22:03:42 -05:00
graffy76
9d358dd44c Further implemented auto-checking / unchecking of dependencies 2013-09-23 22:01:44 -05:00
graffy76
d7cff6361e Fixed filter issue (all addons for a gamefile are enabled for checking). 
Note:  Other dependencies are not yet automatically selected when an
addon is checked.
 2013-09-23 06:51:49 -05:00