Commit Graph

16839 Commits (61d97297673557c6e29c5ebb02a9de26f6dd7740)
 

Author SHA1 Message Date
Marc Zinnschlag 4ac5174d89 updated credits file 9 years ago
Marc Zinnschlag c17e1ca24a Merge remote-tracking branch 'anyoldname3/ignore-hash-test' 9 years ago
scrawl 9e3ed45320 Merge pull request #1003 from MiroslavR/camera-distance
Fix camera distance not getting reset to max value (Fixes #3473)
9 years ago
MiroslavR 19a8800d4d Fix camera distance not getting reset to max value (Fixes #3473) 9 years ago
scrawl 2ed813d5f3 Merge pull request #1002 from MiroslavR/nitextureeffect-crash
Fix assertion failure with NiTextureEffect missing source texture
9 years ago
MiroslavR 721fa28c1e Fix assertion failure with NiTextureEffect missing source texture 9 years ago
mrcheko 203804ff15 fix AiPackage repeating 9 years ago
mrcheko 59a1a6d117 checkWayIsClear: remove PATHFIND_CAUTION_DIST check 9 years ago
AnyOldName3 f1b5ad5804 Remove unused unsafe function and properly remove inheritance from std::string, providing implementations of missing stream operators preventing boost reading and writing to escape strings. 9 years ago
AnyOldName3 e6f78ae5b7 Switch indentation to spaces to remain consistent with the rest of the project 9 years ago
AnyOldName3 08df463c94 Separate declaration and definition of some static members to hopefully calm Travis down. 9 years ago
AnyOldName3 7475d90693 Fix dodgy include by changing backslashes to forwardslashes 9 years ago
AnyOldName3 5121e77a95 Remove the cause of a warning which upset Travis (but not the thing that made the Travis build fail, as I have no idea why it wouldn't work or how to fix it 9 years ago
mrcheko b4e94e2aae Merge remote-tracking branch 'upstream/master' into pathfinding
# Conflicts:
#	apps/openmw/mwmechanics/aipackage.cpp
#	apps/openmw/mwmechanics/aipackage.hpp
9 years ago
AnyOldName3 1a0642f1db Make it work by realising that what boost::program_options calls validation is what any sane person would regard as parsing 9 years ago
mrcheko 8d4f0660ce fix hardcoded melee attack ranges 9 years ago
AnyOldName3 195dd27780 Resolve obvious runtime error revealing more subtle one 9 years ago
scrawl cff37cdd08 Merge pull request #999 from Allofich/aifix
Trim unneeded code
9 years ago
scrawl 33ab9db9f6 Merge pull request #1000 from MiroslavR/particle-range
Fix doubled particle spawn range
9 years ago
MiroslavR 9c6739f1b3 Fix doubled particle spawn range 9 years ago
AnyOldName3 fbe6dc9704 Change compilation error to runtime exception and decide that inheriting from std::string may have been a bad idea in C++ 9 years ago
Allofich c57d177f1c Trim unneeded code 9 years ago
AnyOldName3 7697406467 Partially fix '2 overloads have similar conversions' compilation error 9 years ago
AnyOldName3 2a9b12bb3f Fix an issue preventing compilation, revealing another that doesn't make much sense. 9 years ago
AnyOldName3 c1ffc9e776 Remove a compilation error and set up framework to remove the others 9 years ago
AnyOldName3 f2456225db Merge branch 'ignore-hash-test' of https://github.com/AnyOldName3/openmw into ignore-hash-test 9 years ago
AnyOldName3 e17e354e84 Make # only start a comment in openmw.cfg if it starts a line and introduct compilation errors 9 years ago
AnyOldName3 7e0962c5ea Make # only start a comment in openmw.cfg if it starts a line and introduct compilation errors 9 years ago
scrawl 432723bfe6 Merge pull request #997 from MiroslavR/inactive-kfctrls
Do not skip inactive keyframe controllers
9 years ago
MiroslavR 2a987b6857 Do not skip inactive keyframe controllers (Bug #1942) 9 years ago
scrawl 2329812988 Merge pull request #995 from Allofich/traps
Trap and lock fixes
9 years ago
scrawl 67d3571fac Fix activation distance in third person mode 9 years ago
scrawl 9375cbea44 Make NIFFilePtr const 9 years ago
mrcheko 05794505c8 travis build fix 9 years ago
Allofich 599e6708ec Allow using keys to open trapped objects of lock level 0 9 years ago
Allofich cabe038a97 Make lockpick and probe sounds 3d positional 9 years ago
Allofich 249918612d Play trap disarm sound when key used on trapped object 9 years ago
Allofich d4e656ceaf Play trap activation sound on trapped object, not actor 9 years ago
mrcheko f57858b750 Merge remote-tracking branch 'upstream/master' into pathfinding
# Conflicts:
#	apps/openmw/mwmechanics/aiactivate.cpp
9 years ago
scrawl 251ba041f3 Merge pull request #994 from MiroslavR/no-scroll-stacking
Don't stack effects for scrolls of the same type
9 years ago
MiroslavR b0fcad4cb8 Don't stack effects for scrolls of the same type (Fixes #3466) 9 years ago
scrawl da0e20edcd Merge pull request #991 from MiroslavR/opface
Implement Face instruction (Feature #1424)
9 years ago
MiroslavR 75a66ced20 Fix actors lacking turning animations while in first person mode 9 years ago
mrcheko d2fe6fe857 Merge remote-tracking branch 'refs/remotes/origin/master' into pathfinding
# Conflicts:
#	apps/openmw/mwmechanics/aiactivate.cpp
#	apps/openmw/mwmechanics/aicombat.cpp
#	apps/openmw/mwmechanics/aicombat.hpp
#	apps/openmw/mwmechanics/aifollow.cpp
#	apps/openmw/mwmechanics/aipackage.cpp
#	apps/openmw/mwmechanics/aipackage.hpp
#	apps/openmw/mwmechanics/aiwander.cpp
#	apps/openmw/mwmechanics/aiwander.hpp
9 years ago
scrawl c842d4976e Merge pull request #992 from MiroslavR/msgformat
Improve format specifiers for message boxes
9 years ago
MiroslavR f6f3f71db5 Improve format specifiers for message boxes 9 years ago
MiroslavR dc0bc5b68c Implement Face instruction (Feature #1424) 9 years ago
scrawl 6f376bd499 Merge pull request #983 from Allofich/telekinesis
Don't allow telekinesis on actors or teleport doors
9 years ago
Allofich 7a0f9a7989 Clean up, remove unnecessary code changes 9 years ago
Allofich 53ceefa46a Allow some telekinesis on teleport doors 9 years ago