Commit Graph

9026 Commits (openmw-39)

Author SHA1 Message Date
scrawl d855a13b44 Clear the resource cache from the worker thread 9 years ago
scrawl 6f9ca0f68f Add basic cell preloader class
Not properly in use yet, but seems to be working.
9 years ago
scrawl df57d4bfba Use a common base class for resource managers
Implement updateCache to delete unreferenced cached objects when they have not been referenced for a while.
9 years ago
scrawl a72af4a1a3 cout that should be cerr 9 years ago
scrawl 9e5225bb6f Do not unref a Texture's image data after applying it 9 years ago
scrawl 499beda665 Clear terrain texture cache before applying filter settings 9 years ago
scrawl 9e53e12c70 More renaming of TextureManager -> ImageManager 9 years ago
scrawl 5ee3d1698f Remove getWarningTexture in favor of getWarningImage 9 years ago
scrawl f99f403dda Rename TextureManager to ImageManager 9 years ago
scrawl 6ef848b7c5 Remove TextureManager::getTexture2D
Instead use getImage and let the caller create the Texture. Sharing of textures is then handled in post by the SharedStateManager.

This is closer to what the OSG serializer does.

Streamlines the TextureManager and will make it easier to multithread.
9 years ago
scrawl e8662bea31 Change the way that image origin is converted to OpenGL's lower-left convention
Flip the texture coordinates instead of flipping textures.

This simplifies the TextureManager (no need to worry if the caller wants flipping or not), should make it easier to generalize & multithread it.
9 years ago
scrawl 5b972ee777 Move texture filtering settings to SceneManager
Practical benefits:

