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
