Marc Zinnschlag
61626e90da
allow additional string argument for stopcombat and addspell (ignored)
11 years ago
Marc Zinnschlag
6a5d88b640
ignore stray else and endif in scripts
11 years ago
Marc Zinnschlag
697bda6371
allow (and discard) explicit reference on instructions that do not accept explicit references
11 years ago
Marc Zinnschlag
f26aa4f645
fixed while loop implementation
11 years ago
Emanuel Guevel
8c8f4cd420
Fix typo
11 years ago
Marc Zinnschlag
5c0071f320
fixed spelling of an error message
11 years ago
Marc Zinnschlag
3b990795c4
added access to remote access of local variables of global scripts
11 years ago
Marc Zinnschlag
3147aebf75
factored out declaration parser
11 years ago
scrawl
0cc1cd8f7e
Fix message box formatting bug
11 years ago
scrawl
2c0d46525b
Fast-forward particle systems to make cell loads less obvious.
11 years ago
scrawl
cf3812188f
Fix bounding box assertions due to negative particle life time
...
Other parts of the code could not deal with negative life times and produced negative particle sizes as a result (which Ogre could not handle)
11 years ago
pvdk
f263acdac6
Merge remote-tracking branch 'upstream/master' into versioninfo
11 years ago
Marc Zinnschlag
2b2ac6f62b
allow declaration of local variables with keywords as names
11 years ago
Marc Zinnschlag
32860a05e3
added dummy implementations for getPcInJail and getPcTraveling
11 years ago
Marc Zinnschlag
914ab1b8ab
allow 'x' instead of 'getjournalindex x'
11 years ago
Marc Zinnschlag
cd9b137129
allow elseif without matching if (grrrrr)
11 years ago
Marc Zinnschlag
8bcdf54570
added warning mode to script compiler error handler
11 years ago
scrawl
f89b3cac02
Feature #764 : Store the actor that gave the dialog response
11 years ago
Marc Zinnschlag
1b5301eec0
Merge branch 'savedgame'
...
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwbase/soundmanager.hpp
apps/openmw/mwgui/mapwindow.hpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwsound/soundmanagerimp.hpp
components/esm/loadcell.cpp
11 years ago
Marc Zinnschlag
5b04c10e1d
added creature/NPC state to saved games (only container/inventory for now)
11 years ago
Marc Zinnschlag
dd674566a2
store content of containers in saved game files
11 years ago
scrawl
bbd15b185d
Skip inactive controllers. Fixes those bloody bone boots again.
11 years ago
scrawl
5b300c1052
Handle controllers for the root node. Fixes #1147 (incorrect dwemer crossbow rotation)
11 years ago
scrawl
305a471c5a
Fix VisController in ascended sleeper's death animation
11 years ago
Marc Zinnschlag
900532a6ca
store additional state of lights in saved game files
11 years ago
Marc Zinnschlag
e0537a3253
made object state polymorphic
11 years ago
Marc Zinnschlag
a623f03850
reduced object state for objects in containers
11 years ago
mrcheko
e50e94af0b
remove CreatureStats::mAttackType, set/getAttackType()
11 years ago
Marc Zinnschlag
29c3a288e3
load and save of reference in cells (without CustomData state)
11 years ago
scrawl
e0de76a6f7
Save/load global map
11 years ago
scrawl
9c0ed69550
Fix CellRef loading issue causing a startup script failure when TR_Mainland.esm is loaded.
11 years ago
scrawl
a1ac99463f
Fix an uninitialized value
11 years ago
scrawl
03cf383be7
Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame
...
Conflicts:
apps/openmw/mwgui/referenceinterface.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwscript/cellextensions.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/store.cpp
apps/openmw/mwworld/worldimp.cpp
11 years ago
scrawl
295aed3533
Implement savegame screenshots
11 years ago
scrawl
786ed6ca5b
Include some required Ogre headers explicitely
11 years ago
pvdk
19bef4fce8
Distinguish between release and development builds
11 years ago
Marc Zinnschlag
419e3a7d30
write references in cells to saved game file
11 years ago
Marc Zinnschlag
dd7d80ffbc
removed a redundant field from object state
11 years ago
Marc Zinnschlag
22cb4784b5
store cell state in saved game files (no references yet)
11 years ago
pvdk
d92ded3bcd
Forgot adding the version header CMake file
11 years ago
pvdk
c95b8bcb39
Moved the generated version header stuff into components
11 years ago
scrawl
f89c400305
Don't complain about greetings with no sound
11 years ago
scrawl
bd34b61f2a
Set all keyframe-controlled bones as manually controlled
11 years ago
scrawl
4c0045b418
Bug #1109 : Do not reset water level when loading a plugin with no water level record (for real this time)
11 years ago
scrawl
805843d7ff
Closes #1086 : Implement blood effects
11 years ago
Marc Zinnschlag
ce00639d31
added missing birthsign field to player state record
11 years ago
Marc Zinnschlag
d8d4f1a15e
some fixes to record structs
11 years ago
scrawl
d544551f61
Added getSkill to Class interface, since creatures also have skills (which are provided by generalized Combat, Magic and Stealth attributes which substitute for the specific skills, in the same way as specialization)
...
Information provided by Hrnchamd.
11 years ago
scrawl
0a8c61a7fe
Bug #1107 : Reverted previous fix, which caused problems with some actors not using a box shape as expected. Instead, do not create a bounding box collision shape for hidden nodes.
11 years ago
scrawl
79a6ffd216
Closes #1107 : Do not create box shapes unless the box collision flag is enabled
11 years ago
scrawl
3ea1407ed3
Closes #1109 : Don't reset water level when loading a plugin that does include water level records
11 years ago
scrawl
264736c139
Remove hopelessly outdated nifogre tests
11 years ago
scrawl
d0500e8124
Some unneeded includes cleanup
11 years ago
Marc Zinnschlag
bf1a37dc38
Merge remote-tracking branch 'sirherrbatka/referencables_verifer'
11 years ago
Marc Zinnschlag
8c5f313546
added savedgame-specifc record structs for objects state
11 years ago
scrawl
52b9ebff9d
Closes #1092 : Implement sleep interruption. Fix levelled list flags for creatures. Change World::copyObjectToCell to search for the correct cell.
11 years ago
scrawl
26d972280f
Fix a few text defines
11 years ago
Marc Zinnschlag
3e58eb34e4
Merge remote-tracking branch 'sergeyshambir/startcombat'
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
11 years ago
Marc Zinnschlag
e453468eff
moved CellRef loading code to the CellRef class
11 years ago
Marc Zinnschlag
9025210965
Merge branch 'refnum' into savedgame
...
Conflicts:
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/manualref.hpp
components/esm/cellref.hpp
11 years ago
scrawl
1d19d36bd6
Remove unused magic effect flags and update esmtool output
11 years ago
scrawl
ce6aab89cf
Fix a possible permutation issue
11 years ago
scrawl
c64dc2c831
Terrain specular mapping: use a "_diffusespec" postfix to indicate specular information is present in the alpha channel. Use alpha directly instead of 1-alpha.
11 years ago
scrawl
bfdca3b738
Fix needTangents not being set for cached/shared materials
11 years ago
scrawl
aa855e9524
Include some required Ogre headers explicitely
11 years ago
scrawl
6f9113fe88
Add preliminary implementation of PayFine, PayFineThief and GoToJail instructions
11 years ago
Marc Zinnschlag
7c8f735004
Merge remote-tracking branch 'corristo/osx-fixes' into openmw-28
11 years ago
scrawl
7b33f6f2ac
Detect crime of sleeping in other NPC's beds. ShowRestMenu needs to support an explicit/implicit reference for this.
11 years ago
scrawl
0285d18fc2
Respect items belonging to a faction
11 years ago
Sergey Shambir
d5a0ff17fd
MWScript: updated vmformat.txt, changed opcodes to fix sequence.
...
Opcodes for StartCombat, StopCombat, GetTarget now follow the last
previous opcode.
11 years ago
Sergey Shambir
5c7e39a92f
Implemented script commands StartCombat, StopCombat, GetTarget.
...
Also renamed one field of AIWander class because it's not longer
unknown.
11 years ago
Marc Zinnschlag
fefaec5804
Merge remote-tracking branch 'scrawl/savedgame' into savedgame
11 years ago
scrawl
4ad43fdf92
Closes #1088 : Quick&dirty fix for NIF filters not working properly with some mods
11 years ago
Marc Zinnschlag
43dd3b8ef2
removed redundant deletion flag from CellRef
11 years ago
scrawl
62774fcc4a
Merge branch 'master' into HEAD
...
Conflicts:
apps/openmw/mwbase/world.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm/loadtes3.cpp
11 years ago
scrawl
b3764c504a
Implement GetPcJumping instruction
11 years ago
scrawl
c004fb778f
Get rid of underscore defines. They are reserved by the standard.
11 years ago
scrawl
b8e9343764
Extend NifOverrides to allow material overrides, useful for texture modding e.g. adding normal maps without having to edit the affected meshes
11 years ago
scrawl
14b70a3ce6
Implement AI related magic effects (calm, frenzy, rally, demoralize, turn undead)
11 years ago
scrawl
2a7d610f87
Implement GetSpellReadied instruction
11 years ago
scrawl
55c5d7cee4
Implement Resurrect instruction
11 years ago
scrawl
b4230f716e
Implement RemoveEffects instruction
11 years ago
scrawl
7d8ca91286
Implement RemoveSpellEffects instruction
11 years ago
scrawl
366801f3d5
Implement explodeSpell instruction (like Cast, with caster = target)
11 years ago
scrawl
93e1a2df73
Implement Cast script instruction (shrines work now)
11 years ago
scrawl
29acc3f722
Fix particles being too small. Looks like this should actually be size*2.
11 years ago
Marc Zinnschlag
a6e6411686
Merge remote-tracking branch 'scrawl/master'
11 years ago
scrawl
783c501d70
Some checks to prevent bound item abuse
11 years ago
Marc Zinnschlag
e1355be47c
Merge remote-tracking branch 'lgro/valgrind_warnings'
11 years ago
Lukasz Gromanowski
1ce4663065
Updated compiler opcodes for COE, and setHello.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
scrawl
86b2211932
Don't warn about NiFlipController (already implemented)
11 years ago
scrawl
764ec9bc5f
Closes #716 : Use the particle controller's size instead of NiAutoNormalParticlesData particle radius. Same as NifSkope now.
11 years ago
scrawl
07a9b7623a
Enable skeleton-based bounding boxes added in Ogre 1.10
11 years ago
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.
11 years ago
Lukasz Gromanowski
50b6e828cc
Added asserts in Interpreter::installSegmentX methods.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
scrawl
f3a7321a43
Closes #856 : More aggressive supression of skeleton base: only create for keyframe controllers, not any controllers
11 years ago
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>
11 years ago
Marc Zinnschlag
56a80da70c
Merge remote-tracking branch 'ace/win-fix'
11 years ago
Marc Zinnschlag
456b41f05b
Merge remote-tracking branch 'scrawl/master'
11 years ago
scrawl
c0dba2834b
Closes #855 : Don't try to look up bone if there's no skeleton
11 years ago
Alexander "Ace" Olofsson
b50151cb38
Quick build fix for windows
11 years ago
Marc Zinnschlag
f1be4656ec
Merge remote-tracking branch 'lgro/issue1042_TES3_header_data_wrong_encoding'
11 years ago
Marc Zinnschlag
60a8a9e684
Merge remote-tracking branch 'scrawl/master'
11 years ago
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>
11 years ago
scrawl
6d47d710a0
Reimplement NiGeomMorpherController using Ogre's pose animation system
11 years ago
Marek Kochanowicz
03235bf0a2
NPC. Still WIP.
11 years ago
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.
11 years ago
scrawl
9877db413c
Connect particle systems to the particle node, not the emitter node
11 years ago
scrawl
eab2c89346
Issue #983 : Fix controllers to affect objects attached to the base node
11 years ago
scrawl
5931fdcbde
Implement NiBillboardNode. Flags not handled yet.
11 years ago
scrawl
33389b9b63
XDG compliant paths
11 years ago
scrawl
aef0fd1460
Rename some path methods
11 years ago
scrawl
e68e2f82a2
Implement DarkTexture slot. Fix an issue with incorrect transparency override when base texture is empty.
11 years ago
scrawl
0050e6e67b
Support materials with no base (diffuse) texture (should be white). Support alternate UV set for diffuse texture.
11 years ago
scrawl
c5c3248376
Compile fixes for Ogre 1.10
11 years ago
scrawl
6d27ebabb6
Integrate AddGlow with material controllers
11 years ago
Nikolay Kasyanov
892ff93489
OS X: attempt to fix #1045
11 years ago
Marek Kochanowicz
e4e7d50623
Added creatureCheck. I don't know meaning of all data fields here.
11 years ago
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>
11 years ago
scrawl
5fd98d7c3a
Add an assertion
11 years ago
scrawl
18c002a21d
Fix an awful typo.
11 years ago
Marc Zinnschlag
c22e38f825
removing 255 content file limitation
11 years ago
scrawl
19e5978a01
Merge branch 'master' of https://github.com/zinnschlag/openmw
...
Conflicts:
apps/openmw/main.cpp
11 years ago
Marc Zinnschlag
1cf1d49bc4
fix to content file reading error reporting in case of missing dependency
11 years ago
Marc Zinnschlag
bf4ffe94dc
fixed a memory leak in the script record
11 years ago
Marc Zinnschlag
3590fa40bd
store global script state in saved game files
11 years ago
scrawl
530d06ab54
Remove unused code
11 years ago
scrawl
0c3c3ed8e9
Fix wind gravity affector
11 years ago
Marc Zinnschlag
77a2179d1e
Merge remote-tracking branch 'scrawl/master'
11 years ago
scrawl
57a33c957e
Add possibly missing include
11 years ago
scrawl
37a7ee8fcd
Set alpha value of character animations according to Invisibility / Chameleon effects.
11 years ago
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>
11 years ago
scrawl
9fcb4fad5c
Implement NiFlipController
11 years ago
scrawl
51a9f0111c
Implement NiAlphaController and NiMaterialColorController
11 years ago
scrawl
1624e0fd8a
Rename ObjectList to ObjectScene. Wrap it in a SharedPtr so we can automate the destruction routine.
11 years ago
Marc Zinnschlag
ef8c0fab73
Merge remote-tracking branch 'scrawl/master'
11 years ago
scrawl
c5e543b91b
Implement NiGeomMorpherController
11 years ago
Marc Zinnschlag
030c733e2d
Merge branch 'master' into savedgame
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwworld/worldimp.cpp
files/settings-default.cfg
11 years ago
Marc Zinnschlag
674931a851
remove terminating 0 from strings read from ESM records
11 years ago
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
Marc Zinnschlag
e269c9e689
changed a few sub record names to make them more unique
11 years ago
Marc Zinnschlag
7d8e3ac651
fixed QuestState::load/save
11 years ago
Marc Zinnschlag
16e2d67b1f
added overloaded start/endRecord functions to ESMWriter
11 years ago
Marc Zinnschlag
eec9821cd8
added records for storing journals in saved game files
11 years ago
pvdk
1512ac11ad
Fixed the content selector checkboxes appearing as partially checked
11 years ago