mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 07:49:56 +00:00
Code Issues Releases Wiki Activity
10700 commits 38 branches 54 tags 122 MiB
Commit graph

1741 commits

Author SHA1 Message Date
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
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
Nikolay Kasyanov
892ff93489 OS X: attempt to fix #1045 2013-12-25 00:25:58 +04: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
Marc Zinnschlag
c22e38f825 removing 255 content file limitation 2013-12-17 21:19:05 +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
Marc Zinnschlag
1cf1d49bc4 fix to content file reading error reporting in case of missing dependency 2013-12-16 11:39:24 +01:00
Marc Zinnschlag
bf4ffe94dc fixed a memory leak in the script record 2013-12-15 16:19:45 +01:00
Marc Zinnschlag
3590fa40bd store global script state in saved game files 2013-12-15 16:16:50 +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
Marc Zinnschlag
030c733e2d Merge branch 'master' into savedgame 
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	files/settings-default.cfg
 2013-12-07 12:27:06 +01:00
Marc Zinnschlag
674931a851 remove terminating 0 from strings read from ESM records 2013-12-06 14:24:14 +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
Marc Zinnschlag
e269c9e689 changed a few sub record names to make them more unique 2013-12-03 14:30:18 +01:00
Marc Zinnschlag
7d8e3ac651 fixed QuestState::load/save 2013-12-03 13:51:44 +01:00
Marc Zinnschlag
16e2d67b1f added overloaded start/endRecord functions to ESMWriter 2013-12-01 13:32:11 +01:00
Marc Zinnschlag
eec9821cd8 added records for storing journals in saved game files 2013-11-30 14:41:12 +01:00
pvdk
1512ac11ad Fixed the content selector checkboxes appearing as partially checked 2013-11-30 12:16:57 +01:00
Marc Zinnschlag
750133c0dd one more fix to SavedGame record saving 2013-11-30 11:05:07 +01:00
scrawl
e7ad503e30 Merge branch 'particles' into projectiles 2013-11-28 17:16:59 +01:00
Marc Zinnschlag
e432ab5e8a fixed static problem in Land recrod save function 2013-11-28 11:51:21 +01:00
Marc Zinnschlag
b40c0f2a07 one more fix to SavedGame record saving 2013-11-26 09:56:08 +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
Marc Zinnschlag
1ecadccb28 fixed save function of SavedGame record 2013-11-25 12:59:40 +01:00
Marc Zinnschlag
67cd0887e6 added description field to saved game record; make use of description in GUI 2013-11-24 15:19:56 +01:00
Marc Zinnschlag
fc1501a510 store character profile information in saved game file 2013-11-21 10:53:42 +01:00
Marc Zinnschlag
d6e2701dd6 changed played time data type from float to double 2013-11-21 10:10:41 +01:00
scrawl
3452bd2e0b Add glow effect for enchanted items 2013-11-20 00:13:12 +01:00
Marc Zinnschlag
9487bd33c3 removed broken save function from ESMWriter 2013-11-19 16:07:36 +01:00
Marc Zinnschlag
4c61deca8d fixed save code for SavedGame record 2013-11-19 15:31:39 +01:00
Marc Zinnschlag
35bf98a940 modified esm reader/writer to use UTF8 when no encoder is given 2013-11-19 13:46:24 +01:00
Marc Zinnschlag
903e867c24 change to TES3 record (moved format field to the top) 2013-11-19 13:44:18 +01:00
Marc Zinnschlag
dc75627d53 added secondary saved game header record 2013-11-19 10:51:30 +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
Nikolay Kasyanov
3993c34739 Merge remote-tracking branch 'upstream/master' into osx-ogre-19 2013-10-14 20:37:55 +04: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
Marc Zinnschlag
d4b2a6b9f1 Merge remote-tracking branch 'graffy76/esxSelector' into saving 2013-09-23 10:09:43 +02:00
graffy76
513f0c4b3e Implemented file/adjuster widgets into new addon creation dialog 2013-09-22 23:52:53 -05:00
Xethik
9f533dbbe4 Fixed "most vexing parse" issue. 2013-09-22 04:57:01 -04:00
graffy76
cfdc19c427 Renamed esxSelector to contentSelector 
Fixed datafilespage model implementation in launcher
Filtered addons in table view by selected game file
 2013-09-21 23:06:29 -05:00
