Marc Zinnschlag
316cf40f12
Merge remote-tracking branch 'aesylwinn/FixInteriorCellRefTeleportation'
2016-09-01 11:51:34 +02:00
Aesylwinn
c0d53a2557
Fix CellRefs being teleported from interior to exterior cells.
2016-08-31 11:02:04 -04:00
Aesylwinn
b2ddd3c259
Initialize with correct content file number instead of correcting at save stage.
2016-08-30 16:42:38 -04:00
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.
2016-08-29 18:06:56 -04:00
Aesylwinn
91fd966146
Fix some issues detected by coverity for the editor.
2016-08-18 12:42:35 -04:00
Marc Zinnschlag
2fef8948f1
Merge remote-tracking branch 'aesylwinn/InstanceRotateAndScale'
2016-08-18 09:13:43 +02:00
Aesylwinn
7125775648
Change free axis rotation.
2016-08-15 15:07:43 -04:00
Aesylwinn
3e4ac0c662
Potential fix for context sensitive select mode issues.
2016-08-14 14:43:29 -04:00
scrawl
2f6075329b
Clang warning fixes
2016-08-14 15:10:50 +02:00
Aesylwinn
101c3cc90d
Rotate around center of selection.
2016-08-12 17:12:10 -04:00
Aesylwinn
571969cd65
Scale from center of selection.
2016-08-12 17:11:37 -04:00
Aesylwinn
388917df89
Base editor rotate/scale commit.
2016-08-10 19:31:34 -04:00
Marc Zinnschlag
a563a9d336
added missing Q_OBJECT
2016-08-09 10:21:37 +02:00
Aesylwinn
448c9d5a5b
Fix globals not being initialized with a valid type.
2016-08-09 00:17:41 -04:00
Aesylwinn
0963adb2f4
Fix pointer being deleted twice.
2016-08-08 14:36:50 -04:00
Aesylwinn
16d0580ce8
Fix struct/class mismatch.
2016-08-05 15:39:08 -04:00
Aesylwinn
1f32f1eef5
Add water texture.
2016-08-05 14:55:40 -04:00
Aesylwinn
9454f4f2e7
Use shared water geometry + state generation,
...
Fix water position and render bin,
Fix passed cell parameter being ignored
2016-08-05 13:49:44 -04:00
Aesylwinn
3904a24e6c
Add missing include.
2016-08-05 00:30:28 -04:00
Aesylwinn
5674e0da24
Render water in editor.
2016-08-04 23:01:43 -04:00
LohikaarmeHAV
19c74a4d6e
Part two
2016-08-03 20:39:46 +03:00
LohikaarmeHAV
7309be8592
First part
2016-08-03 20:20:55 +03:00
lohikaarme
e8ef5c233f
Miss info
2016-08-03 14:24:21 +03:00
lohikaarme
0592d1cdcf
Commnent?
2016-08-03 14:22:25 +03:00
lohikaarme
48bcde8cc9
...
2016-08-02 15:41:52 +03:00
LohikaarmeHav
b0cf276cfc
hups
2016-08-02 15:27:40 +03:00
LohikaarmeHav
7cd991107c
Nah
...
Preview seem to not like removing mCamPositionSet and I have do other things.
2016-08-02 15:26:12 +03:00
LohikaarmeHav
c6bc30d6a8
Forgot to remove line and add comment.
2016-08-02 14:27:19 +03:00
LohikaarmeHav
2e6f80688c
Removed debug
2016-08-02 14:10:08 +03:00
LohikaarmeHav
c6ec473280
Camera reset now every time cell object->view is pressed.
2016-08-02 13:46:43 +03:00
Aesylwinn
f73d60cc73
Make scene controls use configurable speed modifier.
2016-07-31 16:28:03 -04:00
Aesylwinn
bf2ab4ed45
Change the way modifiers are handled so they can be shared.
2016-07-31 16:07:17 -04:00
Aesylwinn
faea33b888
Revert "Change scene controls to more closely match blender as requested"
...
This reverts commit bc7ae70f0b
.
2016-07-31 05:54:13 -04:00
Aesylwinn
bc7ae70f0b
Change scene controls to more closely match blender as requested
...
in the forums.
2016-07-30 09:53:45 -04:00
Aesylwinn
1cce085fa2
Remove unused headers.
2016-07-29 16:35:43 -04:00
Aesylwinn
2f97d6cffb
Move tool tip processing to ShortcutManager,
...
Process cell arrow tooltip,
Fix cell arrows not being added when cell is added
2016-07-29 16:02:46 -04:00
Aesylwinn
d7a83d80a2
Change some key binding defaults.
2016-07-29 15:00:58 -04:00
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)
2016-07-29 15:00:35 -04:00
Aesylwinn
96a3c278fd
Added shortcuts for loading a cell relative to the camera,
...
Removed Ctl+V binding for "Verify" because that is associated
with paste.
2016-07-27 21:40:53 -04:00
Aesylwinn
65201badf6
Add custom page for key bindings.
2016-07-27 19:15:24 -04:00
LohikaarmeHav
f142f9bf86
wtf
2016-07-27 21:37:52 +03:00
Aesylwinn
b685c0ce6c
Add ability to clear shortcut/modifier setting with right click.
2016-07-27 14:07:53 -04:00
Aesylwinn
12db6d2114
Add modifier setting.
2016-07-27 13:53:33 -04:00
Aesylwinn
b204758be1
More shortcuts.
2016-07-27 01:53:21 -04:00
Aesylwinn
3f7f75cc9d
Exclude keys not compatible with qt 4
2016-07-27 00:44:34 -04:00
Aesylwinn
3edc77a32b
Remove QShortcut usage,
...
Add a lot of shortcuts,
Remove debug messages
2016-07-27 00:24:16 -04:00
Aesylwinn
08af82e1bd
Switched to an interactive method for key input,
...
Redid text representation for shortcuts
2016-07-26 21:22:31 -04:00
Aesylwinn
05888e7925
Updated more tool tips to show shortcut configs.
2016-07-25 22:43:37 -04:00
Aesylwinn
8c5fddf150
Fix pathgrid selection mode not being removed from toolbar.
2016-07-25 20:49:28 -04:00
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)
2016-07-25 20:49:09 -04:00
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.
2016-07-23 21:23:02 -04:00
Aesylwinn
acdb636935
Qt4 protected signal workaround and signed/unsigned mismatch.
2016-07-22 02:41:00 -04:00
Aesylwinn
455d227f3c
Changed shortcut design to allow a configurable second output. Also
...
re-added shift for temporarily changing camera speed.
2016-07-22 01:58:17 -04:00
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.
2016-07-20 15:00:00 -04:00
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
2016-07-20 08:25:11 -04:00
Aesylwinn
d8fa3fd1de
Added orbit "center on selection" shortcut.
2016-07-20 08:25:11 -04:00
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.
2016-07-20 08:25:11 -04:00
Aesylwinn
3fa4fdb839
Remove use of c++11 feature and add some missing headers.
2016-07-20 08:25:11 -04:00
Aesylwinn
40297701d0
Base key config/shortcut implementation
2016-07-20 08:25:11 -04:00
scrawl
b9b73d7b12
Replace "sys::default" with ESM::CellId::sDefaultWorldspace
2016-07-02 19:48:11 +02:00
Marc Zinnschlag
594444a85a
Merge remote-tracking branch 'aesylwinn/MultipleDeletion'
2016-06-26 08:11:43 +02:00
Aesylwinn
f6c3b44cfb
Fix QTimer not being stopped in right thread
2016-06-10 12:10:14 -04:00
Aesylwinn
ae50300053
Add ability to remove multiple rows in subrecords.
2016-06-09 15:42:40 -04:00
Aesylwinn
2f39a6e20d
Fix camera input not being reset when focus for widget is lost.
2016-06-08 13:25:47 -04:00
Aesylwinn
7657684dad
Fix mouse tracking to fix tooltip behavior. Also hide tooltips
...
when the mouse is moved.
2016-06-07 13:22:39 -04:00
Marc Zinnschlag
b079db7913
Merge remote-tracking branch 'aesylwinn/EditPathgrid'
2016-06-07 08:35:16 +02:00
Aesylwinn
3409d8a922
Change pathgrid node movement to be visually consistent, some
...
renaming
2016-06-04 12:38:17 -04:00
Aesylwinn
83c86cd1be
Implement context-select functionality.
2016-05-29 13:26:48 -04:00
Aesylwinn
b83f522ecd
Changes to color scheme, slight change to drag indicator,
...
change tooltip description.
2016-05-29 13:26:29 -04:00
Aesylwinn
90620081c7
Fix handling of deleted pathgrids.
2016-05-27 13:15:35 -04:00
Aesylwinn
bded4f86f0
Remove connection number check
2016-05-27 13:13:49 -04:00
Aesylwinn
ded8862e9d
Insert nested rows after selected row, or at start if none selected.
2016-05-26 22:44:02 -04:00
Aesylwinn
d0ef95a1e1
Make adjustments to pathgrid modification code.
2016-05-26 22:13:47 -04:00
Aesylwinn
564d0db68c
Move pathgrid abstraction handling to save code.
2016-05-26 22:11:27 -04:00
Aesylwinn
239727531f
Revert "Fix data corruption issues."
...
This reverts commit 6199663bd8
.
2016-05-25 22:53:17 -04:00
Aesylwinn
9a567b3712
Revert "Fix editor undo for nested data."
...
This reverts commit 774e1497b6
.
2016-05-25 22:52:41 -04:00
Aesylwinn
ec90da731c
Redo slight change to pathgrid editing controls, lost in revert
2016-05-25 22:52:02 -04:00
Aesylwinn
bb81e89c08
Revert "Cleanup and slight change to pathgrid editing controls."
...
This reverts commit cc4655e9c7
.
2016-05-25 22:48:43 -04:00
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.
2016-05-24 18:19:05 -04:00
Aesylwinn
5eaaed05fc
Improve mouse pick culling.
2016-05-24 17:31:00 -04:00
Aesylwinn
18897348d7
Fix weapon values not being properly set in editor.
2016-05-24 01:12:46 -04:00
Aesylwinn
774e1497b6
Fix editor undo for nested data.
2016-05-23 15:51:36 -04:00
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)
2016-05-21 18:59:43 -04:00
Aesylwinn
799ed300ea
Use cell coordinates class, fix undo description.
2016-05-21 14:36:07 -04:00
scrawl
703dba902b
Set the shader path in OpenCS
2016-05-20 00:40:59 +02:00
Aesylwinn
b86250036c
Add ability to add pathgrids.
2016-05-19 18:33:15 -04:00
Aesylwinn
1781aaaa27
Drag indicator.
2016-05-18 12:17:26 -04:00
Aesylwinn
e8e915bcde
Share selection functionality with instance editing mode.
2016-05-18 10:46:25 -04:00
Aesylwinn
ae0d2c3b9c
Refactor edit mode. Remove essentially duplicate function.
2016-05-17 21:24:16 -04:00
Aesylwinn
13c2161b27
Fix memory leak, remove empty if statement, change dynamic_cast
...
to static_cast
2016-05-17 16:14:23 -04:00
Aesylwinn
5a7ebab694
Fix forward declaration.
2016-05-16 23:06:36 -04:00
Aesylwinn
9d02286592
Remove unused forward declaration.
2016-05-16 22:17:03 -04:00
Aesylwinn
a3363bc098
Fix and simplify pathgrid update handling, only recreate geometry
...
once per frame, and a few naming changes.
2016-05-16 21:06:55 -04:00
Aesylwinn
d2d22e2f23
Clamp node positions in exterior cells.
2016-05-16 19:03:40 -04:00
Aesylwinn
cd3b96b3e8
Change interaction mask back to original and place required masks in
...
PathgridMode.
2016-05-16 17:59:52 -04:00
Aesylwinn
aea2380c2b
Add raytrace to dragCompleted. Implement node drag connection,
...
node and edge removal, and some fixes.
2016-05-16 17:25:02 -04:00
Aesylwinn
6fbc10dbba
Add ability to get cell, pathgrid, and ability to add nodes.
...
Also missing include.
2016-05-16 17:20:07 -04:00
Aesylwinn
9f7c8d559c
Add focus requirement for context menu.
2016-05-16 17:16:15 -04:00
Aesylwinn
f0bbe2c633
Add context menu for pathgrid editor.
2016-05-16 17:06:40 -04:00
Aesylwinn
8b6cb73369
Add ability to invert selection.
2016-05-16 17:03:00 -04:00