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.
8 years ago
David Cernat
436548413e
Resolve conflicts in pull request #39
...
# Conflicts:
# CMakeLists.txt
8 years ago
Marc Zinnschlag
2fef8948f1
Merge remote-tracking branch 'aesylwinn/InstanceRotateAndScale'
8 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
Aesylwinn
5eaaed05fc
Improve mouse pick culling.
9 years ago
Aesylwinn
18897348d7
Fix weapon values not being properly set in editor.
9 years ago
Aesylwinn
774e1497b6
Fix editor undo for nested data.
9 years ago
Aesylwinn
6199663bd8
Fix data corruption issues.
...
- Point connection count not being set
- Nested undo not restoring table (for pathgrid scene editing, editor
nested undo is still broken)
9 years ago
Aesylwinn
799ed300ea
Use cell coordinates class, fix undo description.
9 years ago
scrawl
703dba902b
Set the shader path in OpenCS
9 years ago
Aesylwinn
b86250036c
Add ability to add pathgrids.
9 years ago
Aesylwinn
1781aaaa27
Drag indicator.
9 years ago
Aesylwinn
e8e915bcde
Share selection functionality with instance editing mode.
9 years ago
Aesylwinn
ae0d2c3b9c
Refactor edit mode. Remove essentially duplicate function.
9 years ago
Aesylwinn
13c2161b27
Fix memory leak, remove empty if statement, change dynamic_cast
...
to static_cast
9 years ago
Aesylwinn
5a7ebab694
Fix forward declaration.
9 years ago
Aesylwinn
9d02286592
Remove unused forward declaration.
9 years ago
Aesylwinn
a3363bc098
Fix and simplify pathgrid update handling, only recreate geometry
...
once per frame, and a few naming changes.
9 years ago
Aesylwinn
d2d22e2f23
Clamp node positions in exterior cells.
9 years ago
Aesylwinn
cd3b96b3e8
Change interaction mask back to original and place required masks in
...
PathgridMode.
9 years ago
Aesylwinn
aea2380c2b
Add raytrace to dragCompleted. Implement node drag connection,
...
node and edge removal, and some fixes.
9 years ago
Aesylwinn
6fbc10dbba
Add ability to get cell, pathgrid, and ability to add nodes.
...
Also missing include.
9 years ago
Aesylwinn
9f7c8d559c
Add focus requirement for context menu.
9 years ago
Aesylwinn
f0bbe2c633
Add context menu for pathgrid editor.
9 years ago
Aesylwinn
8b6cb73369
Add ability to invert selection.
9 years ago
Aesylwinn
55656d68ef
Cleanup, put duplicated code in function
9 years ago
Aesylwinn
da6a742beb
Add control description to tooltip.
9 years ago
Aesylwinn
f8b43b2a64
Rename cryptic variables.
9 years ago
Aesylwinn
32ba5bf8b8
Initial pathgrid editting, support for selection and movement.
9 years ago
Aesylwinn
9645d0cc8a
Pass more mouse pick information in scene view editor.
9 years ago
Marc Zinnschlag
64fdc5a21a
Merge remote-tracking branch 'rcutmore/bug-3331'
9 years ago
scrawl
a7e6219091
Merge pull request #939 from kpp/rewrite_esm_name_t
...
Rewrite ESM::NAME_T
9 years ago
Rob Cutmore
547d783eac
Editor: Remove overridden configureCreateCommand
...
StartScriptCreator was incorrectly overriding configureCreateCommand.
This caused issues trying to edit an uneditable column while adding a
new record.
9 years ago
Rob Cutmore
e6863c8f79
Editor: Undo editable column check in record add
9 years ago
Marc Zinnschlag
b4e341e1e2
Merge remote-tracking branch 'aesylwinn/RenderPathgrid'
9 years ago
Roman Proskuryakov
d5dfa89060
Rewrite NAME_T into FIXED_STRING.
9 years ago
Rob Cutmore
307f04f827
Editor: Fix issue adding start script (Bug #3331 )
...
Updated to verify column is editable when adding a new record.
9 years ago
Aesylwinn
14ae232938
Remove now unnecessary factory class.
...
It was originally used for storing normals, but that functionality
was removed.
9 years ago
Aesylwinn
1f902ff069
Remove code duplication.
9 years ago
Rob Cutmore
b129ff9672
Editor: Add PathgridCreator to find duplicate IDs
9 years ago
Rob Cutmore
c9ada852aa
Undo including pathgrids in ID check
9 years ago
Aesylwinn
642b1d0273
Add mask.
9 years ago
Aesylwinn
8d95b63180
Add pathgrid rendering to opencs
9 years ago
Aesylwinn
7fbcc47b15
Add pathgrid modified signals.
9 years ago
Aesylwinn
933504dbd0
Revert "Pathgrid rendering v2"
...
This reverts commit 4dee9604bb
.
9 years ago
Rob Cutmore
5580f803fd
Editor: Prevent duplicate pathgrids (Bug #3342 )
9 years ago
Aesylwinn
4dee9604bb
Pathgrid rendering v2
9 years ago
Marc Zinnschlag
091e1bf25d
improved scene element visibility buttons
9 years ago
Marc Zinnschlag
9d906a99a8
Merge remote-tracking branch 'rcutmore/bug-3286'
9 years ago
Rob Cutmore
e6ab3a4ba9
Remove unused CSVWorld::ScriptEdit::setMonoFont
9 years ago
Rob Cutmore
30493545f1
Update script editor tab width on font change
9 years ago
Rob Cutmore
25d9b77d10
Add setting for script editor tab width
9 years ago
Marc Zinnschlag
a5bc561c7d
Merge remote-tracking branch 'origin/master'
9 years ago
Rob Cutmore
a3903d374f
Update script editor tab width (Bug #3286 )
9 years ago
Bret Curtis
2c90b0b78d
fix a few spelling mistakes
9 years ago
Aesylwinn
7d89c82f08
Revert "Fix indentation."
...
This reverts commit 9a495042cc
.
9 years ago
Aesylwinn
8c35836883
Fix misnamed identifier.
9 years ago
Aesylwinn
85005626b1
Replace usage of deprecated function.
9 years ago
Aesylwinn
94d4fb0686
Add check for region weather chances to verifier.
9 years ago
Aesylwinn
9a495042cc
Fix indentation.
9 years ago
Aesylwinn
5e38fcac36
Add ability to edit region weather probabilities.
9 years ago
Marc Zinnschlag
60509875e8
Merge remote-tracking branch 'aesylwinn/editor_camera'
9 years ago
Aesylwinn
b111febfc9
Add pitch constraint for first person camera.
9 years ago
Aesylwinn
e07687ee01
Add button for camera mouse inversion in user preferences, and separate the
...
sensitivity settings for orbit and free cameras.
9 years ago
Aesylwinn
e127c691e2
Cleanup, remove some unused includes
9 years ago
Aesylwinn
ec25998b12
Cleanup, use setTraversalMask instead of setNodeMaskOverride
9 years ago
Aesylwinn
0ef7c778e0
Cleanup, isModified was a remnant of an old design and is only used in the first person camera mode.
9 years ago
Aesylwinn
6c471349f0
Add context menu for orbit camera.
9 years ago
Aesylwinn
4ef9981544
Add ability to set orbit camera center outside of class.
9 years ago
Aesylwinn
02f991c63e
Cleanup, fix comment
9 years ago
Aesylwinn
99e9017242
Cleanup, externalize mask used to pick center
9 years ago
Aesylwinn
a4cc891383
Cleanup, move setup to CameraController class
9 years ago
Aesylwinn
efa2ec21ff
Cleanup, no need to inherit and override osg::ComputeBoundsVisitor
9 years ago
Marc Zinnschlag
1bb23b6c77
Merge branch 'move'
9 years ago
Marc Zinnschlag
8f699b5d39
avoid creating move tags for instances that exist only in the currently edited content file
9 years ago
Aesylwinn
1e30891891
Broaden selection mask for getting scene bounds if nothing is found.
9 years ago
Aesylwinn
7d9dddfa38
Place camera farther away, improves preview camera placement.
9 years ago
Aesylwinn
09bce73c33
Fix starting distance not being correctly set.
9 years ago
Aesylwinn
08d055ca23
Allow setting precision of double preferences. Also increase precision of camera sensitivity.
9 years ago
Aesylwinn
35ff4ec4b1
Normalize default camera controls so that is appears as if the camera is
...
the object being moved. Also, allow mouse inversion for secondary movement.
9 years ago
Marc Zinnschlag
eba8b4a518
Merge remote-tracking branch 'rcutmore/feature-3250'
9 years ago
Aesylwinn
fbe9177f5d
Better center picking for the Orbit Camera.
9 years ago
Aesylwinn
a0fb242bf8
Slight improvement to camera placement.
9 years ago
Aesylwinn
bee8977e45
Add camera control customization options.
9 years ago
Aesylwinn
dede171886
Fix the secondary navigation method for OrbitCameraController.
9 years ago
Aesylwinn
3c83128abc
Add more customization.
9 years ago
Aesylwinn
3a676fc456
Revert "Create a visual representation of the center of the orbit camera."
...
This reverts commit 2c894acd98
.
# Conflicts:
# apps/opencs/view/render/cameracontroller.cpp
# apps/opencs/view/render/cameracontroller.hpp
9 years ago
Rob Cutmore
1b4c124fe8
Create record on Return key press (Feature #3250 )
...
Updated to create record when Return key is pressed while input has
focus. Record is only created if input has been validated (i.e. Create
button is enabled).
9 years ago
Rob Cutmore
29078619aa
Fix editor tab order when adding record
9 years ago
Marc Zinnschlag
1774f6d9bf
moved ref num assingment from instance creation to save procedure
9 years ago
Aesylwinn
342d31de76
More fixes to the orbit manipulator
9 years ago
Aesylwinn
2903271331
Correct the center position for the orbit camera controller
9 years ago
Aesylwinn
2c894acd98
Create a visual representation of the center of the orbit camera.
...
For debugging purposes.
9 years ago
Aesylwinn
c8bae38a8e
Remove trackball mode
9 years ago
Aesylwinn
7009355baf
Remove unused variable
9 years ago
Aesylwinn
4374f69a60
Reduce mouse sensitivity
9 years ago
Aesylwinn
2b72a04e7a
Update 1st person up axis ASAP.
9 years ago
Aesylwinn
999869da24
Position camera above, near, and looking at the scene.
9 years ago
Aesylwinn
fcccacc0fa
Define a constant for the World Up vector
9 years ago
pi03k
629a558e7b
Fix for bug 3248
9 years ago
Aesylwinn
59f59a3385
Fix indentation
9 years ago
Aesylwinn
08fe914ba1
Preliminary editor camera
9 years ago
Aesylwinn
2cff2cd643
Remove unnecessary override.
9 years ago
Aesylwinn
9ed2cf6581
Fix callback being skipped
9 years ago
Aesylwinn
ebdc212886
Moved selectNavigationMode to SceneWidget class, centralized camera selection.
9 years ago
Aesylwinn
9afb0e0f90
Input restructuring.
9 years ago
Aesylwinn
f4f7afb53b
Removed now unnecessary installation of event filter.
9 years ago
Aesylwinn
38059593a7
Removed workaround for OSG input handling in RenderWidget.
9 years ago
Marc Zinnschlag
d5067201d0
Merge branch 'move'
9 years ago
Marc Zinnschlag
900378a31e
changed 'not implemented' warning message for object movement
9 years ago
Marc Zinnschlag
d6b8033b46
handle cell transitions when moving objects
9 years ago
scrawl
97526284f5
Allow setting the water level of an interior cell with sky ( Fixes #3244 )
9 years ago
Marc Zinnschlag
fa9689c5e7
delay command execution until call to Object::apply has finished (avoids cutting off the branch we are sitting on)
9 years ago
Marc Zinnschlag
6a2fe564ef
Merge branch 'master' into move
9 years ago
Marc Zinnschlag
b2181fae20
safer handling of command macros
9 years ago
Marc Zinnschlag
b5005f7812
keep sub mode over mode changes
9 years ago