graffy76
7b7dfa122d Merge branch 'master' into esxSelector 2013-09-19 16:24:28 -05:00
graffy76
244e581952 Finished implementing drag / drop 
refactored datafilesmodel (now contentmodel)
refactored esmfil
 2013-09-19 06:53:09 -05:00
graffy76
0eb06ada39 Implemneting drag and drop 2013-09-18 02:36:23 -05:00
Marc Zinnschlag
bf0fba68af added save stage for globals 2013-09-16 12:51:57 +02:00
Marc Zinnschlag
874ce26bef added missing consts to record save functions 2013-09-16 12:32:35 +02:00
Nikolay Kasyanov
25cd9ebf45 Plugins are frameworks in Ogre 1.9. Version hack removed. 2013-09-15 21:56:47 +04:00
Marc Zinnschlag
1ee228a566 fix for the ESMWriter fix 2013-09-15 15:30:17 +02:00
Marc Zinnschlag
bcd36bd378 various ESMWriter fixes 2013-09-15 15:00:15 +02:00
Marc Zinnschlag
bf8a25c2c6 Merge remote-tracking branch 'mckibbenta/tgm' 2013-09-12 19:07:35 +02:00
gus
f9bfbc8764 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat 2013-09-10 16:18:39 +02:00
gus
46a734852b adding script instruction getLOS + some test about AI 2013-09-10 16:16:13 +02:00
Marc Zinnschlag
25b7cd33ea added FileWidget; fixed OpenCS configuration 2013-09-08 14:31:20 +02:00
graffy76
a6e7cf9a8c Implementing drag and drop 2013-09-07 15:57:40 -05:00
Marc Zinnschlag
9332684335 allow the use of value types in string filters 2013-09-05 15:05:49 +02:00
scrawl
188df341c3 Replaced log2 to make VC happy 2013-08-27 16:08:58 +02:00
scrawl
839d251cc5 Renamed Terrain::Terrain to Terrain::World to make VC happy 2013-08-27 16:01:16 +02:00
scrawl
d3d6dfbde8 Refactored loading screen 
- Add loading progress for data files, global map, terrain
 - Refactored and improved cell loading progress
 2013-08-27 15:48:13 +02:00
mckibbenta
06701467ab Merge branch 'master' into tgm 2013-08-24 21:28:26 -04:00
mckibbenta
8998b90e8b initial do-nothing implementation; registered opcode 2013-08-24 21:19:12 -04:00
Marc Zinnschlag
f605dcdd24 Merge branch 'filter' 2013-08-24 14:51:05 +02:00
Nikolay Kasyanov
dc6e15f38e Replaced std::pow with shift since clang doesn't like int as a first argument 
(reports that call is ambiguous)
 2013-08-21 23:59:33 +04:00
Marc Zinnschlag
e03e2f0817 Merge remote-tracking branch 'scrawl/master' 2013-08-21 19:50:08 +02:00
scrawl
d086346b07 Fix loading of some cells in TR 2013-08-21 17:26:11 +02:00
scrawl
5f7e6f7b10 Fix a material issue, layers per pass wasn't entirely correct 2013-08-21 17:26:11 +02:00
scrawl
43313437dc Fix composite map for cells without land data 2013-08-21 17:26:11 +02:00
scrawl
ce5ea6d7d2 Use a proper node hierarchy; disconnect the root when entering interior 2013-08-21 17:26:11 +02:00
Chris Robinson
602be9bbe7 Avoid swimming into the air from underwater 2013-08-21 07:24:54 -07:00
graffy76
e6fdc7e7fd ... 2013-08-20 12:34:39 -05:00
graffy76
6898321676 Reenabling features 
Profile functions enabled
New/load file functions partially enabled
Layout reorganized
 2013-08-20 08:16:56 -05:00
