mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 21:23:52 +00:00
Code Issues Releases Wiki Activity
9378 commits 38 branches 54 tags 122 MiB
Commit graph

1547 commits

Author SHA1 Message Date
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)
 2014-02-05 05:18:09 +01:00
pvdk
f263acdac6 Merge remote-tracking branch 'upstream/master' into versioninfo 2014-02-03 02:27:24 +01:00
Marc Zinnschlag
2b2ac6f62b allow declaration of local variables with keywords as names 2014-02-02 15:43:48 +01:00
Marc Zinnschlag
32860a05e3 added dummy implementations for getPcInJail and getPcTraveling 2014-02-02 15:35:18 +01:00
Marc Zinnschlag
914ab1b8ab allow 'x' instead of 'getjournalindex x' 2014-02-02 15:08:27 +01:00
Marc Zinnschlag
cd9b137129 allow elseif without matching if (grrrrr) 2014-02-02 14:24:58 +01:00
Marc Zinnschlag
8bcdf54570 added warning mode to script compiler error handler 2014-02-02 13:55:03 +01:00
scrawl
f89b3cac02 Feature #764: Store the actor that gave the dialog response 2014-02-01 18:42:01 +01:00
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
 2014-02-01 18:16:32 +01:00
Marc Zinnschlag
5b04c10e1d added creature/NPC state to saved games (only container/inventory for now) 2014-02-01 17:36:23 +01:00
Marc Zinnschlag
dd674566a2 store content of containers in saved game files 2014-01-31 13:25:32 +01:00
scrawl
bbd15b185d Skip inactive controllers. Fixes those bloody bone boots again. 2014-01-31 05:59:58 +01:00
scrawl
5b300c1052 Handle controllers for the root node. Fixes #1147 (incorrect dwemer crossbow rotation) 2014-01-31 05:06:35 +01:00
scrawl
305a471c5a Fix VisController in ascended sleeper's death animation 2014-01-31 05:06:08 +01:00
Marc Zinnschlag
900532a6ca store additional state of lights in saved game files 2014-01-30 12:37:33 +01:00
Marc Zinnschlag
e0537a3253 made object state polymorphic 2014-01-28 13:53:24 +01:00
Marc Zinnschlag
a623f03850 reduced object state for objects in containers 2014-01-28 13:49:59 +01:00
mrcheko
e50e94af0b remove CreatureStats::mAttackType, set/getAttackType() 2014-01-27 23:05:17 +02:00
Marc Zinnschlag
29c3a288e3 load and save of reference in cells (without CustomData state) 2014-01-27 13:27:42 +01:00
scrawl
e0de76a6f7 Save/load global map 2014-01-25 19:06:14 +01:00
scrawl
9c0ed69550 Fix CellRef loading issue causing a startup script failure when TR_Mainland.esm is loaded. 2014-01-25 15:10:25 +01:00
scrawl
a1ac99463f Fix an uninitialized value 2014-01-24 22:52:04 +01:00
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
 2014-01-24 18:28:35 +01:00
scrawl
295aed3533 Implement savegame screenshots 2014-01-24 17:49:16 +01:00
scrawl
786ed6ca5b Include some required Ogre headers explicitely 2014-01-24 15:02:34 +01:00
pvdk
19bef4fce8 Distinguish between release and development builds 2014-01-23 13:18:05 +01:00
Marc Zinnschlag
419e3a7d30 write references in cells to saved game file 2014-01-23 12:51:42 +01:00
Marc Zinnschlag
dd7d80ffbc removed a redundant field from object state 2014-01-23 12:51:25 +01:00
Marc Zinnschlag
22cb4784b5 store cell state in saved game files (no references yet) 2014-01-23 11:29:40 +01:00
pvdk
d92ded3bcd Forgot adding the version header CMake file 2014-01-22 19:30:41 +01:00
pvdk
c95b8bcb39 Moved the generated version header stuff into components 2014-01-22 17:33:55 +01:00
scrawl
f89c400305 Don't complain about greetings with no sound 2014-01-22 00:02:43 +01:00
scrawl
bd34b61f2a Set all keyframe-controlled bones as manually controlled 2014-01-20 13:37:34 +01:00
scrawl
4c0045b418 Bug #1109: Do not reset water level when loading a plugin with no water level record (for real this time) 2014-01-18 21:11:12 +01:00
scrawl
805843d7ff Closes #1086: Implement blood effects 2014-01-17 11:27:13 +01:00
Marc Zinnschlag
ce00639d31 added missing birthsign field to player state record 2014-01-17 10:51:52 +01:00
Marc Zinnschlag
d8d4f1a15e some fixes to record structs 2014-01-16 12:02:45 +01:00
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.
 2014-01-15 15:50:45 +01:00
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. 2014-01-15 14:53:29 +01:00
scrawl
79a6ffd216 Closes #1107: Do not create box shapes unless the box collision flag is enabled 2014-01-15 14:53:29 +01:00
scrawl
3ea1407ed3 Closes #1109: Don't reset water level when loading a plugin that does include water level records 2014-01-15 14:53:29 +01:00
scrawl
264736c139 Remove hopelessly outdated nifogre tests 2014-01-15 14:53:29 +01:00
scrawl
d0500e8124 Some unneeded includes cleanup 2014-01-15 14:53:28 +01:00
Marc Zinnschlag
bf1a37dc38 Merge remote-tracking branch 'sirherrbatka/referencables_verifer' 2014-01-15 14:29:54 +01:00
Marc Zinnschlag
8c5f313546 added savedgame-specifc record structs for objects state 2014-01-14 15:29:55 +01:00
scrawl
52b9ebff9d Closes #1092: Implement sleep interruption. Fix levelled list flags for creatures. Change World::copyObjectToCell to search for the correct cell. 2014-01-14 07:42:03 +01:00
scrawl
26d972280f Fix a few text defines 2014-01-14 06:03:34 +01:00
Marc Zinnschlag
3e58eb34e4 Merge remote-tracking branch 'sergeyshambir/startcombat' 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2014-01-13 10:17:10 +01:00
Marc Zinnschlag
e453468eff moved CellRef loading code to the CellRef class 2014-01-12 19:23:08 +01:00
Marc Zinnschlag
9025210965 Merge branch 'refnum' into savedgame 
Conflicts:
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/manualref.hpp
	components/esm/cellref.hpp
 2014-01-12 16:58:06 +01:00
