Commit Graph

12250 Commits (move)

Author SHA1 Message Date
Marc Zinnschlag 01497ac8db Merge remote-tracking branch 'origin/master' 9 years ago
Marc Zinnschlag 9f14247562 Merge remote-tracking branch 'aesylwinn/topic-info-editor-improvements' 9 years ago
Aesylwinn 1ae402476d Journal verifier 9 years ago
Aesylwinn f4ed389496 InfoCondition autocompletion 9 years ago
scrawl d05603c7fe Directly apply On Target 'When Strikes' enchantments instead of launching a projectile (Fixes #3212) 9 years ago
scrawl 5cdee454ef Fix degree/radians mixup (Fixes #3213) 9 years ago
scrawl 90a99991d1 Use empty() instead of !size() 9 years ago
scrawl 8bd16e4d5a Don't compute the world matrix multiple times 9 years ago
scrawl a6621626aa Don't use multiple parent node paths in CSVRender::Object 9 years ago
scrawl 1c24cba46a Don't use multiple parental node paths. 9 years ago
scrawl c5d3e6c993 Disable preloading of levelled lists 9 years ago
Marc Zinnschlag 22e717161a split object base node into two node (one for position, one for everything else) 9 years ago
scrawl 8f81df2bd3 Cleanup 9 years ago
scrawl 0db7163363 Add specular mapping for terrain 9 years ago
scrawl f01e8a6950 Add specular mapping for objects 9 years ago
scrawl 5cf2441b10 ShaderVisitor: support automatic recognition of normal maps based on file pattern
Introduce new settings 'auto use object normal maps', 'auto use terrain normal maps', 'normal map pattern'
9 years ago
Aesylwinn 20942e6658 Fixes to testing if condition is always or never true 9 years ago
scrawl 6a0ac824bd Fix terrain error in OpenCS 9 years ago
Aesylwinn 5315866f61 Corrections to condition ranges and several other minor fixes 9 years ago
Aesylwinn 9d392487a9 Fix names to be unique and condition values to be set to 0 9 years ago
scrawl 17c4dfdb62 Use the lowest unused texture unit for the enchanted item glow texture 9 years ago
scrawl 5e12a1b4ef Add enchanted item glow to the shader 9 years ago
scrawl 268594dcf1 Recreate shader in NpcAnimation::setAlpha 9 years ago
scrawl 1232607385 Remove pointless widget names in settings layout file 9 years ago
scrawl a73512afb7 Add shader settings to settings.cfg 9 years ago
scrawl 3969675afa Remove unused settings 9 years ago
scrawl 553408949a Fix character preview 9 years ago
scrawl bd279c63f7 Fix fog on water 9 years ago
scrawl 9376811213 Vertex lighting shader 9 years ago
scrawl 044e0a829a Add fog 9 years ago
scrawl 41e1fd407d Disable shaders for the sky 9 years ago
scrawl a9ad1b09e2 Introduce ShaderManager & ShaderVisitor
Actual shaders still to be written.
9 years ago
scrawl e05d975020 Change the way that texture filtering settings are applied at runtime 9 years ago
scrawl 7f89bb273a Add 'reflect actors' setting for the water shader, default off 9 years ago
scrawl 6fb0022b35 Update preloading settings
Disable 'preload fast travel' by default.

Add 'min cache size' and 'max cache size' settings.

Split the 'cache expiry delay' into 'preload cell expiry delay' and 'cache expiry delay'.
9 years ago
Aesylwinn bdc99048bb Missing header 9 years ago
Aesylwinn 8668eccd0b Topic Info verifier with fixes to InfoSelectWrapper class 9 years ago
Aesylwinn e89609e5b0 Changes to how Info Conditions are edited 9 years ago
scrawl c4d38bb42d Fix clang analyzer warnings 9 years ago
Marc Zinnschlag dececf6c38 instance moving via drag in 3D scenes 9 years ago
Aesylwinn 3f40346636 Implemented a wrapper for DialInfo::SelectStruct 9 years ago
scrawl 647a5e091f Add osgQt to the repository
Ensures that it will be built against the correct Qt version.
9 years ago
scrawl 83a9a164bc Raise the required bullet version to 2.83
2.82 appears to have a bug that causes the player to be able to phase through certain objects (bug #1587).
9 years ago
Marc Zinnschlag dad38d901c Merge remote-tracking branch 'rcutmore/feature-3043' 9 years ago
Marc Zinnschlag 28e3fe837f Merge remote-tracking branch 'scrawl/osg_34' 9 years ago
Rob Cutmore 25744aaadd Update cell marker appearance
- Added bounding box around marker text. Box is black when cell exists
  otherwise it is red.

- Changed format of marker text.

- Changed marker text's pivot point to be at center of text.
9 years ago
Marc Zinnschlag 29c2a99316 Merge remote-tracking branch 'scrawl/physics' 9 years ago
Marc Zinnschlag d1d7804620 Merge remote-tracking branch 'origin/master' 9 years ago
scrawl eaf3f5a829 Remove unused arguments 9 years ago
scrawl 796a4a795a Avoid the 'spiral of death' 9 years ago
scrawl 383524c688 Run physics in fixed timesteps, use the remainder to interpolate between current and previous state
Based on http://gafferongames.com/game-physics/fix-your-timestep/
9 years ago
scrawl d1375cd3a3 Crashcatcher: limit backtrace to a sensible number of stack frames
When a stack overflow occurs, trying to print the whole stack would cause the process to hang indefinitely.
9 years ago
scrawl 5824619a95 Clean up includes 9 years ago
scrawl 8b596dfcbe Remove support for OSG 3.2
Since commit e8662bea31, we're using OSG functionality that contains an unfixed crash bug in version 3.2. The bug is fixed in version 3.4 (OSG commit 6351e5020371b0b72b300088a5c6772f58379b84)
9 years ago
scrawl 48ac0bef3e Repair save games affected by bug #3080 (Fixes #3160) 9 years ago
scrawl 6bfeb118d7 Fix cleanup issue 9 years ago
scrawl d3808580b0 Rename lightRoot to sceneRoot 9 years ago
scrawl fb219fea17 Fix respawning of NPCs/creatures when they were moved to a different cell 9 years ago
Marc Zinnschlag da6dcfc49e Merge remote-tracking branch 'scrawl/resource' 9 years ago
scrawl 5e876b1379 Add missing include 9 years ago
Rob Cutmore 61b6806a62 Allow toggling of cell markers 9 years ago
scrawl 9f729667fb Remove debug output 9 years ago
scrawl 0865cea211 Preload terrain 9 years ago
scrawl 596fe56bfd Make Land::loadData thread safe 9 years ago
scrawl 1457a0de78 Use the UnrefQueue to delete BulletShapeInstances 9 years ago
scrawl 3552b3a82c Don't create a BulletShapeInstance for actors 9 years ago
scrawl 246566cef4 Preload instances in BulletShapeManager 9 years ago
scrawl e28dc3e72f Preload instances in SceneManager 9 years ago
scrawl ce3cce24a5 Remove unneeded dynamic_cast 9 years ago
scrawl 8ece1885cd Animation: don't create the NodeMap if we don't need it 9 years ago
scrawl ae031b23d4 Do not detach NPC parts in destructor 9 years ago
scrawl d11c2864df Introduce UnrefQueue to handle the deleting of no longer needed objects in the background thread 9 years ago
scrawl f6f9eff9a6 Preload levelled creatures 9 years ago
scrawl 6806741d9b Add settings for disabling the individual preloading types 9 years ago
scrawl 10a3e270a3 Preload fast travel destinations 9 years ago
scrawl 1cda2bf796 Preload sky & water from the main menu 9 years ago
scrawl f9082502f8 Move construction of WorkQueue to RenderingManager 9 years ago
scrawl d16450bff2 Fix correctActorModelPath in preloader not being used 9 years ago
scrawl 1b8e82e929 Preload NPC body parts 9 years ago
scrawl 84dcf59c50 Fix preloading of equipment parts that don't separate gender 9 years ago
scrawl effe022bb2 Move preload model list to MWClass, preload NPC head/hair 9 years ago
scrawl fc0be77e4c Preload keyframes 9 years ago
scrawl ef5de94548 Fix correctActorModelPath 9 years ago
scrawl e4e313fe12 Remove outdated comment 9 years ago
scrawl c8054424c9 Preload items equipped by NPCs 9 years ago
Rob Cutmore a34a08c212 Render cell markers
Adds rendering of cell markers. Markers are displayed at center of
cell and contain cell's coordinates.
9 years ago
scrawl a81b10b415 Make the cache expiryDelay configurable 9 years ago
scrawl 5efaa9817c Add preloading settings 9 years ago
scrawl 610257cd3a Preload the exterior cell grid 9 years ago
scrawl 8592166eeb Preload surrounding cells when preloading an exterior cell destination 9 years ago
scrawl 023c87b215 Preload cell when the player goes near a teleport door. It works! 9 years ago
scrawl a7b217def2 AI: don't cast fortify effects (Fixes #3184) 9 years ago
scrawl 162287b82d AI combat actions: rename 'target' to 'enemy' 9 years ago
scrawl 94c05c6baa AI: don't cast useless resist spells (Fixes #2760) 9 years ago
scrawl d3415387a5 AI: take into account success chance when rating a spell 9 years ago
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
scrawl d12f24c321 Fix typo 9 years ago
Rob Cutmore d28e7db65c Fix tooltip spelling errors in WorldspaceWidget 9 years ago
Alexander "Ace" Olofsson b3e985fca2 Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor 9 years ago
Alexander "Ace" Olofsson 776c715ccd Move NoTraverseCallback to mwrender/util.hpp 9 years ago
Rob Cutmore d43315fe4e Add script editor line wrapping (Feature #2926)
Adds line wrapping for script editor and associated entry in settings
window. No line wrapping remains the default.
9 years ago
Rob Cutmore 4caf44f061 Remove unused code in apps/opencs/view/world/table files 9 years ago
Marc Zinnschlag 1b7a0e5d64 Merge branch 'buttons' 9 years ago
Marc Zinnschlag 1d0ef97bf6 added select all of same ID item to selection mode button menu 9 years ago
Marc Zinnschlag d5ef40aeb7 minor improvements to wording of instance selection menu items 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
Marc Zinnschlag a89859aeb7 Merge remote-tracking branch 't6/patch-freebsd' 9 years ago
Marc Zinnschlag 39e1b06101 fixed deletion of objects that are selected (was leaving a node behind) 9 years ago
Marc Zinnschlag 790367b980 fixed object removal via setting state to delete 9 years ago
Marc Zinnschlag c1f0aa7260 added delete selection item to selection mode button menu 9 years ago
Tobias Kortkamp 0659687bfb Some fixes for building on FreeBSD 9 years ago
Rob Cutmore fbca094dda Fix input validation in StartScriptCreator 9 years ago
Rob Cutmore b93b97575e Improve start script creation (Fixes #3024)
Improved start script creation by updating input to be a drop target
and adding auto-completion.
9 years ago
scrawl b0431833a1 Fix some defects reported by Coverity CI 9 years ago
scrawl f0971ee8ad Implement Fixme script instruction 9 years ago