scrawl
fa76d1631b Some terrain fixes 2013-08-20 12:08:46 +02:00
graffy76
b52645bf2a Fixes to accommodate master/plugin loading 2013-08-20 03:23:32 -05:00
scrawl
8c8653160d Crash fix, material fix 2013-08-20 09:52:27 +02:00
scrawl
b92da9ae93 Neighbour fix 2013-08-19 21:08:44 +02:00
scrawl
ebf9debb80 Enabled terrain self shadows, implemented getHeightAt, some optimizations 2013-08-19 20:39:37 +02:00
scrawl
e27437f8ed New terrain renderer - improvements: 
- Consistent triangle alignment, fixes a noticable crack near the census and excise office. Note that alignment is still not the same as vanilla. Vanilla uses a weird diagonal pattern. I hope there aren't more trouble spots that will force us to replicate vanilla, but at least we can do that now.
 - Fixes several blending issues and cell border seams
 - Fix map render to use the terrain bounding box instead of an arbitrary height
 - Different LODs are now properly connected instead of using skirts
 - Support self shadowing
 - Normals and colors are stored in the vertices instead of a texture, this enables per-vertex lighting which should improve performance, fix compatibility issues due to the PS getting too large and mimic vanilla better
 - Support a fixed function fallback (though the splatting shader usually performs better)
 - Designed for distant land support - test: https://www.youtube.com/watch?v=2wnd9EuPJIY - we can't really enable this yet due to depth precision issues when using a large view distance
 2013-08-19 20:34:20 +02:00
scrawl
a41a23c90a Deleted old code 2013-08-19 20:34:19 +02:00
graffy76
e614ec3353 Fixing profile code in progress... 2013-08-18 17:11:23 -05:00
graffy76
f6217f9c6a Moved esx selector classes out of global namespace 2013-08-18 15:11:29 -05:00
graffy76
a14e0b32d8 Restructured esxselector directory 
Added ./view
Removed ./utils and ./model/esm
Relocated code accordingly.
 2013-08-18 09:48:13 -05:00
graffy76
d0363b037c Renamed components/fileorderlist to components/esxselector 2013-08-18 09:41:02 -05:00
graffy76
45277c0082 Minor changes 
Stretched table columns to fit widget width
Reduced width of opencs file dialog
Hid the file size column for launcher
Added alternating row colors in table view
 2013-08-18 09:34:33 -05:00
graffy76
66e50343ad Fixed row-selection/check feature 2013-08-18 08:54:51 -05:00
graffy76
a9db983233 Fixing row-click selection 2013-08-18 07:29:48 -05:00
graffy76
2878f51cd3 Reimplemented dependency selection feature 
Moved more code to ContentSelector
Added support for omwgame and omwaddon files
 2013-08-17 19:40:28 -05:00
graffy76
b24dd5c6ac Continued migration of code to ContentSelector 2013-08-17 05:55:43 -05:00
graffy76
0087b0d67c Removed checkboxes from master list 
Moved checkbox code from datafilesmodel to pluginsproxymodel
 2013-08-17 05:37:23 -05:00
graffy76
61602789e1 Began migrating code to ContentSelector base 2013-08-16 22:23:21 -05:00
graffy76
4c8c6d6971 Moved init code to master / plugin proxy classes 2013-08-16 21:20:48 -05:00
graffy76
7389507eb5 Created masterproxylist class 2013-08-16 21:12:30 -05:00
graffy76
b850fe0289 Removed vertical headers from plugin view 2013-08-16 18:59:01 -05:00
graffy76
84e5c2610a Implemented combobox for game file selection 2013-08-16 18:00:23 -05:00
graffy76
bfb71f23c9 Changed filter mechanism for game / addons 
Filters by number of master references, regardless of extension
 2013-08-16 17:26:23 -05:00
Chris Robinson
73437dfdca GetEffect can accept an effect ID string as well 2013-08-13 19:18:21 -07:00
Chris Robinson
30973352e8 Implement ShowVars (SV) console function 2013-08-13 04:54:41 -07:00
Chris Robinson
6fd4cdb5fb Play randomized werewolf sounds 2013-08-11 00:53:17 -07:00
Chris Robinson
5968165de0 Merge remote-tracking branch 'zini/master' into werewolf 
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
 2013-08-09 07:00:00 -07:00
