Commit Graph

2716 Commits (c63be981d264d9aadfa68a2995afcc7c04cabc93)

Author SHA1 Message Date
scrawl 95a67bf0c2 Disable OSG 3.5.5 thread affinity setting in the scenewidget due to the interference with QT threads
Reference: http://forum.openscenegraph.org/viewtopic.php?t=16158
8 years ago
David Cernat add1a5e5b2 Merge pull request #72 from OpenMW/master
Add OpenMW commits up to 30 Sep
8 years ago
Marc Zinnschlag e918474a94 Merge remote-tracking branch 'rcutmore/bug-3277' 8 years ago
Rob Cutmore 8f47ed17df Show nested tables only when they are editable 8 years ago
Rob Cutmore b59694c4f0 Set tooltip for read-only nested tables 8 years ago
David Cernat 7e4543ffcb Merge pull request #64 from OpenMW/master
Add OpenMW commits up to 24 Sep
8 years ago
Aesylwinn b899d43a33 Allow base plugins to overwrite referencables made in other base plugins. 8 years ago
Rob Cutmore 829345257c Allow disabled nested tables to be scrollable 8 years ago
David Cernat 3b7693c719 Resolve conflicts in pull request #55
# Conflicts:
#	README.md
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwmechanics/combat.cpp
8 years ago
Marc Zinnschlag 48c257b939 Merge remote-tracking branch 'aesylwinn/ContentNumberFix' 8 years ago
Aesylwinn fab7549b42 Fix windows path issue in editor debug run.
- The problem was caused by spaces in the data directory
8 years ago
Aesylwinn ee432690e6 Make it easier to place objects in the scene editor.
This fix allows objects to be dropped onto the ground, and prevents
objects from being selected through the ground.
8 years ago
David Cernat 9764dbb8d2 Merge pull request #52 from OpenMW/master
Add OpenMW commits up to 2 Sep
8 years ago
Marc Zinnschlag 316cf40f12 Merge remote-tracking branch 'aesylwinn/FixInteriorCellRefTeleportation' 8 years ago
Aesylwinn c0d53a2557 Fix CellRefs being teleported from interior to exterior cells. 8 years ago
Aesylwinn b2ddd3c259 Initialize with correct content file number instead of correcting at save stage. 8 years ago
Aesylwinn 3ae2fc17c6 Fix some issues with content file numbers in the editor.
1. Change content numbers to be relative to the plugin when saving.
2. Initialize the indices in the MasterData part of a plugin header.
8 years ago
David Cernat 4d2ca20445 Resolve conflicts in pull request #43
# Conflicts:
#	README.md
8 years ago
Aesylwinn 91fd966146 Fix some issues detected by coverity for the editor. 9 years ago
David Cernat 436548413e Resolve conflicts in pull request #39
# Conflicts:
#	CMakeLists.txt
9 years ago
Marc Zinnschlag 2fef8948f1 Merge remote-tracking branch 'aesylwinn/InstanceRotateAndScale' 9 years ago
Aesylwinn 7125775648 Change free axis rotation. 9 years ago
David Cernat d9cfd5bac2 Resolve conflicts with OpenMW 9 years ago
Aesylwinn 3e4ac0c662 Potential fix for context sensitive select mode issues. 9 years ago
scrawl 2f6075329b Clang warning fixes 9 years ago
Aesylwinn 101c3cc90d Rotate around center of selection. 9 years ago
Aesylwinn 571969cd65 Scale from center of selection. 9 years ago
Aesylwinn 388917df89 Base editor rotate/scale commit. 9 years ago
Marc Zinnschlag a563a9d336 added missing Q_OBJECT 9 years ago
Aesylwinn 448c9d5a5b Fix globals not being initialized with a valid type. 9 years ago
Aesylwinn 0963adb2f4 Fix pointer being deleted twice. 9 years ago
David Cernat babba95413 Merge pull request #34 from OpenMW/master
Add OpenMW commits from 1st week of August
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 3904a24e6c Add missing include. 9 years ago
Aesylwinn 5674e0da24 Render water in editor. 9 years ago
David Cernat 8686b9cc12 Merge pull request #29 from OpenMW/master
Add OpenMW commits from end of July
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
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
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
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
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
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
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
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
Aesylwinn b4a000913c Merge remote-tracking branch 'yar/master' into Even
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwdialogue/filter.cpp
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwworld/localscripts.cpp
#	components/CMakeLists.txt
#	components/compiler/exprparser.cpp
#	components/sceneutil/workqueue.cpp
9 years ago
Koncord 1b259e2d33 Syncing inventory, animations, position, 8 key attributes
Created Package system
9 years ago
scrawl e362e3e6a5 Fix cppcheck warnings 9 years ago
scrawl b9b73d7b12 Replace "sys::default" with ESM::CellId::sDefaultWorldspace 9 years ago
Marc Zinnschlag 594444a85a Merge remote-tracking branch 'aesylwinn/MultipleDeletion' 9 years ago
Aesylwinn f6c3b44cfb Fix QTimer not being stopped in right thread 9 years ago
Aesylwinn ae50300053 Add ability to remove multiple rows in subrecords. 9 years ago
Aesylwinn 2f39a6e20d Fix camera input not being reset when focus for widget is lost. 9 years ago
Aesylwinn 7657684dad Fix mouse tracking to fix tooltip behavior. Also hide tooltips
when the mouse is moved.
9 years ago
Marc Zinnschlag b079db7913 Merge remote-tracking branch 'aesylwinn/EditPathgrid' 9 years ago
Aesylwinn 3409d8a922 Change pathgrid node movement to be visually consistent, some
renaming
9 years ago
Aesylwinn 83c86cd1be Implement context-select functionality. 9 years ago
Aesylwinn b83f522ecd Changes to color scheme, slight change to drag indicator,
change tooltip description.
9 years ago
Aesylwinn 90620081c7 Fix handling of deleted pathgrids. 9 years ago
Aesylwinn bded4f86f0 Remove connection number check 9 years ago
Aesylwinn ded8862e9d Insert nested rows after selected row, or at start if none selected. 9 years ago
Aesylwinn d0ef95a1e1 Make adjustments to pathgrid modification code. 9 years ago
Aesylwinn 564d0db68c Move pathgrid abstraction handling to save code. 9 years ago
Aesylwinn 239727531f Revert "Fix data corruption issues."
This reverts commit 6199663bd8.
9 years ago
Aesylwinn 9a567b3712 Revert "Fix editor undo for nested data."
This reverts commit 774e1497b6.
9 years ago
Aesylwinn ec90da731c Redo slight change to pathgrid editing controls, lost in revert 9 years ago
Aesylwinn bb81e89c08 Revert "Cleanup and slight change to pathgrid editing controls."
This reverts commit cc4655e9c7.
9 years ago
Aesylwinn cc4655e9c7 Cleanup and slight change to pathgrid editing controls.
Now that there is a drag indicator, it is easy to tell if an
operation is active or not.
9 years ago