Commit Graph

18388 Commits (1d84cbe96351b9cd00c5ea0fadf71e7a5b1a796b)
 

Author SHA1 Message Date
David Cernat d528a0edb5 Merge pull request #147 from OpenMW/master
Add OpenMW commits up to 11 Feb 2017
8 years ago
scrawl 03a10f217a Catch exceptions in AiSequence::execute 8 years ago
scrawl 5a12407436 Revert "Rearranged check for better performance"
This reverts commit 332ceb51a2.
8 years ago
scrawl f2d4f290cc traceDown fix 8 years ago
scrawl ec5587ddd3 Merge pull request #1200 from Allofich/fix
Fix trying to access stats on non-actors
8 years ago
Allofich e047679595 Fix trying to access stats on non-actors 8 years ago
David Cernat 6763718412 Merge pull request #146 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwmechanics/actors.cpp
8 years ago
scrawl bef29fc717 Merge pull request #1199 from ace13/ci-update
Update Bullet to 2.86 for Windows
8 years ago
Alexander "Ace" Olofsson cda83559aa Update Bullet to 2.86 8 years ago
scrawl 332ceb51a2 Rearranged check for better performance 8 years ago
scrawl 8752ae9c6a Fix include 8 years ago
scrawl bbcba57495 Disable hitAttemptActorId saving code for now 8 years ago
scrawl 2ea0db1d1a Merge pull request #1198 from Allofich/combat
Make combat engagement logic more like vanilla
8 years ago
scrawl dd54887783 Fix node mask of CharacterPreview being reset 8 years ago
scrawl 6ecc008813 Fix an issue uncovered by the last commit related to changing actor position without properly moving the actor 8 years ago
scrawl cf7b0098ed Slightly increase backoff value 8 years ago
scrawl b3d5c2bd7f Use the actor's collision shape in findGround()
The cylinder base is no longer appropriate as of the change to capsules.

This also works around a bug when tracing a small cylinder/box shape apparently introduced with bullet 2.86.
8 years ago
David Cernat f02840d638 [Client] Fix log messages when sending ID_CONTAINER 8 years ago
David Cernat ae23c6d6a5 Merge pull request #145 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
8 years ago
scrawl 67e4a7e37b Change some osg::clone's to direct copy constructor to avoid dynamic_cast overhead 8 years ago
scrawl 93c582064e Remove item shadows for equipped weapon/spell indicators 8 years ago
scrawl 3f3d00ffc9 Add CellPreloader::clear to avoid potential dangling CellStore pointer and to more aggressively clear preload state from a previous game 8 years ago
scrawl 0be86f69bc Write the player object first to increase the chance of preloading the player cells in time 8 years ago
scrawl 1d8a9ff622 Preload player cell as soon as the player is read from the savegame
Giving the worker thread something to do while the rest of the savegame is parsed.
8 years ago
scrawl d141b98f0c Add base animations to preloadCommonAssets 8 years ago
scrawl 066aa2e60e Always run preloadCommonAssets even when the menu is skipped
Move to before the content files are loaded so we can do preloading in parallel with content file loading
8 years ago
scrawl 839928e210 Fix light data being reset for the wrong light 8 years ago
scrawl c68f662c9a Predict player movement when preloading cells to better handle moving at high speed 8 years ago
scrawl a46593fa74 Add PreloadItem::abort() to avoid no longer required cells from blocking the work thread 8 years ago
scrawl d62c4259bd CellPreloader: load the terrain first to match the order in the main thread 8 years ago
scrawl d3e1dbe920 Fix race conditions in terrain loader caused by static variables 8 years ago
scrawl d1e86d22ca Check which local map textures actually need to be updated
On a typical exterior cell transition, we'll save 3 of 9 map renders. When moving back and forth between 2 cells, we can even reuse 6 of 9.
8 years ago
scrawl 4d53ab6c32 nifloader: attempt to remove redundant root node when a Skeleton is added 8 years ago
scrawl 2a42c4781e nifloader: override animflags instead of accumulating them 8 years ago
scrawl 0187f2ce4c nifloader: combine animFlags and particleFlags (Bug #2100) 8 years ago
scrawl bccfd6cef8 nifloader: handle textures with no image that are later assigned in a FlipController
As found in vurt's trees (Bug #2100)
8 years ago
scrawl 792f505b2a Fix potential crash in ShaderVisitor for textures with no image assigned 8 years ago
scrawl 43d9f3d5c7 Update bullet debug drawer even when the game is paused so the collision mesh will show instantly even when the console is up 8 years ago
scrawl 249fe9077b Handle 'tcb' command as an alias for 'tcg' 8 years ago
scrawl 45ae8d5ffa Add support for GL_AMBIENT colorMode to shaders as required by particle systems 8 years ago
scrawl 206e2bf975 Fix camera rotation not being set after save game load (regressed with 1eb3384043) 8 years ago
scrawl c00532d82d Add LightStateCache to avoid redundantly setting the same gl_Light
Normally, osg::State would do this for us (via lastAppliedAttribute), but since we're using a custom StateAttribute to apply all lights at once, we have to track ourselves.

Further reduction of GL calls in a typical scene by ~2%
8 years ago
scrawl 4d4dc1b9c1 Add specialized DisableLight state attribute for more efficient undoing of light state
Seems to reduce # of GL calls by 10-15% in a typical scene.
8 years ago
scrawl cdca9b0488 Accept bullet 283 on appveyor as well 8 years ago
scrawl dfa43af818 Update bullet dependency to 2.86 8 years ago
David Cernat b651c4deb4 [Server] In Item script functions, rename itemId into refId for clarity 8 years ago
scrawl 35bb467c7a Fix inverted setting of variable 8 years ago
David Cernat 6144ca95d8 Set version to 0.4.2 8 years ago
David Cernat 5038353792 [General] Rename BaseEvent's state into doorState & adjust related funcs 8 years ago
David Cernat e52823394c [Client] Use correct count for ID_CONTAINER when dropping items 8 years ago