Chris Robinson
db1036e5e5 Handle SetWerewolfAcrobatics 2013-08-09 05:37:56 -07:00
Chris Robinson
ae183cb3e4 Handle werewolf stats 2013-08-09 05:14:58 -07:00
Marc Zinnschlag
a95715b61d added description field to filter record 2013-08-09 13:45:50 +02:00
Marc Zinnschlag
bf839d19cf Merge branch 'columns' 2013-08-08 12:50:57 +02:00
Chris Robinson
2bac4566c0 Merge remote-tracking branch 'PotatoesMaster/werewolf' into werewolf 
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwscript/statsextensions.cpp
 2013-08-08 00:09:29 -07:00
Alex
b9579e085f cleanup 2013-08-07 15:40:57 -04:00
Alex
a0931b01fe Merge branch 'master' of https://github.com/zinnschlag/openmw into compiler-reorg 2013-08-07 13:19:23 -04:00
Alex
c3ca5b7c32 mild cleanup 2013-08-07 13:16:20 -04:00
Chris Robinson
57fb065a86 Add Ogre::Light objects to the object list 
Note that NIFs actually have NiLight-based light records which could be
used to create Ogre::Light objects. However, no Morrowind NIF uses them,
as far as I can tell.
 2013-08-06 19:49:01 -07:00
Alex
de1f423bd7 initial move of script opcodes and registerExtensions functions to components/compiler 2013-08-06 20:38:41 -04:00
Marc Zinnschlag
501753c01b Merge remote-tracking branch 'scrawl/master' into columns 2013-08-03 15:06:30 +02:00
scrawl
7dc30a01cd Some changes suggested by cppcheck 2013-07-31 18:46:32 +02:00
Marc Zinnschlag
adb05737ee Merge branch 'master' into filter 
Conflicts:
	apps/opencs/model/world/universalid.cpp
	apps/opencs/view/doc/view.cpp
	apps/opencs/view/world/subviews.cpp
 2013-07-30 15:55:50 +02:00
Chris Robinson
b7e81dbc5b Ignore controllers on the root NiNode 
I wonder if we should ignore the root NiNode completely.
 2013-07-28 04:20:33 -07:00
Chris Robinson
fb0ee7f2fc Improve constness of the Nif RecordPtr structs 2013-07-24 23:58:35 -07:00
Chris Robinson
8e24cab935 Strip trailing whitespace from textkeys 2013-07-24 23:21:19 -07:00
Marc Zinnschlag
6f90e071f4 added filter record (will not be used in OpenMW prior to 1.1) 2013-07-22 20:50:04 +02:00
Marc Zinnschlag
47f7bbd48a fixed OpenCS crash during cell loading when loading multiple ESX files 2013-07-16 12:08:35 +02:00
Marc Zinnschlag
0fd49f10a9 Merge branch 'minus' 2013-07-07 16:09:44 +02:00
Marc Zinnschlag
4a75c7dcc0 allow backticks in names 2013-07-07 16:09:26 +02:00
Marc Zinnschlag
4986b7d65d Merge branch 'master' into ref 2013-07-06 17:54:19 +02:00
graffy76
a73b97d125 Fixed broken references and other bugs 
Removed references to CSVSettings::SamplePage class
Removed multiple QDebug references
Fixed custom LineEdits (window size user pref) would not accept data
 2013-06-21 23:23:43 -05:00
Marc Zinnschlag
a2aa3aaa0e workaround for - in names 2013-06-21 14:20:52 +02:00
Marc Zinnschlag
744198fc44 added blank function to CellRef and moved a function that was in the wrong file 2013-06-08 15:49:59 +02:00
scrawl
daab4f55a3 Use Morrowind's fonts 2013-06-06 22:26:06 +02:00
Miroslav Puda
dc17fa1636 Removal of duplicit enumeration and unnecessary conditions. 2013-05-29 00:01:18 +02:00
Miroslav Puda
b40e24c50c Refactorization 2013-05-27 20:23:04 +02:00
Miroslav Puda
cfbdf3f779 Enum Type renamed to CastingStyle 2013-05-27 15:37:31 +02:00
Miroslav Puda
9e1eb8b3b1 Merge branch 'master' of https://github.com/zinnschlag/openmw into enchanting-mechanics 2013-05-27 14:45:22 +02:00
Miroslav Puda
4788b5e226 Better formula for enchantment cost and code refactorization. 2013-05-27 14:42:08 +02:00
eroen
886bc7e2f6 libc++ fixes: don't rely on tr1 
libc++ doesn't ship tr1, but ships unordered_map as it is part of c++11.