scrawl
1d19d36bd6 Remove unused magic effect flags and update esmtool output 2014-01-12 01:25:00 +01:00
scrawl
ce6aab89cf Fix a possible permutation issue 2014-01-11 04:58:30 +01:00
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. 2014-01-11 00:51:03 +01:00
scrawl
bfdca3b738 Fix needTangents not being set for cached/shared materials 2014-01-09 23:13:31 +01:00
scrawl
aa855e9524 Include some required Ogre headers explicitely 2014-01-09 20:56:24 +01:00
scrawl
6f9113fe88 Add preliminary implementation of PayFine, PayFineThief and GoToJail instructions 2014-01-09 01:49:58 +01:00
Marc Zinnschlag
7c8f735004 Merge remote-tracking branch 'corristo/osx-fixes' into openmw-28 2014-01-08 20:16:39 +01:00
scrawl
7b33f6f2ac Detect crime of sleeping in other NPC's beds. ShowRestMenu needs to support an explicit/implicit reference for this. 2014-01-08 17:19:43 +01:00
scrawl
0285d18fc2 Respect items belonging to a faction 2014-01-07 20:24:01 +01:00
Sergey Shambir
d5a0ff17fd MWScript: updated vmformat.txt, changed opcodes to fix sequence. 
Opcodes for StartCombat, StopCombat, GetTarget now follow the last
previous opcode.
 2014-01-07 05:06:20 +04:00
Sergey Shambir
5c7e39a92f Implemented script commands StartCombat, StopCombat, GetTarget. 
Also renamed one field of AIWander class because it's not longer
unknown.
 2014-01-07 04:43:06 +04:00
Marc Zinnschlag
fefaec5804 Merge remote-tracking branch 'scrawl/savedgame' into savedgame 2014-01-06 22:30:08 +01:00
scrawl
4ad43fdf92 Closes #1088: Quick&dirty fix for NIF filters not working properly with some mods 2014-01-06 19:01:05 +01:00
Marc Zinnschlag
43dd3b8ef2 removed redundant deletion flag from CellRef 2014-01-06 13:53:20 +01:00
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
 2014-01-06 00:23:17 +01:00
scrawl
b3764c504a Implement GetPcJumping instruction 2014-01-05 19:08:12 +01:00
scrawl
c004fb778f Get rid of underscore defines. They are reserved by the standard. 2014-01-05 18:22:29 +01:00
scrawl
b8e9343764 Extend NifOverrides to allow material overrides, useful for texture modding e.g. adding normal maps without having to edit the affected meshes 2014-01-05 18:09:50 +01:00
scrawl
14b70a3ce6 Implement AI related magic effects (calm, frenzy, rally, demoralize, turn undead) 2014-01-05 01:34:35 +01:00
scrawl
2a7d610f87 Implement GetSpellReadied instruction 2014-01-03 22:55:17 +01:00
scrawl
55c5d7cee4 Implement Resurrect instruction 2014-01-03 15:54:23 +01:00
scrawl
b4230f716e Implement RemoveEffects instruction 2014-01-03 05:19:10 +01:00
scrawl
7d8ca91286 Implement RemoveSpellEffects instruction 2014-01-03 05:18:44 +01:00
scrawl
366801f3d5 Implement explodeSpell instruction (like Cast, with caster = target) 2014-01-03 04:44:50 +01:00
scrawl
93e1a2df73 Implement Cast script instruction (shrines work now) 2014-01-03 04:09:52 +01:00
scrawl
29acc3f722 Fix particles being too small. Looks like this should actually be size*2. 2014-01-02 16:56:31 +01:00
Marc Zinnschlag
a6e6411686 Merge remote-tracking branch 'scrawl/master' 2014-01-02 12:12:52 +01:00
scrawl
783c501d70 Some checks to prevent bound item abuse 2014-01-02 01:36:08 +01:00
Marc Zinnschlag
e1355be47c Merge remote-tracking branch 'lgro/valgrind_warnings' 2014-01-01 19:41:52 +01:00
Lukasz Gromanowski
1ce4663065 Updated compiler opcodes for COE, and setHello. 
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
 2013-12-31 18:13:38 +01:00
scrawl
86b2211932 Don't warn about NiFlipController (already implemented) 2013-12-31 17:33:15 +01: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
scrawl
07a9b7623a Enable skeleton-based bounding boxes added in Ogre 1.10 2013-12-31 13:22:57 +01: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
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
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