- Filter settings are now applied to native OSG format models. These models do not use TextureManager::getTexture2D since the model itself specifies a Texture.
- The GUI render manager will be able to use its own separate textures, making it easier to turn off filtering for them.
9 years ago
scrawl c9a67ab423 Do not add scripts from levelled creatures twice (Bug #2806)
Do not insert objects from within a CellStore visitor
9 years ago
scrawl 8e5398d85b Add missing initializations 9 years ago
scrawl 7d647088ab Make the local map cell distance configurable 9 years ago
scrawl bd655c20fd Refactor local map updates
We don't need the delay any more because the rendering itself is part of the normal rendering traversal - so it's delayed anyway.

Don't request maps that we're not actually using (i.e. with cell grid sizes higher than the default 3, we were rendering more maps than the map window could show).
9 years ago
scrawl 300379617e Accept a const CellStore in findInteriorPositionInWorldSpace 9 years ago
scrawl 41ebf62fb1 Accept a const CellStore in getNorthVector 9 years ago
Marc Zinnschlag 11a4a31bfd Merge remote-tracking branch 'scrawl/localscripts' 9 years ago
scrawl 69c2c4fcc1 updateMergedRefs before reading MVRF tags (Fixes #3161) 9 years ago
scrawl cc3563359e Refactor local script iteration (Fixes #2806, Fixes #3108)
This should be much safer. Don't use recursion. Don't fail if mIgnore happens to be in the list twice. Don't rely on preconditions / assertions.
9 years ago
scrawl 187d2bccda Warn about adding a local script twice (Bug #2806) 9 years ago
scrawl aa9905b0eb Do not crash when the water normal map is missing (Fixes #3179) 9 years ago
scrawl 74c18f532e Fix comment 9 years ago
scrawl 5878291064 Fix the path correction for animation sources provided in NPC record (Fixes #2444) 9 years ago
scrawl b9d1d6144a Don't reveal unknown potion effects in alchemy window (Fixes #3146) 9 years ago
scrawl d3b76b7006 Don't stack Ai packages (Fixes #3101, Fixes #3080, Fixes #2697) 9 years ago
scrawl 7aeafd3bb9 Revert "Apply the AiTravel maxRange to AiEscort as well (Fixes #2697)"
This reverts commit 1f543b4d79.
9 years ago
scrawl 145756c0a1 Partly revert "Avoid directly iterating the actor map (Fixes #3173)"
Caused issues when a summoned creature is removed as part of the magic effect update.

Fixes #3178
9 years ago
scrawl 59d2de118f Avoid directly iterating the actor map (Fixes #3173) 9 years ago
scrawl 50ed061154 AiWander: reset mAllowedNodes on cell change (Fixes #3176, Fixes #3130) 9 years ago
scrawl dda4273349 Actors that start the game as dead do not float to the surface (Fixes #3177)
This has a minor bug (can you spot it?) that affects the vanilla engine as well, unfortunately not so simple to fix.
9 years ago
scrawl 832eaae27b Do not apply effects with CasterLinked flag when there is no valid caster 9 years ago
scrawl c34314ae26 When an actor dies purge all spell effects cast by that actor (Fixes #3175) 9 years ago
scrawl c403a6b113 Don't apply constant magic effects to dead actors (Fixes #3174) 9 years ago
Alexander "Ace" Olofsson 776c715ccd Move NoTraverseCallback to mwrender/util.hpp 9 years ago
scrawl aec8c38461 Move observer_ptr include where it belongs 9 years ago
scrawl fc6fe9acfb Do not crash ModVertexAlphaVisitor when there are no vertex colors 9 years ago
Tobias Kortkamp 0659687bfb Some fixes for building on FreeBSD 9 years ago
scrawl b0431833a1 Fix some defects reported by Coverity CI 9 years ago
scrawl f0971ee8ad Implement Fixme script instruction 9 years ago
scrawl ce9a18fb87 Merge pull request #879 from jordan-ayers/bugfix/1544
Improve Drop Command - Bugfix/1544
9 years ago
Jordan Ayers 5699cf7f09 Barter: Leave unsold projectiles equipped. 9 years ago
Jordan Ayers 1ff49cc637 Improve Drop command behavior. (Fixes #1544) 9 years ago
Jordan Ayers c82d9a1e87 Adjust ContainerStore / InventoryStore to allow partial unequip of items. 9 years ago
scrawl 87beb73970 Correction 9 years ago
scrawl fbf07133ea Document usage of node masks 9 years ago
scrawl 41c571d4f4 Merge branch 'master' of https://github.com/OpenMW/openmw into lighting
Conflicts:
	apps/opencs/view/render/instancemode.cpp
9 years ago
scrawl 4f2a031f4e Improve error message 9 years ago
scrawl 0b84b3c2cf Don't crash when region weather chances don't add to 100
The invalid weather ID was resulting in out-of-bounds vector access later in the code.
9 years ago
Jordan Ayers 2ce2e8a1e7 Add missing OOB slot check to InventoryStore. 9 years ago
scrawl ef1a1125e0 Fix an error in restocking logic (Fixes #3131) 9 years ago
scrawl 4e6a60672d When a spell explodes on an actor do not apply it to that actor twice (Fixes #3142) 9 years ago
scrawl 3089aeccc4 Factor out SceneUtil::addLight 9 years ago
scrawl 438b30d6f0 Move configureLight to a separate file 9 years ago
scrawl 6546c05428 Move Fallback map to components/ 9 years ago
scrawl f315a4386f Accept an implicit reference in Journal (Fixes #3135) 9 years ago
scrawl ef20962fc5 Disable fog of war rendering on the HUD map by default 9 years ago
scrawl ca4e859f61 Remove unused argument 9 years ago
scrawl 4690fd3f22 Change the local map exploration radius to better match the original engine 9 years ago
scrawl 4f8f166f69 Fix GetPcInJail to work as in the original engine 9 years ago
scrawl 190bf15887 SettingsWindow: support auto-updating of slider labels through the layout file 9 years ago
scrawl 745b29a995 Remove a debugging leftover 9 years ago
scrawl d9d6228c94 Implement PageDisplay::_updateView (Fixes #3125) 9 years ago
scrawl 5952498e9e Explicitely cast a size_t to int 9 years ago
scrawl 446c714727 Fix a possible memory leak in error case 9 years ago
scrawl e6619c5306 Rebuild actor animations on resurrection (Fixes #3124)
A new animation is necessary to set up the correct InventoryStore listener, to get notified of changes like the actor no longer being a werewolf, etc.
9 years ago
scrawl daa94cc50e Fix cppcheck warnings 9 years ago
Poncho b1020dcd42 Use correct direction multipliers during awareness check 9 years ago
scrawl 1905f0bf2d Add support for placing BodyParts in a cell (Bug #3118) 9 years ago
scrawl a9f0f30bb8 Reject conditions testing agaist Choice when not currently in a choice (Fixes #3117) 9 years ago
scrawl 0333c40047 Fix typo in SameRace dialogue function (function was inverted, Fixes #3116) 9 years ago
scrawl 6fde02ea42 LocalScripts: initialize mIter 9 years ago
scrawl 7f7e8c63bf Correct path to gamecontrollerdb.txt (Fixes #3112) 9 years ago
scrawl 63b9b075aa Do not allow soul trapping the same creature more than once (Fixes #3102) 9 years ago
scrawl 0bec6e5fbe Fix 'failed to find animation' warnings when a spell was equipped before the werewolf transformation 9 years ago
scrawl 6b67911658 Unset DrawState_Spell when becoming a werewolf 9 years ago
scrawl f052c05018 Move werewolf functions from World to MechanicsManager 9 years ago
scrawl 53334d08a2 Disable Ready Magic and Cycle Weapon/Spell hotkeys for werewolves (Fixes #3100) 9 years ago
scrawl a1e163ed20 Correct an error in the timestamp subtracting logic (Fixes #3105) 9 years ago
scrawl db7b80b503 Revert "Accept a ConstPtr in ItemPtr tooltips"
This reverts commit 41c8ec56e0.

Does not work due to code relying on getting the non-const Ptr from the widget. Further refactoring is needed.
9 years ago
scrawl 2176ac592c Call updateDialogueGlobals before dialogue starts (Fixes #3034) 9 years ago
scrawl 5ac226f519 Another collision mask fix 9 years ago
scrawl e5d9ee30f4 Add count argument to copyObjectToCell
Fixes the gold bug introduced in c9ca5bc946
9 years ago
scrawl 41c8ec56e0 Accept a ConstPtr in ItemPtr tooltips 9 years ago
scrawl 5a7bbbd508 Accept a ConstPtr in ToolTips::setFocusObject 9 years ago
scrawl 32d5dece58 Add count argument to getToolTipInfo 9 years ago
scrawl 0d4729dcd5 Use the const version of CustomData::as* 9 years ago
scrawl 16e3699739 Fix collision mask in castSphere 9 years ago
scrawl b0894ea20d Accept a ConstPtr in hasToolTip 9 years ago
scrawl 29d0f448b4 Add const version of World::getAnimation 9 years ago
scrawl 51c77c5045 Accept a ConstPtr in getDoorState 9 years ago
scrawl 7a2ca5580a Accept a ConstPtr in RippleSimulation 9 years ago
scrawl 53f4b92426 AiEscort do not follow target through doors
Testing revealed a problem where the guard on the prison ship would incorrectly follow the player outside. Upon further investigation in vanilla MW, it appears that with AiEscort the actor only follows the target through doors once the AiEscort package has completed, *and* no new AI package is running yet.
9 years ago
scrawl 2c51e7345f Use a separate collision type for doors (Fixes #1962) 9 years ago
scrawl 604b5d24e9 Use a ConstPtr in SoundManager 9 years ago
scrawl a0fb31e3b1 Accept a ConstPtr in getLOS 9 years ago
scrawl 029d467ea5 Accept a ConstPtr in getItemsOwnedBy, getContainersOwnedBy 9 years ago
scrawl 388aed1748 Accept a ConstPtr in findContainer, collision script functions, getUnderwater functions 9 years ago
scrawl ed101ad35a Remove redundant getPlayerAnimation function 9 years ago
scrawl c9ca5bc946 Accept a ConstPtr in placeObject 9 years ago
scrawl 6c505ca06f Accept a ConstPtr in getHitContact 9 years ago
scrawl 0796f49c17 Accept a ConstPtr in various physics getters 9 years ago
scrawl 795032621c Use a ConstPtr for the ActorMap and ObjectMap 9 years ago
scrawl 7a8a7e3dd6 Add const version of getAnimation 9 years ago
scrawl 7a4aac1842 Use a ConstPtr for the PtrAnimationMap 9 years ago
scrawl 553132cb51 Accept a ConstPtr in launchProjectile 9 years ago
scrawl 8f9fc87565 Accept a ConstPtr in LocalScripts::setIgnore 9 years ago
scrawl 1212c07266 Pass a string by reference 9 years ago
scrawl f35ab12979 Accept a ConstPtr in InventoryStore::isEquipped 9 years ago
scrawl 3856f931db Accept a ConstPtr in ContainerStore::addNewStack 9 years ago
scrawl e1c6261fee Accept a ConstPtr in ContainerStore::getType 9 years ago
scrawl edde5bd065 Accept a ConstPtr in ContainerStore::stacks 9 years ago
scrawl 04f7a8f8eb Remove redundant getId function 9 years ago
scrawl 266fbbef48 Accept a ConstPtr in canLock 9 years ago
scrawl c43f80633a Accept a ConstPtr in getEnchantmentPoints 9 years ago
scrawl 303521002d Accept a ConstPtr in adjustScale 9 years ago
scrawl 09bdb0ad4b Accept a ConstPtr in getServices 9 years ago
scrawl 648ee6e7fb Accept a ConstPtr in applyEnchantment 9 years ago
scrawl 3c98f8dde3 Accept a ConstPtr in isPersistent 9 years ago
scrawl 3fe3091275 Accept a ConstPtr in isEssential 9 years ago
scrawl 4a47fc32fa Accept a ConstPtr in getBloodTexture 9 years ago
scrawl 2bd8d60e9f Accept a ConstPtr in getPrimaryFaction, getPrimaryFactionRank 9 years ago
scrawl 2ac92012e8 Accept a ConstPtr in isClass 9 years ago
scrawl 5b082be79f Accept a ConstPtr in getBaseGold 9 years ago
scrawl da7ebfde99 Accept a ConstPtr in copyToCell 9 years ago
scrawl 954186fe1e Accept a ConstPtr in canFly, canSwim & canWalk 9 years ago
scrawl b09bdd6af5 Accept a ConstPtr in isBipedal 9 years ago
scrawl 92a3acfa56 Accept a ConstPtr in getBaseFightRating 9 years ago
scrawl d120f76031 Accept a ConstPtr in getSound 9 years ago
scrawl d77f785cbc Accept a ConstPtr in get*SoundId 9 years ago
scrawl dc92fefd2b Accept a ConstPtr in canBeEquipped, getEquipmentSlots & hasItemHealth 9 years ago
scrawl e0bb284804 Accept a ConstPtr in getWeight 9 years ago
scrawl 0047a2d330 Accept a ConstPtr in canSell 9 years ago
scrawl 2bc851c7d3 Accept a ConstPtr in getEnchantment 9 years ago
scrawl beb8805a12 Accept a ConstPtr in getInventoryIcon 9 years ago
scrawl f258c5c508 Accept a ConstPtr in getModel 9 years ago
scrawl d9bbd83b09 Accept a ConstPtr in getToolTipInfo
Accept a ConstPtr in functions used by getToolTipInfo
9 years ago
scrawl d3d6a69eea Merge pull request #862 from scrawl/const
ConstPtr
9 years ago
scrawl bc50587e71 Remove comment 9 years ago
scrawl b2add6470b Missing include fix 9 years ago
scrawl 1c8244276d Exception handling improvements (Bug #3090) 9 years ago
scrawl a344183247 Comment fix 9 years ago
scrawl ed3486e816 Improve const-correctness in writeAdditionalState 9 years ago
scrawl b48445dea7 Accept a ConstPtr in getScript 9 years ago
scrawl eb51e2838f Utilize the mHasCustomData flag in writeAdditionalState 9 years ago
scrawl 19d87c78f2 Add CellStore::forEachConst 9 years ago
scrawl d4eba794c3 Add ConstPtr 9 years ago
scrawl c9d02c67c0 Remove unneeded const_cast in TerrainStorage 9 years ago
scrawl 2fe2f53b02 Set the changed flag in CellStore::search (Fixes #3089) 9 years ago
scrawl 04b6571d7d Fix logic for scripting access of deleted objects 9 years ago
scrawl e564c26314 Fix deleted objects being accessible in the Cells cache 9 years ago
scrawl deb7f3caf6 Print deletion state in ObjectReferenceInfo 9 years ago
scrawl 689dea4cb3 Add instant spell effects to the actor's magic effect list
Via http://forum.openmw.org/viewtopic.php?f=2&t=3212&start=20#p36208
9 years ago
scrawl d6bcb7906d Fix crash in a warning message 9 years ago
scrawl fce43854bc Fix last commit 9 years ago
scrawl 0a723ab075 Animation: do not assume the object root is a Group 9 years ago
scrawl 31c3324705 Don't assume the emitter node is a Group (Fixes #3082)
This would be a correct assumption by default, but is no longer true when the NifLoader::optimize() function optimizes the graph.
9 years ago
scrawl 8222c78cf2 Do not filter creature dialogue by NPC-only conditions (Fixes #3086) 9 years ago
scrawl d5a2586f38 LoadingScreen: add support for important labels
Used in saveGame so the player can be sure whether or not the game was saved.

Fixes #3074
9 years ago
scrawl 67883feaae LoadingScreen: ensure values are within progress range 9 years ago
scrawl 625644e917 LoadingScreen: documentation updates 9 years ago
scrawl 152f1d625d LoadingScreen: remove unused declarations 9 years ago
scrawl ccbba5e926 LoadingScreen: remove indicateProgress, not used 9 years ago
scrawl 375caf037d Don't applyInstantEffect when magnitude is zero 9 years ago
scrawl 4af376133b Don't tick effects when duration is zero 9 years ago
scrawl 4553db7b43 Merge pull request #861 from scrawl/soundcrash
Fix crash when running out of sound sources
9 years ago
scrawl 6a749e77f2 Fix crash when running out of sound sources 9 years ago
Chris Robinson cddea4a99c Start underwater sound after updating sounds
In between the startUpdate/finishUpdate calls, changes are deferred so that
they can happen all at once. This includes starting sounds, so when the
underwater sound is started it will be immediately checked to see if it's
playing. Since it's not yet playing, it'll be seen as stopped and get cleaned
up before ever playing.
9 years ago
Marc Zinnschlag 346052a67a Merge remote-tracking branch 'scrawl/containerscript_fix' 9 years ago
scrawl 572786bff2 Instant effects that were added by a permanent ability are applied every frame
Via http://forum.openmw.org/viewtopic.php?f=2&t=3212&p=36120#p36121
9 years ago
scrawl 271fcb80c6 Remove container scripts before deleting container 9 years ago
Chris Robinson 8c364cd818 Remove left over declaration 9 years ago
Chris Robinson 12eda97e64 Merge remote-tracking branch 'main/master' 9 years ago
Chris Robinson f1faeeae3a Use separate config options for min and mag texture filters 9 years ago
scrawl 2737aabe93 Pc functions apply to creature dialogue (Fixes #3078) 9 years ago
Chris Robinson 5c0a847eaf Combine some duplicate code 9 years ago
Chris Robinson b830a413d3 Rename the texture filter options
To avoid compatibility issues with upgrading from or downgrading to older
builds.
9 years ago
Chris Robinson 646092ce3a Add warnings when loading unknown texture options 9 years ago
Chris Robinson fb6abb53ae Simplify the in-game texture options
This makes it behave like it originally did, although the config options remain
expanded.
9 years ago
Chris Robinson 76bde5ee13 Separate and expand texture filtering options 9 years ago
scrawl a7e0562e1c Fix improper handling of multiple AiFollow packages with the same target (Fixes #3077) 9 years ago
scrawl 64424e7262 Move keyframe loading out of SceneManager to new KeyframeManager 9 years ago
scrawl 359b0b3772 Rename for clarity 9 years ago
scrawl 18cce3a6f9 Don't reset delete flag when loading reference from a save game (Fixes #2724) 9 years ago
scrawl 850092a5e5 Store: be consistent about struct / class usage
Don't inherit a struct from a class, and vice versa.
9 years ago
Chris Robinson f47f0a996f Stop the object's old say sound before playing the new one 9 years ago
Chris Robinson 7fc2df153a Rename stopSound/stopStream to finishSound/finishStream
Since they're also used to clean up output resources, not just stopping.
9 years ago
scrawl cc2315a0de Minor fix 9 years ago
scrawl b856460f86 ESMStore: fill mIds in setUp() 9 years ago
scrawl ed27f0da25 Merge pull request #854 from kcat/master
Play NPC voices from the head position
9 years ago
Chris Robinson 808f701013 Use the actor's Head position for Say streams 9 years ago
Chris Robinson a47bdecac7 Add missing include
Since Ptr is used directly in the header, a forward declaration isn't good
enough.
9 years ago
Chris Robinson a00a4bce77 Avoid some unnecessary indirection 9 years ago
scrawl f1f82af64e Fix improper swimming animations in first person mode 9 years ago
scrawl 9bc6f2d5f6 Fix water ripples 9 years ago
scrawl 57b7cac13f Merge pull request #850 from MatthewRock/fix-2952-2
Fix for bug #2952: Enchantment Merchant Items reshuffled EVERY time 'barter' is clicked
9 years ago
MatthewRock ddd4004c95 Fix: remove space 9 years ago
MatthewRock 3b254ad631 Allows the same item to have multiple ancestors 9 years ago
scrawl a8c287c831 Print detected game controllers to the log file 9 years ago