Since this is the only tr1 header used in openmw, add a check for c++11
unordered_map and fallback to tr1 unordered_map if it's not found.
 2013-05-26 12:44:30 +02:00
Miroslav Puda
7149439ace Replacement of empty() method by assertion. 2013-05-22 13:23:49 +02:00
Miroslav Puda
cd57523601 Merge branch 'master' of https://github.com/zinnschlag/openmw 2013-05-20 14:01:47 +02:00
Marc Zinnschlag
c626e2b257 Merge branch 'ref' 
Conflicts:
	apps/opencs/view/doc/view.hpp
 2013-05-19 14:59:01 +02:00
Miroslav Puda
d5689730eb Removal of unnecessary variable. 
empty variable duplicates empty() method of std::string. Check for empty value should be replaced by assert since it does not makes much sense to call scanInt with null character.
 2013-05-18 22:57:27 +02:00
Chris Robinson
53d1c3939c Merge remote-tracking branch 'zini/master' into animations 2013-05-17 06:26:34 -07:00
scrawl
ca81335319 Fix bug loading attribute values 2013-05-16 21:45:49 +02:00
scrawl
8a3d3f954b NPC/creature persistence flag 2013-05-16 18:50:26 +02:00
Chris Robinson
822f130f79 Merge remote-tracking branch 'zini/master' into animations 2013-05-13 04:09:56 -07:00
Marc Zinnschlag
e2620a1edf Issue #694: allow float literals starting with . 2013-05-13 11:38:35 +02:00
Chris Robinson
eb4daaf512 Build a skeleton for Nifs that have a matching .kf file 2013-05-08 01:03:57 -07:00
Chris Robinson
bf94ffb839 Only support NiSequenceStreamHelper as a Kf root 
Newer versions of the Nif foramt may have other record types, but we don't
support those.
 2013-05-07 18:26:22 -07:00
Chris Robinson
8e38dc410f Allow loading multiple animation sources 
Animation sources are treated differently from base objects. When given
"path\file.nif", base objects will look for "path\xfile.nif" and use that
if it exists (falling back to the original name if not found). Animation
sources will instead use "path\xfile.kf", ignoring it if the file doesn't
exist.
 2013-05-07 16:59:32 -07:00
Chris Robinson
6a3ba41170 Don't store camera nodes, we don't need them. 2013-05-06 21:46:11 -07:00
scrawl
757a26794a Merge branch 'master' of https://github.com/zinnschlag/openmw into journal 2013-05-06 15:35:38 +02:00
Marc Zinnschlag
b21dae8d75 added blank function to all referencable record structs 2013-05-06 14:10:43 +02:00
scrawl
f0354ea04c Fix member variable case problem 2013-05-04 19:14:19 +02:00
scrawl
78e6dab9d2 Dialogue history rewrite WIP 2013-05-04 14:15:47 +02:00
scrawl
1f58edb9db Merge branch 'master' of https://github.com/zinnschlag/openmw into journal 2013-05-03 18:17:27 +02:00
Marc Zinnschlag
fe038cef03 turned redeclartion of local variables from an error into a warning 2013-05-01 14:20:09 +02:00
Marc Zinnschlag
63407a662c allow <== and >== as alternative for <= and >= in scripts 2013-05-01 14:08:05 +02:00
scrawl
3c68c87923 Fix some naming guidelines, fix topic index exception, fix exception in keyword search for some journal entries 2013-05-01 10:28:59 +02:00
scrawl
2a42556aa5 Merge branch 'master' into HEAD 2013-04-30 14:54:10 +02:00
scrawl
20d5ba0eec Revert "enable move construction/assignment to key ESM data structure to reduce sorting costs" 
This reverts commit 6dbb53493b.
 2013-04-30 14:54:07 +02:00
