Commit Graph

12768 Commits (8f5347b79b48659e3a6f9847dcedd8493a1c6c2b)

Author SHA1 Message Date
scrawl 30b549124e Fix use-after-free 9 years ago
scrawl c65492193c Use osg::clone 9 years ago
scrawl 0fbc0d0da7 Attempt to silence warning 9 years ago
Bret Curtis 0547d4b937 clang says that these must be in the MWWorld namespace 9 years ago
scrawl 8c44334409 Merge pull request #1021 from Allofich/weight
Corrections to tooltip displays of zero-weight items
9 years ago
scrawl 2f6075329b Clang warning fixes 9 years ago
Allofich a381a15b19 Make loopgroup loop correct number of times 9 years ago
Allofich 7bf04b5014 Allow showing value of zero-weight lights 9 years ago
Allofich 502a26a7ff Use getWeightString() to avoid casting to int 9 years ago
Allofich 4f5d676b4e Allow weight tooltips for gold and keys if not 0 9 years ago
Allofich caf025f93d Don't show 0 weight tooltips except for potions 9 years ago
Allofich cf7278f8ae Don't show weight tooltip for 0-weight equipment 9 years ago
Allofich ee2702087c Make zero-weight boots play light boot footsteps 9 years ago
scrawl f3f02fe154 Merge pull request #1019 from Allofich/bound
Don't allow re-casting of bound equipment spells
9 years ago
Allofich d617651307 Don't allow re-casting of bound equipment spells 9 years ago
Aesylwinn 101c3cc90d Rotate around center of selection. 9 years ago
Aesylwinn 571969cd65 Scale from center of selection. 9 years ago
MiroslavR ddbfe0c944 Fix disabled door markers appearing on the map (Fixes #3348) 9 years ago
Aesylwinn 388917df89 Base editor rotate/scale commit. 9 years ago
Allofich cb9bb92b26 Play locked sounds on locked objects instead of actors 9 years ago
Allofich 83b715734f Move part of addGlow() to addSpellCastGlow() 9 years ago
Allofich 1c76c93ed8 Use raw pointer to node in glowupdater 9 years ago
Allofich 67f31d948e Add removeTexture method 9 years ago
Allofich 4b9aff7a03 Glowupdater fix when using shaders 9 years ago
Allofich 9b2cb2fb8c Cleanups 9 years ago
Allofich 775162ccdf Rewrite spell glow implementation 9 years ago
Allofich cad41599cf Fix travis build error and warnings 9 years ago
Allofich 1910128e9c Don't remove uniform when spell glow ends 9 years ago
Allofich 35c14bb9bb Minor rewrite, make "open" spells play glow effect 9 years ago
Allofich e132b52a69 Handle spell glows within updatecallback 9 years ago
Allofich 123c626f2d Add glow when using telekinesis on doors 9 years ago
Allofich 57138b416e Fix spell glows to only run one at a time 9 years ago
Allofich 3841a8fb40 Make non-actors glow when they cast spells 9 years ago
Allofich dca7b4beb7 Make non-actors also play spell casting sounds 9 years ago
Marc Zinnschlag a563a9d336 added missing Q_OBJECT 9 years ago
Marc Zinnschlag 96fd9263bf Merge remote-tracking branch 'aesylwinn/FixNullGlobalVariable' 9 years ago
Aesylwinn 448c9d5a5b Fix globals not being initialized with a valid type. 9 years ago
scrawl 0bbd715f65 Fix the cloned StateSet not being assigned 9 years ago
scrawl 5190275b37 Merge pull request #993 from mrcheko/pathfinding
Pathfinding unification
9 years ago
Aesylwinn 0963adb2f4 Fix pointer being deleted twice. 9 years ago
scrawl 46538b9438 Merge pull request #1011 from devnexen/master
Mainly making compilable under OpenBSD.
9 years ago
mrcheko e2cd87fcc7 fix veritcal aiming 9 years ago
Marc Zinnschlag aa1ed9b172 Merge remote-tracking branch 'aesylwinn/RenderWater' 9 years ago
scrawl 7b557af885 Merge pull request #1007 from MiroslavR/save-anim-state
Save scripted animation state
9 years ago
David Carlier 83bab29e4b Mainly making compilable under OpenBSD.
Renaming one resource file as the space led to issue for qt/moc.
9 years ago
Aesylwinn 16d0580ce8 Fix struct/class mismatch. 9 years ago
Aesylwinn 1f32f1eef5 Add water texture. 9 years ago
Aesylwinn 9454f4f2e7 Use shared water geometry + state generation,
Fix water position and render bin,
Fix passed cell parameter being ignored
9 years ago
Aesylwinn 5753f52b47 Move water mesh + simple state generation to components library. 9 years ago
Aesylwinn 3904a24e6c Add missing include. 9 years ago
Aesylwinn 5674e0da24 Render water in editor. 9 years ago
LohikaarmeHAV 19c74a4d6e Part two 9 years ago
LohikaarmeHAV 7309be8592 First part 9 years ago
lohikaarme e8ef5c233f Miss info 9 years ago
lohikaarme 0592d1cdcf Commnent? 9 years ago
MiroslavR b65f379b7f Save scripted animation state (Fixes #1931, #2150, #3393) 9 years ago
lohikaarme 48bcde8cc9 ... 9 years ago
LohikaarmeHav b0cf276cfc hups 9 years ago
LohikaarmeHav 7cd991107c Nah
Preview seem to not like removing mCamPositionSet and I have do other things.
9 years ago
LohikaarmeHav c6bc30d6a8 Forgot to remove line and add comment. 9 years ago
LohikaarmeHav 2e6f80688c Removed debug 9 years ago
LohikaarmeHav c6ec473280 Camera reset now every time cell object->view is pressed. 9 years ago
scrawl 3374630e7b Merge pull request #1008 from Internecine/bug3451-invalid-enchantments
Fixes Bug 3451 - Invalid Enchantment IDs
9 years ago
Internecine 90735d226d Replaced Store::find usage with Store::search to remove exception handlers. 9 years ago
Marc Zinnschlag f32d0121fc Merge remote-tracking branch 'aesylwinn/KeyConfigAndShortcuts' 9 years ago
Internecine 14165352f6 Added exception handlers when trying to retreive enchantment and magic effect data. 9 years ago
Aesylwinn f73d60cc73 Make scene controls use configurable speed modifier. 9 years ago
Aesylwinn bf2ab4ed45 Change the way modifiers are handled so they can be shared. 9 years ago
Aesylwinn faea33b888 Revert "Change scene controls to more closely match blender as requested"
This reverts commit bc7ae70f0b.
9 years ago
Aesylwinn bc7ae70f0b Change scene controls to more closely match blender as requested
in the forums.
9 years ago
Aesylwinn 1cce085fa2 Remove unused headers. 9 years ago
Aesylwinn 2f97d6cffb Move tool tip processing to ShortcutManager,
Process cell arrow tooltip,
Fix cell arrows not being added when cell is added
9 years ago
Aesylwinn d7a83d80a2 Change some key binding defaults. 9 years ago
Aesylwinn 3475b83e90 Clean up modifier/shortcut class and handle focus out event,
Improve shortcut labels,
Adjust menu titles and remove menu navigation (can conflict with
shortcuts)
9 years ago
Aesylwinn 96a3c278fd Added shortcuts for loading a cell relative to the camera,
Removed Ctl+V binding for "Verify" because that is associated
with paste.
9 years ago
Aesylwinn 65201badf6 Add custom page for key bindings. 9 years ago
mrcheko 293a0f768c use real distance to target to determinate 'ready to attack' state 9 years ago
LohikaarmeHav f142f9bf86 wtf 9 years ago
Aesylwinn b685c0ce6c Add ability to clear shortcut/modifier setting with right click. 9 years ago
Aesylwinn 12db6d2114 Add modifier setting. 9 years ago
Marc Zinnschlag 63fd1e8df7 Merge remote-tracking branch 'origin/master' 9 years ago
Aesylwinn b204758be1 More shortcuts. 9 years ago
Aesylwinn 3f7f75cc9d Exclude keys not compatible with qt 4 9 years ago
Aesylwinn 3edc77a32b Remove QShortcut usage,
Add a lot of shortcuts,
Remove debug messages
9 years ago
Aesylwinn 08af82e1bd Switched to an interactive method for key input,
Redid text representation for shortcuts
9 years ago
AnyOldName3 20f73f4a32 Relocate escape-related code to new files escape.hpp and escape.cpp. 9 years ago
Aesylwinn 05888e7925 Updated more tool tips to show shortcut configs. 9 years ago
Aesylwinn 8c5fddf150 Fix pathgrid selection mode not being removed from toolbar. 9 years ago
Aesylwinn 051aec2729 Added methods to keep text mentioning shortcuts up to date,
fixed potential issue with widget relationship tracking,
hopefully got rid of signed/unsigned errors (Qt4/5 issue)
9 years ago
Aesylwinn f251c3867d Redesigned shortcut handler to be capable of dealing with child and
parent widgets. This should be the final design change. Also, some
various bug fixes.
9 years ago
Aesylwinn acdb636935 Qt4 protected signal workaround and signed/unsigned mismatch. 9 years ago
Aesylwinn 455d227f3c Changed shortcut design to allow a configurable second output. Also
re-added shift for temporarily changing camera speed.
9 years ago
MiroslavR 4a3529488b Fix possible reference duplication when the refID is modified by a plugin (Bug #3471) 9 years ago
MiroslavR dafe184220 Fix moved references disappearing when modified by a plugin 9 years ago
MiroslavR d790747389 Implement deletion of moved references (Bug #3471) 9 years ago
Aesylwinn 1b5273f2b7 Finally re-added rendering stats, refactored some functions
to better fit new input structure, removed unneeded shortcut
declarations in headers, and changed the cell marker
interaction to use primary/secondary select instead of
shift + primary/secondary edit.
9 years ago
AnyOldName3 59639e3988 Make it build again (but remove the new functionality). 9 years ago
Aesylwinn faa84e0a35 - Further extended usage of new shortcut class
- Refactored camera classes to take advantage of Qt's reference counting
- Removed some of the old implementation
9 years ago
Aesylwinn d8fa3fd1de Added orbit "center on selection" shortcut. 9 years ago
Aesylwinn e8626e588a Changes in shortcut design.
- Handle input in centralized class for potential conflict resolution.
- Remove wrapper class for QShortcut; it should be unnecessary.
- Added customizable shortcut usage to orbit camera mode.
9 years ago
Aesylwinn 3fa4fdb839 Remove use of c++11 feature and add some missing headers. 9 years ago
Aesylwinn 40297701d0 Base key config/shortcut implementation 9 years ago
AnyOldName3 95d2c7ea5c Attempt to unescape characters when constructing file paths, introducing compilation errors. 9 years ago
Marc Zinnschlag c17e1ca24a Merge remote-tracking branch 'anyoldname3/ignore-hash-test' 9 years ago
MiroslavR 19a8800d4d Fix camera distance not getting reset to max value (Fixes #3473) 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
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
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 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 e17e354e84 Make # only start a comment in openmw.cfg if it starts a line and introduct compilation errors 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
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
MiroslavR b0fcad4cb8 Don't stack effects for scrolls of the same type (Fixes #3466) 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
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
Allofich 4e54338ce0 Implement and use getDistanceToFacedObject() 9 years ago
Allofich 0e5c3f781f Only allow trap distance check to apply to player 9 years ago
Allofich 7de3afaa7d Cleanups 9 years ago
Allofich cb621939fd Streamline trap code 9 years ago
Allofich 35a23c3b49 Implement and use new method allowTelekinesis() 9 years ago
Allofich 8014f37879 Avoid duplicate code 9 years ago
Allofich 538209b0a2 Change variable to mRatio and initialize it 9 years ago
Allofich e25e698978 Fix telekinesis check for activators 9 years ago
MiroslavR 80f2ae0ca7 Apply magic effects while waiting/sleeping 9 years ago
MiroslavR 41484432b4 Player's death now interrupts waiting/sleeping 9 years ago
MiroslavR d4e29e3e0c Clear projectiles on non-incremental time advances 9 years ago
mrcheko 0793e4a80e refactor pathfinding code in AiWander: use AiPackage::pathTo, reuse AiPackage::ObstacleCheck 9 years ago
Allofich c1236f4113 Simplified code 9 years ago
Allofich c02695e56d Cleanups and fixes 9 years ago
Allofich 199607423b Use iMaxActivateDist for AI actors that use Activate packages 9 years ago
Allofich 64d298d2b5 Use raycast distance when player activates trapped object 9 years ago
Allofich 64d53a2314 Avoid double raycasts when using getFacedObject 9 years ago