Commit Graph

2101 Commits (0557d45bd156844772a5be5cdc602cdf22781eb5)

Author SHA1 Message Date
cc9cii 312b7cd571 Merge branch 'master' into QtOGre
Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/pagedworldspacewidget.cpp
	apps/opencs/view/render/pagedworldspacewidget.hpp
	components/nif/niffile.hpp
	libs/openengine/bullet/physic.hpp
10 years ago
scrawl e9ed0211c9 Attempt to fix Clang warnings 10 years ago
scrawl 4b8ea25cf0 Add missing case folding for dependency filenames (Fixes #1940) 10 years ago
scrawl 7252cb63a6 Fix cppcheck issues 10 years ago
scrawl 790e0150b1 Fix global map markers being duplicated when cell is visited again 10 years ago
scrawl 6b82e3665b Remove old nifbullet test 10 years ago
scrawl 487e318ede Remove old niftool test 10 years ago
scrawl fc4f069d0f Remove old BSA tests 10 years ago
Marc Zinnschlag 850dbb55a5 improved magic effect IDs 10 years ago
scrawl 0bc840aadd Add NumericEditBox widget 10 years ago
scrawl e4c097b4f7 Fix wrong default ExpandDirection for AutoSizedButton 10 years ago
scrawl 6b65502557 Add properties for new widget classes to MyGUI plugin 10 years ago
Marc Zinnschlag 58a9176c18 preparing magic effects record for use in OpenCS 10 years ago
scrawl 1afcc7adb5 Add imported font colors from openmw.cfg to MyGUI plugin 10 years ago
scrawl 45b4304237 Store levitation/teleport enabled state in savegames (Fixes #1923) 10 years ago
Marc Zinnschlag 02247fe712 load and save sound gen records 10 years ago
Marc Zinnschlag 147bffa7dd Merge remote-tracking branch 'slothlife/msvc-warning-fix'
Conflicts:
	CMakeLists.txt
10 years ago
slothlife 35ced14e45 Fix for MSVC warnings 10 years ago
eroen 0738e862cb Make GLOBAL_CONFIG_PATH, GLOBAL_DATA_PATH configurable 10 years ago
Marc Zinnschlag 89beecad8c Merge remote-tracking branch 'scrawl/master' 10 years ago
scrawl 4d6ebfb496 Allow KeyFrameControllers on the RootCollisionNode and its children (Bug #1934) 10 years ago
scrawl 144c818b41 Throw an exception if a required Ogre plugin is not found 10 years ago
scrawl dec9ffdb6c ESM: Make sure to clear old list when a list is overwritten by another content file (Fixes #1932) 10 years ago
Sebastian Wick 41094a8641 the global config path is not always $prefix/etc, so just define the whole path in the build system 10 years ago
Sebastian Wick 2ae8158ee9 SYSCONFDIR and LinuxPath should work with different install prefixs 10 years ago
Marc Zinnschlag d1d861e1be Merge branch 'run'
Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/CMakeLists.txt
10 years ago
Marc Zinnschlag bf6150d009 allow project scope scripts 10 years ago
Marc Zinnschlag 9b7f61b4ba Merge remote-tracking branch 'scrawl/myguiplugin' 10 years ago
scrawl a413e91442 ImageButton: get texture size from MyGUI, rather than from Ogre 10 years ago
scrawl c6bcd75058 Add various custom widgets used in OpenMW to the MyGUI plugin 10 years ago
scrawl ee3b1e800c Add FontLoader and transparent BG texture to the MyGUI plugin 10 years ago
scrawl ecfc2ff5d0 Add a MyGUI plugin to register OpenMW resources, to use with MyGUI's standalone tools 10 years ago
Marc Zinnschlag 9ae9104a45 Merge branch 'openmw-32' 10 years ago
Marc Zinnschlag 14f32563e7 fixed script compiler code ordering issue 10 years ago
scrawl f3f869e99a Don't produce NaN's for 0-length controllers in NifOgre::DefaultFunction 10 years ago
Marc Zinnschlag d4c27d4ce0 Merge remote-tracking branch 'mellotanica/master' 10 years ago
Rohit Nirmal e315a72582 Remove extra semicolons at the end of some lines. 10 years ago
Marco Melletti 9b6faa2ffa wrong rearrangement fixes
misleading comments fixed
10 years ago
Marco Melletti e1393ad2df reputation sorted out 10 years ago
Marco Melletti 2e47290ed0 finished loadnpc.hpp, fixed npdt 52byte structure 10 years ago
scrawl 1c178768f5 Allow Script records with missing SCDT (precompiled code, not used anyway)
Not sure on the exact conditions, but this was missing in a plugin that I made in the TES-CS, while vanilla MW would load it just fine.
10 years ago
Marco Melletti bc7e154643 done with header files, unsure about mSkills and mReputation in
loadnpc.hpp
10 years ago
Marco Melletti 8bce460f34 loadnpc is still unfinished, bodypartcheck.cpp mFlags check fix 10 years ago
scrawl 819234cdfe Use rbegin() instead of --end() 10 years ago
scrawl 9809748eba Store NIF keys mapped by time and use lower_bound for searches 10 years ago
scrawl 0da4757ee6 Merge branch 'master' of github.com:scrawl/openmw 10 years ago
scrawl 267cf4e140 Implement ResetActors script instruction (Fixes #1859) 10 years ago
Marc Zinnschlag 2eadff54d4 Merge remote-tracking branch 'rohitnirmal/scan-build-fixes' 10 years ago
Rohit Nirmal b5eb16b663 Silence some scan-build warnings. 10 years ago
cc9cii df87859d7c Move the workaround to loadscpt.cpp as per feedback comments. 10 years ago
Marc Zinnschlag ce3d75bba2 Merge remote-tracking branch 'scrawl/master' 10 years ago
cc9cii 7ff1136d81 For compiling in Windows with MSVC. 10 years ago
scrawl 4f92044d71 Allow user-created markers on local map (Fixes #1571) 10 years ago
scrawl c2a91148f3 Implement multiple emitter nodes for NiBSPArrayController
The particles for the flame, frost and storm atronachs work correctly now.
10 years ago
scrawl 44642ae21b Fix incorrect Speed value in ESM::MagicEffect (thanks Hrnchamd) 10 years ago
Marc Zinnschlag f1f38fc786 Merge remote-tracking branch 'miroslavr/master' 11 years ago
MiroslavR 46e9ee408f Do not allow mods to change fixed effect properties in the legacy format, but allow it entirely in the new format. 11 years ago
MiroslavR 3823e36f05 Merge branch 'master' of github.com:OpenMW/openmw 11 years ago
MiroslavR d16e0c063c Enchanting, spellmaking dialog: check for flags when listing known effects 11 years ago
Arthur Moore b7852b8215 Convert niffile.cpp to use std::map instead of a custom search function.
I haven't profiled this, but it should speed things up a decent bit.
11 years ago
Arthur Moore 8be6aefd95 Moved functions from niffile.cpp to where they belong.
Also cleaned up some #includes

Removed a few asserts.  Vector already throws an out_of_range error.
11 years ago
Marc Zinnschlag 45c0be8f62 Merge remote-tracking branch 'emperorarthur/niftest' 11 years ago
Arthur Moore cdfa24e15d (Re) Wrote a tool to test NIF files in BSAs and on the filesystem.
Just give it a set of files, one file per argument, and it will make sure openmw can read them.

On linux/mac you can use "xargs --arg-file=nifs.txt ./niftest" to give it a list of files to check.
11 years ago
Marc Zinnschlag 111b55f48e Merge remote-tracking branch 'scrawl/script' 11 years ago
scrawl 174153b2da Revert "Fix member variable case problem"
This reverts commit f0354ea04c.

Fixes #759 (again)

Conflicts:
	components/compiler/lineparser.cpp
11 years ago
Marc Zinnschlag 52f6a2ec7b remote local variable access was always using variable with index 1 instead of the index specified by the access request (Fixes #1739) 11 years ago
Marc Zinnschlag 736ab76f68 limit argument error workaround to PositionCell instruction (Fixes #1732) 11 years ago
Marc Zinnschlag d024c1a93f Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl 1a8acac40a Share keyframe data in NIF resource (Fixes #908) 11 years ago
scrawl 2b407a9995 Refactor NIF cache
- Remove broken cache locking mechanism

This was supposed to unload NIFFiles after a cell transition completes, but it was never working due to a mistake on the line if (--sLockLevel), should have been if (--sLockLevel == 0). Repairing this would increase load times (NIF files would have to be reloaded more frequently), so just removed it for now.

 - Decouple cache from NIFFile (now a new nifcache component)

 - Add API for future background loading

 - Provide a reliable way (SharedPtr) to hold on to loaded NIFFiles. This will be useful to avoid deep copies of keyframe and text key data, which is currently a performance bottleneck.
11 years ago
Marc Zinnschlag 7c1b32ae62 Merge remote-tracking branch 'miroslavr/corprus' 11 years ago
Marc Zinnschlag f468c53281 renamed the script field in DebugProfile to improve consistency 11 years ago
Marc Zinnschlag 232c6c9ad3 Merge branch 'scriptedit' into run 11 years ago
MiroslavR 85aa237baf Implement removal of corprus spells 11 years ago
MiroslavR 96e7ff666d Implement saving/loading of corprus stats, remove redundant code 11 years ago
Bret Curtis feb0ef8390 fixes building on systems with kFreeBSD kernel 11 years ago
scrawl 83037a1a91 Move fast-forward of particle systems outside of OgreNifLoader (Fixes #1830)
Particle systems were being fast-forwarded before the skeleton base was attached, so particles without the LocalSpace flag would spawn at an incorrect position.
11 years ago
scrawl 360c7f863c Store magic effect Base values in savegame (Fixes #1489) 11 years ago
scrawl 2db50da8dd Implement magic effect script instructions (Feature #1489) 11 years ago
scrawl 6c6b3bd890 Remove extra setVisibilityFlags on SkelBase
SkelBase is already contained in mEntities.
11 years ago
Marc Zinnschlag 3486da0fb0 consolidated the debug profile flags into a single and added a global flag 11 years ago
scrawl 77a4e38c49 Remove -Wno-ignored-qualifiers and fix caused warnings 11 years ago
scrawl 28e61c9834 Add default values for fDifficultyMult and sDifficulty (Fixes #1742)
Also added values for some other GMSTs added in a Morrowind patch or Tribunal/BM
11 years ago
scrawl e2ee3b2497 Merge branch 'master' of https://github.com/OpenMW/openmw
Conflicts:
	apps/openmw/mwrender/terrainstorage.cpp
11 years ago
Marc Zinnschlag 40a33eb9f0 Merge remote-tracking branch 'miroslavr/master' 11 years ago
gus 5fd599b5de minor corrections 11 years ago
MiroslavR baa14511cf Use ResourceHelpers to replace DDS hacks scattered throughout the code, fix prefix comparision 11 years ago
scrawl 28fe81df90 Make Lights with OffDefault flag not emit light nor particles when placed in a cell (Fixes #1796) 11 years ago
MiroslavR 4d403ed747 Rename and move functions for texture path correction 11 years ago
scrawl 4138c3e966 Reuse health of previous level rather than recalculating initial health (Fixes #1787) 11 years ago
Marc Zinnschlag ee3acc31a8 minor correction to previous commit 11 years ago
cc9cii c43bd3c345 Continue loading esm after detecting string table overflow condition. Should resolve bug #1774. 11 years ago
MiroslavR 4873c4bd31 Generalize function for texture path correction (Fixes #1779) 11 years ago
scrawl 8c26f802e6 Move terrain grid implementation to a component so the editor can use it (Feature #1597) 11 years ago
scrawl 982453d4f6 Move ESM terrain data handler to esmterrain component so it can be used by the editor (Feature #1597) 11 years ago
scrawl 22d7d8a466 Implement Command creature/humanoid magic effects (Fixes #1120) 11 years ago
scrawl 2e7b5fde7c Fix uninitialized QuestStatus in DialInfo (Fixes #1694) 11 years ago
Marc Zinnschlag f4ddf2a7b9 Merge remote-tracking branch 'sandstranger/android' 11 years ago
root 32ebc90ba4 fix v9 11 years ago
root 713787d92f fix v7 11 years ago
root 8978f9bcc6 fix v6 11 years ago
root 3cd98e5259 fix code v5 10 years ago
root e27ca878a1 fixed v 4 11 years ago
root 174b528082 fixe v 3 11 years ago
root d8772156a7 fixe all code v 2 11 years ago
root 8a8b91dfe1 fixed all code for building on all platforms inlcudng ANDROID 10 years ago
root 7cd2d4809c android-build 11 years ago
Marc Zinnschlag 33c36bf0df Merge remote-tracking branch 'scrawl/master' 11 years ago
Marc Zinnschlag 30f114873d added debug profile record 11 years ago
Digmaster a32ab842ae Added ForceJump/ForceMoveJump commands 11 years ago
Marc Zinnschlag 1e6d557089 Merge branch 'visibility' 11 years ago
Marc Zinnschlag a25758c3b1 fixed visibility flags setting 11 years ago
scrawl 0c1c468f70 Accept a useless extra integer argument for addItem (Fixes #1726) 11 years ago
scrawl 45af34d189 Merge branch 'master' of https://github.com/OpenMW/openmw 11 years ago
scrawl 543bb22e8f Implement collision script instructions (Fixes #1111) 11 years ago
scrawl ccde462308 Fix typo (RefId -> RefNum) 11 years ago
scrawl 7dfb624ee2 Support loading text keys for objects without a skeleton
This means we can no longer map them to bone IDs, but they are unused anyway.

Required to load text keys from the default head models (such as Talk: Start/Stop and Blink: Start/Stop)
11 years ago
bogglez c006393178 Fix http://bugs.openmw.org/issues/768
Changes application_name in configuration manager to OpenMW instead of
openmw, if on windows. This shouldn't break anything since Windows uses
case-insensitive filesystems. Strictly speaking the installation
directory must be OpenMW now though (not sure whether this is the case)
11 years ago
scrawl 4773d754c6 Remove redundant isHostile flag (Fixes #1652) 11 years ago
Marc Zinnschlag 7991dfb907 Merge remote-tracking branch 'scrawl/master' 11 years ago
Marc Zinnschlag c9cd7fb6b7 Merge branch 'scripts' 11 years ago
Marc Zinnschlag ad50b926f5 reducing some stray arguments again 11 years ago
Marc Zinnschlag 17bd094afd allow a few more stray arguments 11 years ago
Marc Zinnschlag 2abc4e42c8 end parsing of line after parsing a declaration 11 years ago
scrawl 1a04501951 Handle faction save/load properly when player has faction reputation in a faction he is not a member of (Fixes #1573) 11 years ago
Marc Zinnschlag 6a745c014f workaround for incorrect argument order for PositionCell instruction 11 years ago
Marc Zinnschlag acb728195f improved documentation of ESM::Script member variables 11 years ago
Marc Zinnschlag 2e355df8b3 removed function ScriptManager::getLocalIndex (was redundant and was also depending on precompiled scripts) 11 years ago
scrawl 75abe8db31 Ignore FLTV from old savegames 11 years ago
scrawl d4ff17f1c5 Remove unused FLTV and NAM0 from CellRef 11 years ago
scrawl 4e0c133fb3 Add comment to Cell NAM0 (it's a RefId counter) 11 years ago
scrawl 75366b2e37 Implement CellRef's faction rank (rank requirement to use item) 11 years ago
Marc Zinnschlag 19f4c46fe4 alllow (and ignore) explicit references for StopScript and ScriptRunning 11 years ago
Marc Zinnschlag aa8c0bccb4 added new argument type: z (optional, any) 11 years ago
scrawl 2b57c7fa67 Use CellRef's global variable to disable owner (Fixes #1677) 11 years ago
gus 2092e5fe22 compile fixes 11 years ago
Marc Zinnschlag 11a2c767cc some argument parsing cleanup 11 years ago
scrawl 1320ac6983 Ensure non-negative particle life time, add size assertion 11 years ago
Marc Zinnschlag e33ee52b91 make stray names in the begin line a warning instead of an error 11 years ago
scrawl 192d5ca08f Allow overriding OGRE_PLUGIN_DIR in cmake command line 11 years ago
scrawl 4d39d77eaa Fix incompatible encoding names in ContentModel (bug uncovered by 41c17bccb6) 11 years ago
scrawl 2a510573b8 Remove unused implementation file 11 years ago
scrawl 41c17bccb6 Exit if an unknown encoding option is specified 11 years ago
scrawl 876af8f529 Fix not saved Attacked flag (Fixes #1657) 11 years ago
Marc Zinnschlag 8952154488 inherit target ID when starting a script from another script 11 years ago
Marc Zinnschlag 27c84d6cb7 the reference for a targeted script is now determined when needed instead of at the start of the script execution 11 years ago
Marc Zinnschlag 35b27ea8cb ignore stray string argument after GetDisabled 11 years ago
Marc Zinnschlag e8322da663 added support for targeted scripts to script compiler 11 years ago
Marc Zinnschlag 75ab8de3d2 added opcode for running scripts with explicit references (targeted scripts) 11 years ago
Marc Zinnschlag e9377ad5c4 include targeted script data in saved games 11 years ago
Marc Zinnschlag 563c2e5730 be a bit more relaxed about allowing - in names (Fixes #1593) 11 years ago
scrawl 41d73377b0 Use explicit C locale in Misc::StringUtils (Fixes #1216) 11 years ago
scrawl 1c41ce9b9d Implement Hrnchamd's player and NPC autocalc spells (Some unclarities remaining, XXX) 11 years ago
scrawl ad90d20ad8 Don't silently skip unknown NPC subrecords 11 years ago
Marc Zinnschlag 1ce60fa13b Merge branch 'tables' 11 years ago
Marc Zinnschlag d96ed38d49 added body part table 11 years ago
Marc Zinnschlag e97fd35ae6 added enchantments table 11 years ago
scrawl 2506c16bf5 Add a dummy GetStat function returning 0 (Fixes #1589) 11 years ago
scrawl e25fa6c157 Refactor non-distant land terrain path to a grid based implementation (Fixes #1562) 11 years ago
scrawl 4949aa1fbb Add hack required for unnamed animated collision shapes (in_dagoth_bridge00.nif) 11 years ago
scrawl 1ab02d8072 Fix exception for box shapes (Fixes #1580) 11 years ago
scrawl 7b1e1d03d8 Merge branch 'master' of https://github.com/OpenMW/openmw
Conflicts:
	apps/openmw/mwrender/sky.hpp
11 years ago
scrawl 2bcbc6ab7d Potential crash fix, either way should have a better error message now 11 years ago
Marc Zinnschlag 85965bfd47 Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl ee098de0a6 Don't ignore lighting values of particles not attached to a character 11 years ago
scrawl b259c5def2 Make GetFactionReaction garbage argument optional 11 years ago
scrawl 8a8ecce1e5 Fix some uninitialized data written to savegames 11 years ago
scrawl e274314548 Ignore alpha modifier for particle materials
This makes the tx_ash_flake.dds particles from ashcloud.nif appear.
11 years ago
scrawl b52977e44c Add dummy Face implementation for now (Bug #1541) 11 years ago
scrawl 30be59c029 Implement auto-adjusting of particle emit rate
This makes ashcloud.nif and blightcloud.nif work properly.
11 years ago
scrawl 750d8b5589 Allow garbage integer argument for addSpell (Fixes #1539) 11 years ago
scrawl 0b34d8d2fd Add support for animated collision shapes (Fixes #1549) 11 years ago
slothlife 9ea22324f7 Fix some MSVC warnings.
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
11 years ago
scrawl 0bed6d9d56 Physics: Recognize BBoxCollision flag, but don't use it for raycasting (Fixes #1349) 11 years ago
scrawl e002acdeae Physics: Create actor shapes outside of BulletNifLoader
This will allow to create a specialised shape instead, such as a capsule, which tends to work better for character controllers.
11 years ago
scrawl 7bf7daa846 Fix exception (getline will trigger failbit on the last line) 11 years ago
scrawl 9a26cf22e6 Implement toggleMenus 11 years ago
scrawl 218f916d6d Savegame: Don't write stat modifiers that are zero 11 years ago
scrawl c69a311ad8 Disable lighting for particles
Fixes magic cast visuals being too dark depending on the environment.
11 years ago
scrawl 4e71db7081 Savegame: Don't load/save deleted container items. This is currently pointless, and also causes new garbage being added on each load/save cycle: Container stores are first filled from ESM records, then cleared and filled from the savegame. The items from ESM records remain as deleted refs. 11 years ago
scrawl 5645c9185b Fix location of local data path 11 years ago
scrawl 1dc9e151cb Count werewolf kills (Fixes #1525) 11 years ago
scrawl 2477456f99 Implement Murder crimes and OnMurder instruction (Fixes #1315) 11 years ago
scrawl ec66484472 Fix forceGreeting with explicit references (Fixes #1518) 11 years ago
scrawl d5b97005ab Make ESM::Faction skills optional (Fixes #1508)
Also increased size of mSkills array to 7. Some factions with 7 skills can be found in the vanilla CS. The previously "mUnknown" int appears to be the 7th element of the skills array.
11 years ago
scrawl ee2b81763e Savegame: Store AiSettings and summoned creatures
CreatureStats state is now completely stored (Closes #1174)

Also play VFX_Summon_Start and VFX_Summon_End visual effects.
11 years ago
scrawl fd59a4a79e Fix some doxygen typos 11 years ago
scrawl 77388fe2ce Implement BetaComment instruction (dumps reference info) 11 years ago
Marc Zinnschlag c8c45d4923 Merge remote-tracking branch 'lgro/valgrind_fixes' 11 years ago
Lukasz Gromanowski abeb1d4ab3 Valgrind: Added constructor for KeyListT class, and added initialziation of ver member field in NIFFile class.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
scrawl 4f742fd468 Allow INFO records with no subrecords following DATA (Fixes #1486) 11 years ago
scrawl e458cf1df2 Savegame: Store death counter (Fixes #1477) 11 years ago
scrawl a54ac579a5 Savegame: Store AiSequence 11 years ago
scrawl b158919c4b Fix uninitialized variable use 11 years ago
scrawl 029e438c11 Don't check mInterpolationType each iteration 11 years ago
scrawl 73be457805 Merge ESM::Cell fields by subrecord
Fixes an issue with the Morrowind Patched mod where cell ambient values would become black due to the new cell records not including an AMBI subrecord.

Also fixes a bug where mLeasedRefs was incorrectly cleared when overwriting a cell (*oldcell = *cell;)
11 years ago
scrawl 47172fb8a2 ContentModel: Don't confuse file path with file name (Fixes #1352) 11 years ago
scrawl 3788fb042e Implement MenuTest script instruction (Fixes #1454) 11 years ago
scrawl 2dd54dbcfc Implement ClearInfoActor script instruction (Fixes #1422) 11 years ago
scrawl 98d7b6672a Make MODL subrecord optional for potions (Fixes #1419) 11 years ago
scrawl 823ccb1b3d Don't batch statics that have "references persist" set (temporary fix for Arkngthand door - Fixes #1386) 11 years ago
scrawl a0bff03560 Fix not handling failbit/badbit in ifstream (Bug #1355) 11 years ago
Arthur Moore f9f278f645 Fixed a capitalization error.
Changed Interpolations to unsigned.
Also explained what's happening in the comments.
11 years ago
Arthur Moore b90e4db871 Actually read in XYZ_ROTATION_KEY data instead of discarding it. 11 years ago
dreamer-dead e772bb88da Remove RTTI usage in NIF reader. 11 years ago
Marc Zinnschlag 5313862a46 Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl 7376cb9b61 Fix loading ESX files cleaned with testool (Fixes #1382) 11 years ago
scrawl ce14a6413b Small optimization to ESM::Variant 11 years ago
scrawl 577ed3943b Show wallpaper when loading a savegame 11 years ago
Arthur Moore 576c06d791 Fix Bug #1371
Not properly reading in the NIF file's QuaternionKeyList.
11 years ago
scrawl c018319940 Addition to 7c9c0830a96: don't create useless BaseWhite clones 11 years ago
scrawl 7c9c0830a9 Fix errors due to BaseWhite material being removed 11 years ago
scrawl 16ac6e7aac Merge DialInfo objects by subrecord instead of overwriting the object
Fixes #1360
11 years ago
Marc Zinnschlag ecf3d52b46 Merge remote-tracking branch 'cc9cii/crash-fix-cg-shader' 11 years ago
Marc Zinnschlag f5e587f566 Merge remote-tracking branch 'puppykevin/master' 11 years ago
cc9cii 11ce093a9e Fix crashes caused when terrain materials don't get created (e.g. due to cg shader bug on Windows/D3D9). Should resolve Bug #1284. 11 years ago
Marc Zinnschlag be7f344eca Merge branch 'refs'
Conflicts:
	apps/opencs/model/doc/savingstate.cpp
	components/esm/cellref.hpp
11 years ago
Marc Zinnschlag be88168e91 Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl 50a72ed710 Fix ghosts in Cavern Of The Incarnate having -1 health 11 years ago
pvdk 38d825b004 Merge remote-tracking branch 'upstream/master' into wizard
Conflicts:
	CMakeLists.txt
	apps/launcher/maindialog.cpp
11 years ago
Kevin Poitra 18314b1707 We use spaces, not tabs. 11 years ago
Kevin Poitra 8e55eb8009 Fix some formatting. 11 years ago
Kevin Poitra 545c3c312c Remove a superfluous clear. 11 years ago
Marc Zinnschlag f112c78858 Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl e68600eda2 Make Activate instruction work properly even when onActivate was not called in the same frame.
There are two major differences to the old implementation:
 - Activate can now be called on its own, e.g. in the console. In Vanilla this appears to be a no-op, so it is unlikely to be used and the potential for breakage is low.
 - The Action to execute is now determined when Activate is called, not when OnActivate is called. This however makes sense, since there may be a time difference between the two, and the object (or the player) could have changed in the meantime, requiring a different Action.

Fixes #1166 and #1346.
11 years ago
Marc Zinnschlag bb011f278e Merge remote-tracking branch 'cc9cii/master' 11 years ago
cc9cii bbe77d656a Minor fixes from static analysis. 11 years ago
Arthur Moore 50a4d175da Read NIF interpolation type 4 (XYZ_ROTATION_KEY)
Don't actually do anything with it yet, but without this the "MW Containers Animated" mod made containers inaccessible.

Partly implements Feature #1067
11 years ago
Marc Zinnschlag be39395ce7 Merge remote-tracking branch 'scrawl/master' 11 years ago
Marc Zinnschlag 12fc0aaecb removed an unused parser settings (implicitly fixing a case were this setting was not applied correctly) 11 years ago
scrawl 3e2eed9269 Implement getFactionReaction function
Strange bug when using value != 0 for the garbage argument?
11 years ago
scrawl e266c39c5d Implement modFactionReaction instruction (Closes #1347) 11 years ago
scrawl 0966755a0c Store death animation index in CreatureStats 11 years ago
scrawl 3cd835e61a Fix bsa file loading not being case insensitive (Fixes #1178) 11 years ago
scrawl 039398c8ae Basic RefData and CellRef change tracking
Wrapped item charge handling in getItemHealth function
11 years ago
scrawl b47b2b84f3 Merge branch 'master' of https://github.com/OpenMW/openmw
Conflicts:
	apps/openmw/mwdialogue/filter.cpp
	apps/openmw/mwgui/waitdialog.cpp
11 years ago
Marc Zinnschlag 244eb11651 Merge remote-tracking branch 'greye/widechar' 11 years ago
scrawl e51300989c Handle NiBSPArrayController as alias for NiParticleSystemController
The differences (if any) are unknown.

NiBSPArrayController is used by the Atronach_Fire.nif model. Its particles are now visible, but they don't look right yet. Need to handle NiAutoNormalParticlesData?
11 years ago
greye 663d5c314e be more verbose on change reasons 11 years ago
greye 4346e3b4d0 try to load plugins from relative paths 11 years ago
Marc Zinnschlag d8440e1fdc implemented reference record merging 11 years ago
greye 444a07c01b workaround OgreLog Unicode path handling 11 years ago
greye 493f8c6050 fix opening BSA on Unicode path 11 years ago
greye 417e07fbce fix irrelevant error reporting 11 years ago
greye 6cb795ef7d attempt to fix LowLevelFile, minor code reuse 11 years ago
greye 2c82da8e6e load Ogre::ConfigFile from DataStream 11 years ago
scrawl 3dceb7ee4f Fix overwriting DialInfo 11 years ago
scrawl 0aa1042fd7 Optimized dialogue merging with a lookup map 11 years ago
scrawl 1677fcf324 Dialogue merging 11 years ago
scrawl 5b76c0893a Merge branch 'master' of https://github.com/OpenMW/openmw
Conflicts:
	components/esm/inventorystate.hpp
11 years ago