scrawl
24f968623f Revert "reworked Nif::KeyListT into Nif::CurveT" 
This reverts commit e7665582ad.
 2013-04-30 14:53:51 +02:00
scrawl
de3c76a54b Revert "reworked NIFStream to use a type-handler" 
This reverts commit 03ee7663a3.
 2013-04-30 14:53:41 +02:00
Chris Robinson
15a2eeebb8 Merge remote-tracking branch 'zini/master' into animations 
Conflicts:
	apps/openmw/mwworld/worldimp.cpp
 2013-04-29 10:16:29 -07:00
Marc Zinnschlag
93868c8bca Merge remote-tracking branch 'scrawl/master' 2013-04-29 18:08:25 +02:00
scrawl
d5c7a26041 Fix broken loose file resources when using Ogre 1.9 2013-04-29 12:32:24 +02:00
scrawl
78596cad83 Fix enchantment points value 2013-04-29 10:19:09 +02:00
Chris Robinson
4cedf0fbab Avoid colliding with AvoidNodes 
These are placed under the RootCollisionNode hierarchy, but the shapes they
hold aren't collided with. Their exact function is unknown, but seems to be
related to lava? Maybe damage avoidance info for the AI.
 2013-04-28 11:12:55 -07:00
Glorf
6ea82333d4 Headers cleanup 2013-04-28 16:38:33 +02:00
Glorf
98baf9fac1 Bugfix #718 2013-04-28 16:36:12 +02:00
Marc Zinnschlag
90b38cbfbe fixed parsing of end statements in scripts with IDs matching keywords 2013-04-27 14:06:23 +02:00
Nathan Jeffords
c7ede9b523 port code to C++03 2013-04-24 20:22:57 -07:00
Nathan Jeffords
6e7c9ebbe6 fix for gcc not handling static constant initialized in class definition 2013-04-24 20:22:57 -07:00
Nathan Jeffords
75757cb675 Created a class to represent a stream of UTF8 characters. 2013-04-24 20:20:00 -07:00
Nathan Jeffords
6dbb53493b enable move construction/assignment to key ESM data structure to reduce sorting costs 2013-04-24 20:20:00 -07:00
Nathan Jeffords
e7665582ad reworked Nif::KeyListT into Nif::CurveT 
Renamed Nif:KeyListT to Nif::CurveT, moved it into its own file and
changed its implementation so that on compatible platforms, the entire
array of key-frames can be read in a single read call. Added a helper
class called Nif::CurveT::interpolator to allow other code to easily
evaluate the curve. Reworked part of the skeletonLoader code to use
the interpolator to simplify its own logic.
 2013-04-24 20:20:00 -07:00
Nathan Jeffords
03ee7663a3 reworked NIFStream to use a type-handler 
Reworked NIFStream to use a type-handler system to decide how to extract
data from the NIF. It also has the capability to perform bulk reads on
compatible platforms, thus improving cell-load performance.
 2013-04-24 20:20:00 -07:00
Chris Robinson
68a9a4de5f Fix setting and getting KeyframeController transforms 2013-04-24 04:12:27 -07:00
Chris Robinson
26cc86ffdc Use the Nif node's transform for skinned fixups 2013-04-24 00:42:45 -07:00
Chris Robinson
6f0b9a5f2c Avoid unnecessary multimap copies 2013-04-23 21:42:59 -07:00
Chris Robinson
512ff3687a Don't create Ogre animations for skeletons 2013-04-23 20:42:54 -07:00
Chris Robinson
634b0fd067 Fix for controller delta time going below start time 2013-04-23 17:57:40 -07:00
Chris Robinson
020bc410bf Merge remote-tracking branch 'zini/master' into nifogre 2013-04-23 16:57:59 -07:00
scrawl
44ac0a7c18 Use one vertex buffer for all UV coordinates 2013-04-23 22:47:57 +02:00
Chris Robinson
adc6a948c7 Add methods to get the rotation, translation, and scale from a NodeTargetValue 2013-04-22 03:41:38 -07:00
Chris Robinson
59137d93c9 Partially handle NiGeomMorpherController 
The morphs aren't actually applied yet, but the Ogre controller is set up so
all that has to be done is to implement the setValue method.
 2013-04-22 03:24:02 -07:00
