Lukasz Gromanowski
|
bfd79bfbe6
|
Various fixes for CppCheck warnings.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
11 years ago |
Marc Zinnschlag
|
07f692bdd2
|
Merge remote-tracking branch 'scrawl/master'
|
11 years ago |
scrawl
|
062ea627b3
|
Add parallax mapping for objects
|
11 years ago |
scrawl
|
69c0bb1723
|
Add normal, specular & parallax mapping for terrain
|
11 years ago |
Alexander "Ace" Olofsson
|
47c60a7037
|
Fix C4716 (Must return a value) error on Windows MSVC
|
11 years ago |
scrawl
|
3a82f8c193
|
Fix incorrect log file name for launcherOgre.log
|
11 years ago |
pvdk
|
1512ac11ad
|
Fixed the content selector checkboxes appearing as partially checked
|
11 years ago |
scrawl
|
e7ad503e30
|
Merge branch 'particles' into projectiles
|
11 years ago |
scrawl
|
9f5ff033d7
|
Handle the "GetLOS" alias for GetLineOfSight
|
11 years ago |
scrawl
|
58dce88c7d
|
Handle the "tai" alias for ToggleAI
|
11 years ago |
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.
|
11 years ago |
scrawl
|
3452bd2e0b
|
Add glow effect for enchanted items
|
11 years ago |
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
|
11 years ago |
gus
|
dff3cf162d
|
ToggleAI script instruction
|
11 years ago |
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.
|
11 years ago |
scrawl
|
aa84ce3f0d
|
Copy paste mistake (oops)
|
11 years ago |
scrawl
|
c5f1bbcc5f
|
Add functions to get the effect affecting resistance and weakness for another effect
|
11 years ago |
scrawl
|
956d8adb99
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into magic
Conflicts:
apps/openmw/mwgui/inventoryitemmodel.cpp
|
11 years ago |
Marc Zinnschlag
|
d49b8e7443
|
Merge branch 'dialogue'
|
11 years ago |
scrawl
|
a6e2f43b75
|
Stop continuous VFX when the effect is no longer active.
|
11 years ago |
scrawl
|
ffdb91bb21
|
Add particles for Cast + Hit. Not looking quite right yet.
|
11 years ago |
Marc Zinnschlag
|
2fff7fc843
|
save info records
|
11 years ago |
scrawl
|
afafaf73e8
|
Fix a build error
|
11 years ago |
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
|
11 years ago |
Marc Zinnschlag
|
418ccf705d
|
Merge branch 'openmw-27'
Conflicts:
apps/launcher/graphicspage.hpp
components/CMakeLists.txt
|
11 years ago |
Marc Zinnschlag
|
2d4a6c0edf
|
cleaned up ID handling in INFO record (including a ESMTool bug fix)
|
11 years ago |
Marc Zinnschlag
|
9d7695ea88
|
added missing columns to topic info table
|
11 years ago |
graffy76
|
ed913936f8
|
Eliminated game & addon keys from profile configuration
|
11 years ago |
graffy76
|
1d4b5a2425
|
Fix broken launcher content file display / selection scheme
Disable selection of content files with missing dependencies (grayed
out)
|
11 years ago |
graffy76
|
12c06a5615
|
Fixed broken dependency check
|
11 years ago |
graffy76
|
973803eb2f
|
Fixed pathing issues in launcher
|
11 years ago |
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
|
11 years ago |
graffy76
|
cddece4f9e
|
Another stab at fixing the pathing problem...
|
11 years ago |
Marc Zinnschlag
|
767cb54e7c
|
added missing columns to journal info table
|
11 years ago |
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
|
11 years ago |
scrawl
|
636d399c7f
|
Refactored Ogre initialisation into a component
|
11 years ago |
Marc Zinnschlag
|
ba88c94d58
|
first attempt at an info record collection
|
11 years ago |
graffy76
|
b51bef0d98
|
fixed missing adjuster widget in file dialog open view
|
11 years ago |
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>
|
11 years ago |
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
|
11 years ago |
graffy76
|
16d87ea1d1
|
Merge branch 'master' into esxSelector
|
11 years ago |
graffy76
|
2ca7f24731
|
Fixed filedialog new / edit content path issue
|
11 years ago |
graffy76
|
b48f066f33
|
Reimplemented content selector for filedialog and datafilespage classes
|
11 years ago |
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
|
11 years ago |
graffy76
|
f9591ddda6
|
Reimplemented constentselector view class
|
11 years ago |
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
|
11 years ago |
Marc Zinnschlag
|
adf3a41a83
|
added topic and journal tables
|
11 years ago |
Marc Zinnschlag
|
3c580fbc59
|
Merge remote-tracking branch 'jordan-ayers/topic/MagicEffectDisplayFormat'
|
11 years ago |
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.
|
11 years ago |
Jordan Ayers
|
6ab7002908
|
MagicEffect: Put magnitude type into ESM::MagicEffect helper.
|
11 years ago |