Commit Graph

18165 Commits (2ed9ae57393c9c15e592d48f763ced4c4718300b)
 

Author SHA1 Message Date
David Cernat 2ed9ae5739 Merge pull request #149 from OpenMW/master
Add OpenMW commits up to 14 Feb 2017
8 years ago
scrawl 183c46b0ef Fix summoning effects 8 years ago
scrawl a495b9b884 Fix wasteful allocations in Store<Land>::search 8 years ago
scrawl 72c6b11cf8 Move global map render to the worker thread 8 years ago
scrawl 026a05718f Construct the WorkQueue in Engine 8 years ago
scrawl ddd6605608 Move WNAM out of LandData to avoid redundant (de)allocations on startup 8 years ago
scrawl e00b420f68 Move saving of LandData into Land::save 8 years ago
scrawl 325bf66653 Return const Land in ESMStore 8 years ago
scrawl e295a72d43 Add align=Center to GUI dialogs (Fixes #2289) 8 years ago
David Cernat a5d7c5fd39 Merge pull request #148 from OpenMW/master
Add OpenMW commits up to 13 Feb 2017
8 years ago
Marc Zinnschlag 5c3f914ff6 updated credits file 8 years ago
Marc Zinnschlag 93c5630e02 Merge remote-tracking branch 'matahualpa/openmw-cs_tablecontents' 8 years ago
MAtahualpa 2d1af3ee4a Update record.cpp
This should be the last instance of "mSkillID". Let's see what Travis says about it...
8 years ago
scrawl 051b4038d9 Merge pull request #1203 from Allofich/magic
Make AI not go hostile when absorbing/reflecting
8 years ago
MAtahualpa c46eadae90 Update actionread.cpp
*grrr* Forgot to change the latter "mSkillID" in line 47...
8 years ago
scrawl cdf65ef681 Merge pull request #1201 from Allofich/hit
Prevent AI actors from hitting unintended targets
8 years ago
scrawl 342c25dffa Fix weather sounds playing at full volume before fading in 8 years ago
scrawl 892d1b162d nifloader: ignore nodes named 'bounding box' (Fixes #3650) 8 years ago
Allofich 72c3ee0a3d Make AI not go hostile when absorbing/reflecting 8 years ago
MAtahualpa b4ef9e2314 Update loadbook.cpp 8 years ago
MAtahualpa 5a58ab1837 Update loadbook.hpp 8 years ago
MAtahualpa 7bc65ce05b Update actionread.cpp
Code cosmetics: Change member variable "mSkillID" to "mSkillId" for Book records.
8 years ago
MAtahualpa 347fb1ff4b Update converter.hpp
Code cosmetics: Change member variable "mSkillID" to "mSkillId" for Book records.
8 years ago
MAtahualpa c5dcfe0794 Update refidadapterimp.cpp
Code cosmetics: Change member variable "mSkillID" to "mSkillId" for Book records.
8 years ago
MAtahualpa 6587880171 Update refidcollection.cpp
Makes Book records display skill IDs instead of attribute IDs for teached skills.
Related issue:
- Bug #3746: OpenMW-CS: Book records show attribute IDs instead of skill IDs for teached skills entry.
8 years ago
Allofich 6b53541571 Prevent AI actors from hitting unintended targets
(Fixes #3254)
8 years ago
scrawl 9fa8e88366 Revert "Don't create a CharacterController for objects with no animations"
This reverts commit cce42b6e9d.
8 years ago
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