Chris Robinson
d936291dbf Remove an unused ostream operator<< 2013-04-22 02:53:32 -07:00
Chris Robinson
a3511c62cf Don't store textkeys in user object bindings 
It's a bit unwieldy to have them stored in the 'skeleton master' instead
of the skeleton instance. And although the text keys are extracted for
each created instance now, this shouldn't be much worse than the
multimap copying going on before.

Plus, proper serialization can help for future optimizations.
 2013-04-22 00:01:30 -07:00
Chris Robinson
2345b5e8b3 Avoid storing text keys for each animation 2013-04-21 22:56:40 -07:00
Chris Robinson
7d59340ed6 Don't clip out the group name from the textkeys 2013-04-21 22:13:49 -07:00
Chris Robinson
ace7d647e5 Add a method to apply a NodeTargetValue-based controller to a specified node. 2013-04-20 15:35:19 -07:00
Chris Robinson
f37a71f025 Use a separate method to build node-based controllers 2013-04-19 23:56:47 -07:00
Chris Robinson
1051fa51a7 Recognize NiFlipController 2013-04-19 15:07:08 -07:00
Chris Robinson
6d59325bff Merge remote-tracking branch 'zini/master' into nifogre 2013-04-17 23:21:17 -07:00
scrawl
c519fc360d Move away from fixed record names for body parts 2013-04-18 00:19:34 +02:00
Chris Robinson
3def2a0f45 Treat the particle random values as the max differential 2013-04-16 19:16:45 -07:00
Chris Robinson
cac793758b Merge remote-tracking branch 'zini/master' into nifogre 2013-04-16 11:52:19 -07:00
Chris Robinson
36170c5374 Use flag enums instead of hard-coded hex values 2013-04-16 01:20:32 -07:00
Chris Robinson
1b1f9f7921 Allow multiple ObjectLists to be created for Animations. 
addObjectList may not currently be called outside of the related constructor.
 2013-04-15 18:55:28 -07:00
Chris Robinson
7000a1aa3e Add a ParticleSystemController 2013-04-14 13:50:55 -07:00
Chris Robinson
bf8bc989fc Recognize and partly handle NiBSParticleNode 2013-04-14 12:52:20 -07:00
Marc Zinnschlag
f692fc1093 Merge branch 'cell' 2013-04-14 19:35:19 +02:00
Marc Zinnschlag
0c33dd86d5 added basic cell table 2013-04-14 17:04:55 +02:00
Chris Robinson
f4695ec4ac Cleanup NIFObjectLoader some 2013-04-14 00:06:40 -07:00
Chris Robinson
acb1b5f002 Try to handle NiBSAnimationNode 
This is still incomplete guess work. Currently it seems as though flag 0x20
specifies whether the controllers auto-play (if on), rather than follow the
object's animation time.
 2013-04-13 22:54:32 -07:00
Chris Robinson
0b363ba36e Handle NiParticleColorModifier with Ogre's ColourInterpolator 
Note that Ogre's ColourInterpolator has a maximum of six color stages. This
seems to be fine so far, but if we want anything better, we'll need a custom
affector for it.
 2013-04-13 16:42:32 -07:00
Chris Robinson
80a4345787 Keep particles in local space 2013-04-13 16:26:34 -07:00
Chris Robinson
dd981077b9 Handle the vertical and horizontal parameters of Nif particles 
Note that 'horizontal' is mapped to rotate around the Z axis, not Y. The Nif
particle parameters seem to be set up to expect a normal OpenGL (Direct3D?)
orientation, rather than the 90-degree pitch offset of the game.
 2013-04-13 16:16:57 -07:00
Chris Robinson
7191f6ed2a Start a Nif-style particle emitter 
Not complete yet (doesn't handle the vertical or horizontal direction/angle),
and should probably be renamed.
 2013-04-13 14:36:24 -07:00
Chris Robinson
07c24e0382 Don't create entities and particles when only the skeleton base is needed 2013-04-13 13:13:09 -07:00
Chris Robinson
4a42f89e08 Merge remote-tracking branch 'zini/master' into nifogre 2013-04-13 13:04:41 -07:00
Chris Robinson
5b30677e41 Add the start of a custom gravity affector 2013-04-12 14:39:06 -07:00
Marc Zinnschlag
a1ece7de30 Bug #613: fixed assert in string literal access function 2013-04-12 14:48:53 +02:00
scrawl
23b477a938 Fix normal maps with spaces in filename not getting loaded 2013-04-12 04:36:28 +02:00
Marc Zinnschlag
5bfa691f14 Merge branch 'script' 2013-04-11 10:50:46 +02:00
Marc Zinnschlag
6d3a2cd5a0 added comment token (for use in syntax colouring) 2013-04-11 10:50:22 +02:00
Chris Robinson
d26ffe9de0 Move a method to the Node class 2013-04-10 23:19:47 -07:00
Chris Robinson
62e0abd945 Move the mesh loader to its own source file 2013-04-10 22:38:46 -07:00
Chris Robinson
75489b1e9d Move NIFMaterialLoader to a separate file 2013-04-10 20:24:44 -07:00
Chris Robinson
3970407772 Use actual classes for properties 2013-04-10 20:22:13 -07:00
Chris Robinson
caff28e20a Move NIFSkeletonLoader to a separate file 2013-04-10 19:58:17 -07:00
Marc Zinnschlag
74145410f2 basic syntax highlighting in script subview 2013-04-10 22:49:22 +02:00
Chris Robinson
6c6750342c Specified particle size is actually the radius 2013-04-10 13:37:20 -07:00
Chris Robinson
9d29921913 Merge remote-tracking branch 'zini/master' into nifogre 2013-04-09 15:12:19 -07:00
Marc Zinnschlag
ec6dff38b1 added basic spell table 2013-04-09 11:40:36 +02:00
Chris Robinson
973fdeb2e0 Improve particle system placement when no emitters are specified 2013-04-08 15:21:28 -07:00
Chris Robinson
e7c0f2a211 Minor cleanup to loading texture UV coords 2013-04-08 14:54:13 -07:00
Chris Robinson
01a1a0b846 Merge remote-tracking branch 'zini/master' into nifogre 
Conflicts:
	components/nifogre/ogrenifloader.cpp
 2013-04-08 11:46:57 -07:00
Marc Zinnschlag
85e5bd212b Merge remote-tracking branch 'scrawl/master' 2013-04-08 20:05:52 +02:00
Chris Robinson
23097ac9dc Minor cleanup of NiMorphData 2013-04-08 09:47:03 -07:00
scrawl
343e2027af Support NIF detail maps 2013-04-08 15:17:30 +02:00
scrawl
a5c868c9f5 Create a separate vertex buffer for each UV set 2013-04-08 14:54:19 +02:00
Chris Robinson
c6c67a1bb4 Read NiGravity fields 2013-04-07 18:15:23 -07:00
Chris Robinson
3768e04a0c Merge remote-tracking branch 'zini/master' into nifogre 2013-04-07 17:24:47 -07:00
Chris Robinson
dba7308248 Recognize NiParticleRotation 2013-04-07 17:16:49 -07:00
Chris Robinson
3c633e275e Don't create a controller for empty keyframe data 2013-04-07 15:42:07 -07:00
Chris Robinson
261ea1fe5e Implement a KeyframeController 2013-04-07 14:56:23 -07:00
Chris Robinson
f69a8259e1 Update animation source controller targets 2013-04-07 13:51:04 -07:00
Chris Robinson
44a59e1b87 Fix a couple messages 2013-04-07 13:03:41 -07:00
Chris Robinson
2362e920f3 Use an unconnected object list for animation sources 
We'll want the controllers, as the plan is to use their keyframe controllers
to animate the actual skeleton used for the meshes.
 2013-04-07 12:41:27 -07:00
scrawl
f3c8cd2065 Don't buy/sell keys which are set to open a lock 2013-04-07 21:38:53 +02:00
scrawl
2d2196b0d6 Implemented levelled items 2013-04-07 21:01:02 +02:00
Marc Zinnschlag
60cc95305d added basic birthsign table 2013-04-07 20:26:39 +02:00