mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 02:26:38 +00:00
Code Issues Releases Wiki Activity
23557 commits 115 branches 76 tags 128 MiB
Commit graph

3185 commits

Author SHA1 Message Date
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
Aesylwinn
55656d68ef Cleanup, put duplicated code in function 2016-05-16 17:00:58 -04:00
Aesylwinn
da6a742beb Add control description to tooltip. 2016-05-16 16:50:02 -04:00
Aesylwinn
f8b43b2a64 Rename cryptic variables. 2016-05-13 12:55:35 -04:00
Aesylwinn
32ba5bf8b8 Initial pathgrid editting, support for selection and movement. 2016-05-12 19:35:49 -04:00
Aesylwinn
9645d0cc8a Pass more mouse pick information in scene view editor. 2016-05-12 18:21:43 -04:00
Marc Zinnschlag
64fdc5a21a Merge remote-tracking branch 'rcutmore/bug-3331' 2016-05-09 09:18:48 +02:00
scrawl
a7e6219091 Merge pull request #939 from kpp/rewrite_esm_name_t 
Rewrite ESM::NAME_T
 2016-05-08 13:15:05 +02:00
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.
 2016-05-08 06:09:40 -04:00
Rob Cutmore
e6863c8f79 Editor: Undo editable column check in record add 2016-05-08 06:05:52 -04:00
Marc Zinnschlag
b4e341e1e2 Merge remote-tracking branch 'aesylwinn/RenderPathgrid' 2016-05-08 10:15:12 +02:00
Roman Proskuryakov
d5dfa89060 Rewrite NAME_T into FIXED_STRING. 2016-05-07 23:27:33 +03:00
Rob Cutmore
307f04f827 Editor: Fix issue adding start script (Bug #3331) 
Updated to verify column is editable when adding a new record.
 2016-05-06 08:04:15 -04:00
Aesylwinn
14ae232938 Remove now unnecessary factory class. 
It was originally used for storing normals, but that functionality
was removed.
 2016-05-03 16:13:23 -04:00
Aesylwinn
1f902ff069 Remove code duplication. 2016-05-03 16:13:11 -04:00
Rob Cutmore
b129ff9672 Editor: Add PathgridCreator to find duplicate IDs 2016-05-03 07:24:33 -04:00
Rob Cutmore
c9ada852aa Undo including pathgrids in ID check 2016-05-03 06:19:47 -04:00
Aesylwinn
642b1d0273 Add mask. 2016-05-03 03:29:39 -04:00
Aesylwinn
8d95b63180 Add pathgrid rendering to opencs 2016-05-02 22:10:43 -04:00
Aesylwinn
7fbcc47b15 Add pathgrid modified signals. 2016-05-02 22:08:49 -04:00
Aesylwinn
933504dbd0 Revert "Pathgrid rendering v2" 
This reverts commit 4dee9604bb.
 2016-05-02 15:37:08 -04:00
Rob Cutmore
5580f803fd Editor: Prevent duplicate pathgrids (Bug #3342) 2016-05-02 07:28:32 -04:00
Aesylwinn
4dee9604bb Pathgrid rendering v2 2016-05-02 06:29:56 -04:00
Marc Zinnschlag
091e1bf25d improved scene element visibility buttons 2016-04-23 13:54:19 +02:00
Marc Zinnschlag
9d906a99a8 Merge remote-tracking branch 'rcutmore/bug-3286' 2016-04-18 09:40:13 +02:00
Rob Cutmore
e6ab3a4ba9 Remove unused CSVWorld::ScriptEdit::setMonoFont 2016-04-17 06:57:02 -04:00
Rob Cutmore
30493545f1 Update script editor tab width on font change 2016-04-17 06:54:31 -04:00
Rob Cutmore
25d9b77d10 Add setting for script editor tab width 2016-04-16 20:43:10 -04:00
Marc Zinnschlag
a5bc561c7d Merge remote-tracking branch 'origin/master' 2016-04-08 09:35:39 +02:00
Rob Cutmore
a3903d374f Update script editor tab width (Bug #3286) 2016-04-07 07:47:47 -04:00
Bret Curtis
2c90b0b78d fix a few spelling mistakes 2016-04-07 11:55:49 +02:00
Aesylwinn
7d89c82f08 Revert "Fix indentation." 
This reverts commit 9a495042cc.
 2016-04-06 10:23:12 -04:00
Aesylwinn
8c35836883 Fix misnamed identifier. 2016-04-06 03:12:10 -04:00
Aesylwinn
85005626b1 Replace usage of deprecated function. 2016-04-06 03:11:51 -04:00
Aesylwinn
94d4fb0686 Add check for region weather chances to verifier. 2016-04-06 03:11:28 -04:00
Aesylwinn
9a495042cc Fix indentation. 2016-04-06 02:39:33 -04:00
Aesylwinn
5e38fcac36 Add ability to edit region weather probabilities. 2016-04-06 02:18:19 -04:00
Marc Zinnschlag
60509875e8 Merge remote-tracking branch 'aesylwinn/editor_camera' 2016-04-05 08:54:23 +02:00
Aesylwinn
b111febfc9 Add pitch constraint for first person camera. 2016-04-04 20:56:13 -04:00
Aesylwinn
e07687ee01 Add button for camera mouse inversion in user preferences, and separate the 
sensitivity settings for orbit and free cameras.
 2016-04-04 18:42:57 -04:00
Aesylwinn
e127c691e2 Cleanup, remove some unused includes 2016-04-03 18:23:06 -04:00
Aesylwinn
ec25998b12 Cleanup, use setTraversalMask instead of setNodeMaskOverride 2016-04-03 18:19:20 -04:00
Aesylwinn
0ef7c778e0 Cleanup, isModified was a remnant of an old design and is only used in the first person camera mode. 2016-04-03 17:26:34 -04:00
Aesylwinn
6c471349f0 Add context menu for orbit camera. 2016-04-03 16:32:07 -04:00
Aesylwinn
4ef9981544 Add ability to set orbit camera center outside of class. 2016-04-03 16:30:50 -04:00
Aesylwinn
02f991c63e Cleanup, fix comment 2016-04-02 14:02:56 -04:00
Aesylwinn
99e9017242 Cleanup, externalize mask used to pick center 2016-04-02 13:59:57 -04:00
Aesylwinn
a4cc891383 Cleanup, move setup to CameraController class 2016-04-02 13:36:12 -04:00
Aesylwinn
efa2ec21ff Cleanup, no need to inherit and override osg::ComputeBoundsVisitor 2016-04-02 13:14:46 -04:00
Marc Zinnschlag
1bb23b6c77 Merge branch 'move' 2016-04-02 10:08:27 +02:00
Marc Zinnschlag
8f699b5d39 avoid creating move tags for instances that exist only in the currently edited content file 2016-04-02 10:08:03 +02:00
Aesylwinn
1e30891891 Broaden selection mask for getting scene bounds if nothing is found. 2016-03-31 23:54:20 -04:00
Aesylwinn
7d9dddfa38 Place camera farther away, improves preview camera placement. 2016-03-31 23:34:47 -04:00
Aesylwinn
09bce73c33 Fix starting distance not being correctly set. 2016-03-26 14:42:33 -04:00
Aesylwinn
08d055ca23 Allow setting precision of double preferences. Also increase precision of camera sensitivity. 2016-03-26 14:35:03 -04:00
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.
 2016-03-26 14:15:07 -04:00
Marc Zinnschlag
eba8b4a518 Merge remote-tracking branch 'rcutmore/feature-3250' 2016-03-26 11:34:25 +01:00
Aesylwinn
fbe9177f5d Better center picking for the Orbit Camera. 2016-03-26 00:51:19 -04:00
Aesylwinn
a0fb242bf8 Slight improvement to camera placement. 2016-03-25 23:47:05 -04:00
Aesylwinn
bee8977e45 Add camera control customization options. 2016-03-25 22:19:44 -04:00
Aesylwinn
dede171886 Fix the secondary navigation method for OrbitCameraController. 2016-03-25 21:35:34 -04:00
Aesylwinn
3c83128abc Add more customization. 2016-03-25 20:47:18 -04:00
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
 2016-03-25 18:20:04 -04:00
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).
 2016-03-25 12:13:55 -04:00
Rob Cutmore
29078619aa Fix editor tab order when adding record 2016-03-25 06:28:11 -04:00
Marc Zinnschlag
1774f6d9bf moved ref num assingment from instance creation to save procedure 2016-03-24 11:12:05 +01:00
Aesylwinn
342d31de76 More fixes to the orbit manipulator 2016-03-18 16:56:40 -04:00
Aesylwinn
2903271331 Correct the center position for the orbit camera controller 2016-03-18 16:07:15 -04:00
Aesylwinn
2c894acd98 Create a visual representation of the center of the orbit camera. 
For debugging purposes.
 2016-03-18 16:06:35 -04:00
Aesylwinn
c8bae38a8e Remove trackball mode 2016-03-18 14:53:10 -04:00
Aesylwinn
7009355baf Remove unused variable 2016-03-18 14:46:53 -04:00
Aesylwinn
4374f69a60 Reduce mouse sensitivity 2016-03-18 14:43:13 -04:00
Aesylwinn
2b72a04e7a Update 1st person up axis ASAP. 2016-03-18 14:02:55 -04:00
Aesylwinn
999869da24 Position camera above, near, and looking at the scene. 2016-03-18 14:02:24 -04:00
Aesylwinn
fcccacc0fa Define a constant for the World Up vector 2016-03-18 13:57:48 -04:00
pi03k
629a558e7b Fix for bug 3248 2016-03-17 22:34:45 +01:00
Aesylwinn
59f59a3385 Fix indentation 2016-03-14 00:45:36 -04:00
Aesylwinn
08fe914ba1 Preliminary editor camera 2016-03-14 00:45:18 -04:00
Aesylwinn
2cff2cd643 Remove unnecessary override. 2016-03-14 00:45:08 -04:00
Aesylwinn
9ed2cf6581 Fix callback being skipped 2016-03-14 00:44:56 -04:00
Aesylwinn
ebdc212886 Moved selectNavigationMode to SceneWidget class, centralized camera selection. 2016-03-14 00:44:46 -04:00
Aesylwinn
9afb0e0f90 Input restructuring. 2016-03-14 00:42:15 -04:00
Aesylwinn
f4f7afb53b Removed now unnecessary installation of event filter. 2016-03-14 00:41:57 -04:00
Aesylwinn
38059593a7 Removed workaround for OSG input handling in RenderWidget. 2016-03-14 00:41:04 -04:00
Marc Zinnschlag
d5067201d0 Merge branch 'move' 2016-03-12 13:27:00 +01:00
Marc Zinnschlag
900378a31e changed 'not implemented' warning message for object movement 2016-03-12 13:26:33 +01:00
Marc Zinnschlag
d6b8033b46 handle cell transitions when moving objects 2016-03-12 13:19:51 +01:00
scrawl
97526284f5 Allow setting the water level of an interior cell with sky (Fixes #3244) 2016-03-11 22:10:59 +01:00
Marc Zinnschlag
fa9689c5e7 delay command execution until call to Object::apply has finished (avoids cutting off the branch we are sitting on) 2016-03-11 14:04:47 +01:00
Marc Zinnschlag
6a2fe564ef Merge branch 'master' into move 2016-03-11 12:47:33 +01:00
Marc Zinnschlag
b2181fae20 safer handling of command macros 2016-03-08 10:48:44 +01:00
Marc Zinnschlag
b5005f7812 keep sub mode over mode changes 2016-03-05 11:41:42 +01:00
Marc Zinnschlag
a63453846b properly clear drag mode at the end of a drag 2016-03-05 11:14:08 +01:00
Marc Zinnschlag
51a4e3fa7d properly abort drags from outside the worldspace widget (code was leaving unclean dragging flags behind) 2016-03-05 10:56:54 +01:00
Marc Zinnschlag
70745487f3 cancel instance move on editing lock becoming active 2016-03-05 10:44:46 +01:00
Marc Zinnschlag
b1fb64bf68 added missing drag mode resets 2016-03-04 16:25:30 +01:00
Marc Zinnschlag
dd564daba0 do not start move drags while the document is locked for editing 2016-03-04 16:24:02 +01:00
Marc Zinnschlag
1726393963 cancel instance move on edit mode change 2016-03-04 15:31:50 +01:00
Marc Zinnschlag
25effc4222 cancel instance move on sub mode change 2016-03-04 15:30:28 +01:00
Marc Zinnschlag
1240e0c716 cancel instance move on drag abort 2016-03-04 15:19:26 +01:00
Marc Zinnschlag
d57021b23c some code simplification 2016-03-04 12:02:45 +01:00
Marc Zinnschlag
c2a8be9048 confine move marker drags to a single axis 2016-03-04 12:00:05 +01:00
Marc Zinnschlag
4cd24715cb Merge remote-tracking branch 'pi03k/bug_2570' 2016-03-04 09:41:21 +01:00
pi03k
128508882a Changed some zeros to NULLs in view.cpp 2016-03-03 11:46:56 +01:00
pi03k
3bfab9c2c9 extracted creation of scroll area to separate method 2016-03-03 11:46:56 +01:00
pi03k
9539925f3e Fixed typo in updateSubViewIndices. Changed 0 to NULL for pointers. 2016-03-03 11:46:56 +01:00
pi03k
bf9aa2e131 Extracted resizing of window's width to separate method 2016-03-03 11:46:56 +01:00
Marc Zinnschlag
9c1b4c671d Merge remote-tracking branch 'aesylwinn/cell_borders' 2016-03-03 11:04:51 +01:00
Aesylwinn
9d985d883b added grid icon 2016-03-02 20:45:04 -05:00
Aesylwinn
fa1bd72bc0 fix usage of deprecated function 2016-03-02 15:48:05 -05:00
Aesylwinn
7fb6807e65 cell border markers 2016-03-02 15:02:06 -05:00
Marc Zinnschlag
a19ac72215 render marker 2016-03-01 15:48:34 +01:00
Marc Zinnschlag
6f619ea85f Merge branch 'master' into move 
Conflicts:
	apps/opencs/view/render/object.cpp
 2016-03-01 12:17:53 +01:00
Marc Zinnschlag
7d8bd56e11 create new records with basic data in the same step without updates inbetween (Fixes #3207) 2016-03-01 11:21:06 +01:00
Rob Cutmore
d60786b5da Do not show cell markers for interior cells 2016-02-26 07:42:05 -05:00
Marc Zinnschlag
01497ac8db Merge remote-tracking branch 'origin/master' 2016-02-24 13:37:34 +01:00
Marc Zinnschlag
9f14247562 Merge remote-tracking branch 'aesylwinn/topic-info-editor-improvements' 2016-02-24 13:37:16 +01:00
Aesylwinn
1ae402476d Journal verifier 2016-02-22 17:01:15 -05:00
Aesylwinn
f4ed389496 InfoCondition autocompletion 2016-02-22 15:48:25 -05:00
scrawl
a6621626aa Don't use multiple parent node paths in CSVRender::Object 2016-02-22 15:22:37 +01:00
scrawl
1c24cba46a Don't use multiple parental node paths. 2016-02-22 15:13:31 +01:00
Marc Zinnschlag
22e717161a split object base node into two node (one for position, one for everything else) 2016-02-21 15:19:31 +01:00
Aesylwinn
20942e6658 Fixes to testing if condition is always or never true 2016-02-19 14:10:47 -05:00
Aesylwinn
5315866f61 Corrections to condition ranges and several other minor fixes 2016-02-19 03:03:10 -05:00
Aesylwinn
9d392487a9 Fix names to be unique and condition values to be set to 0 2016-02-19 02:59:19 -05:00
Aesylwinn
bdc99048bb Missing header 2016-02-17 19:01:22 -05:00
Aesylwinn
8668eccd0b Topic Info verifier with fixes to InfoSelectWrapper class 2016-02-17 15:38:30 -05:00
Aesylwinn
e89609e5b0 Changes to how Info Conditions are edited 2016-02-17 14:15:57 -05:00
scrawl
c4d38bb42d Fix clang analyzer warnings 2016-02-16 19:17:04 +01:00
Marc Zinnschlag
dececf6c38 instance moving via drag in 3D scenes 2016-02-16 16:02:29 +01:00
Aesylwinn
3f40346636 Implemented a wrapper for DialInfo::SelectStruct 2016-02-15 19:49:54 -05:00
scrawl
647a5e091f Add osgQt to the repository 
Ensures that it will be built against the correct Qt version.
 2016-02-15 15:16:48 +01:00
Marc Zinnschlag
dad38d901c Merge remote-tracking branch 'rcutmore/feature-3043' 2016-02-14 17:38:20 +01:00
Rob Cutmore
25744aaadd Update cell marker appearance 
- Added bounding box around marker text. Box is black when cell exists
  otherwise it is red.

- Changed format of marker text.

- Changed marker text's pivot point to be at center of text.
 2016-02-14 10:28:41 -05:00
Rob Cutmore
61b6806a62 Allow toggling of cell markers 2016-02-09 20:23:00 -05:00
scrawl
596fe56bfd Make Land::loadData thread safe 2016-02-09 20:21:56 +01:00
scrawl
e28dc3e72f Preload instances in SceneManager 2016-02-09 18:35:26 +01:00
Rob Cutmore
a34a08c212 Render cell markers 
Adds rendering of cell markers. Markers are displayed at center of
cell and contain cell's coordinates.
 2016-02-07 13:52:18 -05:00
scrawl
d12f24c321 Fix typo 2016-02-01 21:01:11 +01:00
Rob Cutmore
d28e7db65c Fix tooltip spelling errors in WorldspaceWidget 2016-01-31 08:45:05 -05:00
Alexander "Ace" Olofsson
b3e985fca2 Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor 2016-01-30 07:31:00 +01:00
Rob Cutmore
d43315fe4e Add script editor line wrapping (Feature #2926) 
Adds line wrapping for script editor and associated entry in settings
window. No line wrapping remains the default.
 2016-01-28 06:28:31 -05:00
Rob Cutmore
4caf44f061 Remove unused code in apps/opencs/view/world/table files 2016-01-26 07:48:55 -05:00
Marc Zinnschlag
1b7a0e5d64 Merge branch 'buttons' 2016-01-26 11:32:26 +01:00
Marc Zinnschlag
1d0ef97bf6 added select all of same ID item to selection mode button menu 2016-01-26 11:31:37 +01:00
Marc Zinnschlag
d5ef40aeb7 minor improvements to wording of instance selection menu items 2016-01-26 10:51:47 +01:00
Marc Zinnschlag
39e1b06101 fixed deletion of objects that are selected (was leaving a node behind) 2016-01-25 16:18:55 +01:00
Marc Zinnschlag
790367b980 fixed object removal via setting state to delete 2016-01-25 16:12:20 +01:00
Marc Zinnschlag
c1f0aa7260 added delete selection item to selection mode button menu 2016-01-25 14:55:02 +01:00
Rob Cutmore
fbca094dda Fix input validation in StartScriptCreator 2016-01-24 20:15:27 -05:00
Rob Cutmore
b93b97575e Improve start script creation (Fixes #3024) 
Improved start script creation by updating input to be a drop target
and adding auto-completion.
 2016-01-24 11:54:53 -05:00
scrawl
b0431833a1 Fix some defects reported by Coverity CI 2016-01-21 16:08:04 +01:00
Alexander "Ace" Olofsson
338f0cf53d Merge branch 'appveyor' of github.com:ace13/openmw into appveyor 2016-01-19 22:11:46 +01:00
Marc Zinnschlag
45e6974266 added select all and clear selection features 2016-01-19 14:25:20 +01:00
Marc Zinnschlag
4a02563708 Merge branch 'master' into buttons 
Conflicts:
	apps/opencs/view/render/instancemode.cpp
 2016-01-19 13:59:24 +01:00
Marc Zinnschlag
ecbcd6b171 allow mode buttons to setup the context menu 2016-01-19 12:52:30 +01:00
Marc Zinnschlag
eee972a1a4 added scene tool mode context menu feature 2016-01-19 12:47:11 +01:00
Marc Zinnschlag
0305ae3693 added selection mode UI 2016-01-19 12:17:13 +01:00
Aesylwinn
bbda5fe634 Removed hints from error messages and fixed naming to match conventions 2016-01-18 12:34:33 -05:00
Aesylwinn
1d86f705ba gmst verifier 2016-01-17 21:55:03 -05:00
Rob Cutmore
08b469c0d0 Remove unused forward declarations in filedialog.hpp 2016-01-17 14:18:49 -05:00
scrawl
fbf07133ea Document usage of node masks 2016-01-15 16:31:24 +01:00
scrawl
18320b2cd0 Move the Button enum to WorldSpaceWidget 2016-01-15 15:49:10 +01:00
scrawl
41c571d4f4 Merge branch 'master' of https://github.com/OpenMW/openmw into lighting 
Conflicts:
	apps/opencs/view/render/instancemode.cpp
 2016-01-15 15:46:10 +01:00
Marc Zinnschlag
c1901069be added instance mode sub-modes 2016-01-15 12:07:25 +01:00
scrawl
091ca9743e Do not write LandData twice (Fixes #3140) 2016-01-14 16:41:50 +01:00
Marc Zinnschlag
55627c0853 handling drops into cells that do not exist or are not shown 2016-01-14 13:20:01 +01:00
Marc Zinnschlag
6eba647a9d added accessor function for cell selection in paged worldspace 2016-01-14 13:19:37 +01:00
scrawl
458a305bff OpenCS: add lighting mask 2016-01-11 23:14:43 +01:00
scrawl
7f967153ef OpenCS: create light sources 2016-01-11 23:10:16 +01:00
scrawl
e7bb8878f3 OpenCS: add a mask for particle systems 2016-01-11 23:10:16 +01:00
scrawl
ad2145b463 OpenCS: use a separate enum for the toggle buttons 2016-01-11 23:10:16 +01:00
scrawl
fb849014bd Pass the fallback map to CSMWorld::Data 2016-01-11 23:10:16 +01:00
scrawl
11496b8075 Read fallback settings in OpenCS 2016-01-11 23:10:16 +01:00
Marc Zinnschlag
5b9d6cce98 made drop distance configurable 2016-01-11 09:03:02 +01:00
Marc Zinnschlag
7dd7be7f0e make scenes drop target for referenceables 2016-01-10 08:56:15 +01:00
Marc Zinnschlag
466f91db67 Fixed wrong GMST name for newly created game files (Fixes #3132) 2016-01-06 13:10:09 +01:00
scrawl
daa94cc50e Fix cppcheck warnings 2016-01-03 20:19:38 +01:00
Alexander "Ace" Olofsson
fe241be26c Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor 2015-12-24 11:27:02 +01:00
Alexander "Ace" Olofsson
2142d0d2d6 Make Qt5 happy 2015-12-24 02:48:00 +01:00
Marc Zinnschlag
2162f21550 Merge branch 'drop' 2015-12-20 10:18:05 +01:00
Aesylwinn
9bd14215d7 Expanded inventory check to creatures and NPCs 2015-12-19 22:02:39 -05:00
Aesylwinn
4c14117761 Added checks to verifier for container inventories 2015-12-19 20:03:00 -05:00
Marc Zinnschlag
102397067c added interface for per edit-mode drop handling 2015-12-18 14:04:53 +01:00
Marc Zinnschlag
37a72d1ea6 reject unsuitable drops to WorldspaceWidget earlier 2015-12-18 12:38:45 +01:00
Marc Zinnschlag
6b626c2954 spelling fixes 2015-12-17 13:06:37 +01:00
scrawl
6ee7c61667 CSMPrefs: fix deadlock in toColor() 2015-12-15 19:33:28 +01:00
Marc Zinnschlag
9c7bbd667b Merge branch 'usersettings' 2015-12-15 14:58:04 +01:00
Marc Zinnschlag
be19da189a fixed user settings not being saved when last document window is closed while user settings window is still open 2015-12-15 14:56:29 +01:00
Marc Zinnschlag
d6bd2cb1f0 changed name of openmw-cs user settings file 2015-12-15 14:51:25 +01:00
Marc Zinnschlag
c646533448 removed old user settings system 2015-12-15 12:49:55 +01:00
Marc Zinnschlag
67cf260144 final batch of changing over user settings usage to the new system 2015-12-15 12:44:04 +01:00
Marc Zinnschlag
44925e9fc8 fixed records settings (Text Only wasn't updating) 2015-12-15 12:26:08 +01:00
Marc Zinnschlag
591564566c made user settings access thread-safe 2015-12-15 12:19:48 +01:00
Marc Zinnschlag
ecbd68a19b third batch of changing over user settings usage to the new system 2015-12-15 10:40:00 +01:00
Marc Zinnschlag
a3a2c2f476 second batch of changing over user settings usage to the new system 2015-12-14 17:38:33 +01:00
scrawl
fb9f5f8fe8 Fix typo 2015-12-14 01:36:53 +01:00
Marc Zinnschlag
cf9fa0e0e9 first batch of changing over user settings usage to the new system 2015-12-12 14:49:16 +01:00
Marc Zinnschlag
0ffe4290fb workaround for MOC's lack of namespace awareness 2015-12-12 12:05:56 +01:00
Marc Zinnschlag
04a11679fb added category update function 2015-12-12 11:58:53 +01:00
Marc Zinnschlag
3a5238bebc changed the settingChanged signature to accommodate queued connections 2015-12-11 12:06:20 +01:00
Marc Zinnschlag
8245b9e439 added interface for querying settings 2015-12-11 11:50:06 +01:00
Marc Zinnschlag
31b105ad9e improved settings layout 2015-12-11 11:32:55 +01:00
Marc Zinnschlag
a907b4ab15 made Setting class non-abstract 2015-12-11 11:22:15 +01:00
Marc Zinnschlag
73ffdd5ac5 added colour settings 2015-12-11 11:15:14 +01:00
Marc Zinnschlag
590d6eba9b added enum settings 2015-12-10 17:33:14 +01:00
Marc Zinnschlag
8050eba83b added a few comments 2015-12-10 13:33:44 +01:00
Marc Zinnschlag
b0fb6d56f1 added bool settings 2015-12-10 13:28:48 +01:00
Marc Zinnschlag
9ca5a1b647 added double settings 2015-12-10 10:58:38 +01:00
Marc Zinnschlag
c61d717e41 added integer settings 2015-12-08 17:21:58 +01:00
Marc Zinnschlag
c158224314 fixed a faulty include 2015-12-08 12:09:53 +01:00
Marc Zinnschlag
5e40b4d2e8 page switching mechanism 2015-12-08 12:04:45 +01:00
Marc Zinnschlag
0dc3d10112 some simplification 2015-12-08 09:56:42 +01:00
scrawl
07b064f616 Rename to lowerCaseInPlace 2015-12-07 22:49:15 +01:00
scrawl
4dd4c5394b Broken lower-casing fix 2015-12-07 22:30:37 +01:00
scrawl
42d68eb7fb Build fix 2015-12-07 22:29:57 +01:00
Marc Zinnschlag
b37a2ac09c user settings categories 2015-12-06 12:06:28 +01:00
Marc Zinnschlag
36ce8f97d7 basic framework for new user settings system 2015-12-06 11:18:31 +01:00
scrawl
f962ce0bbe Don't link against unnecessary OSG libraries 2015-11-29 19:56:43 +01:00
scrawl
35fa1f5865 Not found Land Textures are no longer a fatal error (Bug #3037) 
Log warning message and show the default texture when encountering invalid ESM::LandTexture references.
 2015-11-27 21:57:24 +01:00
Marc Zinnschlag
99500f4021 make initial size of script error panel configurable (Fixes #2996) 2015-11-21 14:28:40 +01:00
Marc Zinnschlag
f5c61ee616 remember script error panel height per scriptsubview 2015-11-21 14:19:14 +01:00
Marc Zinnschlag
26640d17eb do not adjust error panel height if panal was already open 2015-11-21 12:52:32 +01:00
Marc Zinnschlag
1093a53cf9 hide script error list when there are no errors (Fixes #2867) 2015-11-21 12:45:11 +01:00
Marc Zinnschlag
b74b274ac0 Removed validator for filenames in OpenMW-CS (Fixes #2918) 2015-11-21 12:14:57 +01:00
Marc Zinnschlag
e0e9e7f8c2 adjusted startup warning message for recent improvements regarding loading/saving 2015-11-21 11:56:24 +01:00
Marc Zinnschlag
020b3add94 Merge branch 'openmw-37' 2015-11-17 09:54:49 +01:00
scrawl
eb2f16d682 Support for loading .osg mesh format 2015-11-16 23:26:43 +01:00
scrawl
af4923577b Fix double writing of Dialogue NAME in OpenCS 2015-11-15 16:04:52 +01:00
Marc Zinnschlag
de98ee0062 Merge remote-tracking branch 'scrawl/esm_rewrite' 2015-11-14 14:25:08 +01:00
Nikolay Kasyanov
014a2fc0e9 OS X: do not override Qt plugin path 2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
4e3bbe01b6 OS X: disable glTexStorage2D because of OSG/driver issue 
See http://forum.openscenegraph.org/viewtopic.php?p=65276#65276 for the details.
 2015-11-14 13:50:01 +01:00
scrawl
1402a16702 SceneWidget: change the threading model to DrawThreadPerContext 
Performs much better because we can break frame early, running cull in parallel with last frame's draw.
 2015-11-13 21:00:51 +01:00
Marc Zinnschlag
b0d79ee790 Merge branch 'tooltip' 2015-11-13 11:40:10 +01:00
Marc Zinnschlag
63ee37d914 added 3D scene tooltips 2015-11-13 11:39:57 +01:00
scrawl
b8e11cf197 Merge commit 'pull/upstream/678' into HEAD 
Conflicts:
	apps/esmtool/record.cpp
	apps/opencs/model/doc/savingstages.cpp
	apps/opencs/model/world/land.cpp
	apps/opencs/model/world/land.hpp
	apps/opencs/model/world/landtexture.cpp
	apps/openmw/mwworld/store.cpp
	components/esm/loadland.cpp
	components/esm/loadland.hpp
 2015-11-13 01:34:36 +01:00
Marc Zinnschlag
8b01f1f6fb added instance tooltips 2015-11-12 15:09:43 +01:00
Marc Zinnschlag
01f4b8a182 added scene tooltips system (tag based) 2015-11-12 15:06:37 +01:00
cc9cii
7f477e2fae Fix include file issue. 2015-11-02 06:57:24 +11:00
cc9cii
4af469511d Fix some sub-tables becoming uneditable since commit 80869d 2015-11-02 06:43:20 +11:00
cc9cii
819fecd08e Add a check for scale value of 0. Should resolve bug #2880. 2015-11-01 11:23:28 +11:00
cc9cii
7c007d9c6d Rename a variable to make it less confusing. 2015-10-31 20:45:16 +11:00
cc9cii
78c735adc6 Fix saving when only topic info was modified (topic itself unchanged) 2015-10-31 20:42:42 +11:00
Marc Zinnschlag
655b40267b changed instance selection model (primary selects, secondary toggles selection) 2015-10-29 11:27:01 +01:00
Marc Zinnschlag
ad4e0e3b97 split virtual select button into two buttons (primary select and seconadry select) 2015-10-29 11:20:06 +01:00
cc9cii
107ccd84d4 Move TableEditModes enum inside a class scope. 2015-10-28 23:33:24 +11:00
cc9cii
77471d1592 Re-add mistakenly removed line and fix a silly typo. 2015-10-28 20:52:07 +11:00
cc9cii
80869d9bae Disable context menu for fixed size sub-tables. Should resolve bug #2932. 2015-10-28 20:30:30 +11:00
cc9cii
972193c7eb Fix issue where mandatory effects field was allowed to be empty (and vice versa) 2015-10-28 11:49:24 +11:00
cc9cii
1a64b40725 Fix skills and attributes being possible to add to irrelevant effects. Should resolve bug #2980. 2015-10-28 11:30:36 +11:00
cc9cii
9f0e059a15 Fix editing ingredient effects sub-table. Should resolve bug #2978. 2015-10-28 11:18:48 +11:00
Marc Zinnschlag
843225996c get modifiers from event instead of from the application 2015-10-27 15:43:52 +01:00
Marc Zinnschlag
d2e92fd36f trigger mouse click actions on release instead of on press (avoids problems with dragging) 2015-10-27 15:30:51 +01:00
Marc Zinnschlag
f3ee3f5be1 Do not call base class event functions in WorldspaceWidget 
This avoids some event function being triggered twice. I do not fully understand why
calling the base class function causes this problem, which is more than a bit
disconcerting, but let's roll with it for now.
 2015-10-27 15:25:46 +01:00
Marc Zinnschlag
6c65081643 Merge branch 'marker' 2015-10-26 14:27:29 +01:00
Marc Zinnschlag
e34af4c4b5 handle primary and secondary edit button clicks on cell arrows 2015-10-25 15:16:22 +01:00
Marc Zinnschlag
8f0d7ec1ec Merge remote-tracking branch 'artemutin/longStringEditor' 2015-10-16 09:15:48 +02:00
artemutin@yandex.ru
eae36f8005 Fixed filter reapplication on Description column change and on State 
column change.

Moved column index search to widget constructor, rewrite slot with
respect to multiple columns data change.
 2015-10-16 11:32:22 +10:00
Marc Zinnschlag
361634489e properly handle cells that don't exist 2015-10-15 14:46:08 +02:00
artemutin@yandex.ru
33e12a99fa If table dont use any filter, filter update now dont cause a reapply of empty filter 2015-10-14 21:22:28 +10:00
Marc Zinnschlag
773df6fd22 some OSG fixes 2015-10-13 16:53:40 +02:00
Marc Zinnschlag
68115c4e8a (somewhat) improved the colour scheme 2015-10-13 16:15:53 +02:00
Marc Zinnschlag
0b1d6bddc8 merged primitives arrays 2015-10-13 16:11:47 +02:00
Marc Zinnschlag
6e140c9cb1 proper shape for cell arrows (kinda) 2015-10-13 11:43:33 +02:00
Marc Zinnschlag
3f9db7ba3c more reliable method of obtaining the cell coordinates in CSVRender::Cell 2015-10-12 18:00:44 +02:00
Marc Zinnschlag
b81ee606c8 use CellCoordinates instead of a pair of ints for cell coordinates 2015-10-12 14:31:55 +02:00
Marc Zinnschlag
0d35938794 basic cell arrow rendering (shape is a placeholder) 2015-10-12 14:12:01 +02:00
Marc Zinnschlag
3b39572274 Merge remote-tracking branch 'artemutin/scriptSearchRedirect' 2015-10-09 17:15:11 +02:00
artemutin@yandex.ru
4ca7b26609 Stream error handling, and other minor changes. 2015-10-09 21:57:02 +10:00
cc9cii
64821b0785 Disable toolbar context menu. Should resolve bug #2953. 2015-10-09 06:29:50 +11:00
artemutin@yandex.ru
e7a3f059aa Implemented line and col calculations in scriptsubview 2015-10-09 00:29:18 +10:00
cc9cii
3bbcf6a916 Fix AiWander sub-table editing. Should resolve bugs #2888 and #2930. 2015-10-08 12:47:23 +11:00
cc9cii
998348e606 Further rationalise the use of ColumnIds 
- Address Zini's review comments as per https://github.com/OpenMW/openmw/pull/755
 2015-10-08 12:35:09 +11:00
Alexander "Ace" Olofsson
b4132faaea Update editmode.cpp 
Fixes builds on Windows
 2015-10-04 16:27:05 +02:00
Rohit Nirmal
0a8e2c0b21 Fix building OpenCS with Qt 5. 2015-10-03 00:07:08 -05:00
Marc Zinnschlag
6ef2319eb8 Merge branch 'sceneinput' 2015-10-02 15:07:01 +02:00
Marc Zinnschlag
4b0fa370e3 made WorldspaceWidget::getDocument public (EditModes will need the document later) 2015-10-02 15:06:42 +02:00
Marc Zinnschlag
323f8bb29f sensitivity settings 2015-10-01 13:42:21 +02:00
Marc Zinnschlag
1d4f8b2595 send mouse wheel input to active EditMode during drag operations 2015-10-01 13:19:48 +02:00
Marc Zinnschlag
0a5bfb2107 added framework for drag operations 2015-10-01 12:46:01 +02:00
artemutin@yandex.ru
ecce3a1975 Add StartScriptCreator to a factory manager. 2015-09-30 09:46:51 +10:00
artemutin@yandex.ru
903cd3322b add getIdValidatorResult method to GenericCreator, for use in subclass 
StartScriptCreator
 2015-09-30 09:46:51 +10:00
artemutin@yandex.ru
e672880f64 Fix namespace, add file to CMakeLists.txt 2015-09-30 09:46:51 +10:00
artemutin@yandex.ru
3f27c85630 Added StartScriptCreator class with redefined getErrors method. 2015-09-30 09:46:51 +10:00
Marc Zinnschlag
8e87b48866 handle context-sensitive select mode in instance editing 2015-09-29 16:07:14 +02:00
Marc Zinnschlag
2cb106f6ad added missing flagAsModified calls 2015-09-29 16:06:55 +02:00
Marc Zinnschlag
f28fa9fc16 clear instance selection on select click on nothing/something that isn't an instance 2015-09-29 13:53:47 +02:00
Marc Zinnschlag
319e3f24a3 on edit mode change clear selection of elements that are not affected by current edit mode (only support for instance for now since we do not have selection for other elements yet) 2015-09-29 13:48:04 +02:00
Marc Zinnschlag
981a8a2cc2 delegated editing and selection functions to mode objects 2015-09-27 16:18:22 +02:00
Marc Zinnschlag
9bf27c7e37 moved edit mode handling from SceneSubView to WorldspaceWidget 2015-09-27 14:38:12 +02:00
Marc Zinnschlag
5d9863aec1 removed a redundant check 2015-09-27 11:34:14 +02:00
Marc Zinnschlag
7bbc475bda apply button mapping 2015-09-26 18:01:49 +02:00
Marc Zinnschlag
501ae6372d factored out mouse picking into a separate function 2015-09-26 17:51:41 +02:00
Marc Zinnschlag
3844c94975 bit masking fix 2015-09-26 17:39:55 +02:00
Marc Zinnschlag
72bb33c2c4 filter mouse interaction by interaction mask 2015-09-26 12:24:41 +02:00
Marc Zinnschlag
71247a0186 inserted TagBase between ObjectTag and osg::Referenced 2015-09-26 12:18:18 +02:00
Marc Zinnschlag
748b13b45b renamed ObjectHolder into ObjectTag 2015-09-26 12:05:44 +02:00
Marc Zinnschlag
d46eeb04cd removed a left-over debugging statement 2015-09-25 14:16:41 +02:00
Marc Zinnschlag
5c34a02058 store mouse bindings in WorldspaceWidget 2015-09-25 13:11:40 +02:00
Marc Zinnschlag
d597bef2cd refined selection related user settings 2015-09-25 10:58:20 +02:00
Marc Zinnschlag
62047b1868 Merge remote-tracking branch 'origin/master' into sceneinput 2015-09-24 16:07:39 +02:00
Marc Zinnschlag
3ada08af90 store lock state and pass it on to edit mode 2015-09-24 16:07:17 +02:00
Marc Zinnschlag
b2cb5f0374 pass on user settings updates to potentially interested parties within a scene subview 2015-09-24 15:51:16 +02:00
scrawl
12b8fcf0bf OpenCS: Fix camera position retrieval in WorldspaceWidget 2015-09-23 23:37:09 +02:00
Marc Zinnschlag
7bef97bf33 fixed local variable caching issue in automatic error checking (Fixes #2927) 2015-09-22 15:36:00 +02:00
Marc Zinnschlag
39b7340580 added mouse button settings for 3D scene (not in use yet) 2015-09-21 15:32:18 +02:00
scrawl
18d0cae801 OpenCS: Select objects with the right mouse button 2015-09-18 18:31:43 +02:00
scrawl
41ea76fd83 OpenCS: Add selection outline effect to CSVRender::Object 2015-09-18 18:31:05 +02:00
scrawl
dac3b33efb OpenCS: Pass events from the QGLWidget to the RenderWidget 2015-09-18 18:30:48 +02:00
scrawl
169fc6a61b OpenCS: Remove margin around the render window 2015-09-18 18:29:22 +02:00
Marc Zinnschlag
1aa926c7e0 restored T-shortcut (focus toolbar) in scene widget 2015-09-17 12:41:56 +02:00
Marc Zinnschlag
659b87b25f more cleanup 2015-09-17 11:31:25 +02:00
Marc Zinnschlag
b3b4fb3efb removed some left-over signal slot stuff that shouldn't have been there in the first place 2015-09-17 11:27:55 +02:00
scrawl
a47617c21f Fix tab indentations in apps/ and components/ 2015-09-16 20:45:37 +02:00
cc9cii
1365b8edd1 Fix typo. 2015-09-12 11:18:07 +10:00
cc9cii
45aee1b508 Remove AI flag from the UI and instead auto-detect whether to save AIDT records. Should resolve bug #2879. 2015-09-12 10:15:32 +10:00
cc9cii
5a5e1a3b22 Add missing fields for editing creatures. 
- Should resolve resolve bugs #2878 (level), #2901 (gold) and #2889 (health).
- Moved Soul, Combat, Magic and Stealth editing to dialogue only (to be consistent with editing NPCs)
 2015-09-12 10:00:23 +10:00
cc9cii
c4a900ca2c Rationalise the use of ColumnIds 2015-09-12 09:33:11 +10:00
cc9cii
258b2ba29a Ensure ColumnId names are unique. Filter parser calls Columns::getId() which implies that these should be unique. 2015-09-12 09:04:43 +10:00
Marc Zinnschlag
a445683312 Merge branch 'mergetool' 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/tools/tools.cpp
 2015-09-11 13:22:15 +02:00
Marc Zinnschlag
5be176ee85 disable on-demand loading of land data (for now, maybe) 2015-09-11 13:02:24 +02:00
Marc Zinnschlag
23fde87816 fixed an indexing error 2015-09-11 10:50:19 +02:00
Marc Zinnschlag
584a7a66b9 various minor fixes 2015-09-10 12:41:31 +02:00
Marc Zinnschlag
09ec60fe2a handle missing land texture records properly during merge 2015-09-08 16:01:34 +02:00
Marc Zinnschlag
73f6efddcc fixed a texture indexing bug (only affects the editor) 2015-09-08 15:33:15 +02:00
Marc Zinnschlag
a8dc1c1198 merge land tables 2015-09-03 16:15:00 +02:00
Marc Zinnschlag
85f6bb892b removed indirection in OpenMW-CS land record 2015-08-31 18:13:27 +02:00
Marc Zinnschlag
69b9eadb52 refactored loading of land data 2015-08-31 16:13:26 +02:00
Marc Zinnschlag
febf611c82 made return type of ESMTerrain::Storage::getLand const 2015-08-31 14:17:11 +02:00
Marc Zinnschlag
69045d7ec9 additional safety check for land texture listing merge stage 2015-08-31 11:10:58 +02:00
Marc Zinnschlag
890bbb6b11 merge land texture tables 2015-08-30 14:27:22 +02:00
Marc Zinnschlag
b7983d08ba fixed merge stage order; added proper initialisation 2015-08-30 11:08:56 +02:00
Marc Zinnschlag
a97a632aa7 merge references tables 2015-08-26 17:21:24 +02:00
Marc Zinnschlag
845cafd61c fixed record state issues after merge 2015-08-25 12:40:40 +02:00
Marc Zinnschlag
f95950e8d8 merge referenceables table 2015-08-25 11:54:16 +02:00
Marc Zinnschlag
9cf793c0b5 silenced a warning 2015-08-25 11:39:43 +02:00
Marc Zinnschlag
40753aa9a3 simplifying merge stage 2015-08-25 08:43:03 +02:00
Marc Zinnschlag
16dda281ce made merge operation more fluent 2015-08-23 13:04:42 +02:00
Marc Zinnschlag
103073150e added info tables and pathgrid table to merge operation 2015-08-23 12:58:49 +02:00
Marc Zinnschlag
c92898a5bc flag newly merged documents as dirty (triggering an 'are you sure' dialogue when closing without saving first) 2015-08-23 12:37:45 +02:00
Marc Zinnschlag
e76401d5ea Merge remote-tracking branch 'smbas/fix-opencs-bugs' 2015-08-23 12:15:19 +02:00
Stanislav Bas
ba4b7df99d Add missing includes to columnimp.hpp 2015-08-22 16:35:00 +03:00
Stanislav Bas
720aca8f3d Inform about State change (not a whole row) when modifying a table value 2015-08-22 16:34:57 +03:00
Stanislav Bas
4d24eff859 Show race only when mesh type is Skin (in BodyParts table) 2015-08-22 16:34:54 +03:00
Stanislav Bas
6d81ca07b5 Convert AiWanderRepeat to bool in ActorAiRefIdAdapter::getNestedData() 2015-08-22 16:34:45 +03:00
scrawl
32ad8c86bf Fix the ESM::LandTexture NAME being discarded on loading 2015-08-22 13:10:54 +02:00
scrawl
031d64d0d3 Adjust OpenCS saving stages order to stop vanilla MW complaining about missing records 2015-08-22 12:57:39 +02:00
Stanislav Bas
b7295e2632 Columns with Display_Boolean use Combobox editor even for non-boolean values 2015-08-21 22:36:53 +03:00
Stanislav Bas
aeb1acca51 Remove enum names for AiWanderRepeat column 2015-08-21 22:05:40 +03:00
Stanislav Bas
e14aedc7cd ModifyCommand uses a proper name of a modified nested value 2015-08-21 21:47:29 +03:00
Stanislav Bas
d038ac2da0 Sort tables by ID in the ascending order initially 2015-08-21 21:38:28 +03:00
Marc Zinnschlag
3902513e65 merge id collections 2015-08-21 14:02:32 +02:00
scrawl
67bd6cd708 Remove empty line at the beginning of files 
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
 2015-08-18 23:06:12 +02:00
scrawl
d1e1c0f38b Editor: fix a typo in ESM::Light flag mappings 2015-08-16 23:42:08 +02:00
Marc Zinnschlag
47dd9505a9 copy meta data from game file when merging 2015-08-16 18:27:17 +02:00
Marc Zinnschlag
1b663f01af create merged document and open a view for it (document is still empty at this point) 2015-08-16 15:24:48 +02:00
Marc Zinnschlag
5558962b14 Merge remote-tracking branch 'scrawl/editor_creatureflag' 2015-08-16 10:13:11 +02:00
Marc Zinnschlag
8bb28c3236 Merge remote-tracking branch 'corristo/osx-hidpi' 2015-08-16 10:06:38 +02:00
Nikolay Kasyanov
dbcce482a6 OS X: enable high resolution mode for OpenMW & OpenCS 
We don't support retina completely yet, but it's still better than
blurry mess, and Qt does pretty good job for OpenCS already.
 2015-08-15 22:37:09 +02:00
scrawl
e36ebc77d5 Editor: remove creature flag of unknown purpose from the UI 2015-08-15 18:39:00 +02:00
scrawl
c07ced4c8f Editor: fix magic effect magnitudes incorrectly labelled as Min/Max Range 2015-08-13 17:01:25 +02:00
Marc Zinnschlag
d8655f2ff8 forgot to connect merge operation signals 2015-08-13 14:49:32 +02:00
Marc Zinnschlag
e2377396a7 inheriting Merge from QWidget instead of QDialog, because QDialog is bloody useless for non-modal dialogues (which makes the class completely useless, since modal dialogues are the spawn of Satan) 2015-08-13 12:53:00 +02:00
Marc Zinnschlag
904ad94952 added merge operation (doesn't do anything yet) 2015-08-13 12:03:20 +02:00
Marc Zinnschlag
708cacdec4 disable merge menu item when a merge is already in progress 2015-08-08 16:47:58 +02:00
Marc Zinnschlag
23ccee0124 Merge remote-tracking branch 'dieho/master' 
Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
 2015-08-08 11:00:44 +02:00
Marc Zinnschlag
7f10a7f24f Merge remote-tracking branch 'smbas/feature-mgef-verifier' 2015-08-08 10:50:38 +02:00
Stanislav Bas
ff2dab8d56 Remove check for an empty Particle from Magic effects verifier 2015-08-06 14:17:42 +03:00
Marc Zinnschlag
4fd3097c1c improved adjuster widget problem reporting 2015-08-06 12:58:52 +02:00
Marc Zinnschlag
b83f9445a9 added UI for merge tool (merge tool itself is still missing) 2015-08-06 12:52:10 +02:00
Marc Zinnschlag
469a896ca1 make non-editable fields in dialogue sub view selectable (Fixes #2818) 2015-08-06 08:45:38 +02:00
taras.kudryavtsev
8ae7c63c45 #2730 and #2725 2015-08-04 16:58:44 +03:00
Stanislav Bas
cbc8309289 Don't allow empty value of School field in Magic Effects table 2015-08-04 16:19:00 +03:00
Stanislav Bas
8da9eecea7 Correct comparison of enum values in IdTableProxyModel 2015-08-03 19:24:00 +03:00
Stanislav Bas
0ea4d1981a Add magic effect verifier 2015-08-03 19:08:01 +03:00
Stanislav Bas
6b3de5c720 Activate editing of nested table cells by a double click 2015-08-02 22:53:40 +03:00
Stanislav Bas
1590a04d03 Close EditWidget when a proper row removed 2015-08-02 22:39:41 +03:00
Stanislav Bas
33042c1464 Restore Modified status of a record when adding/removing nested rows 2015-08-02 21:52:55 +03:00
Stanislav Bas
25b653e316 Inform about Modified status change when modifying a value of a model 2015-08-02 15:06:56 +03:00
Stanislav Bas
afb36b73eb Proper index for Modified column in ModifyCommand 2015-08-02 15:03:27 +03:00
Marc Zinnschlag
6a9218ee07 replaced State_Compiling (not requried anymore) with State_Merging 2015-07-30 11:49:24 +02:00
Marc Zinnschlag
2c1cee38b4 Merge remote-tracking branch 'smbas/feature-extended-configurator' 2015-07-28 07:56:12 +02:00
Stanislav Bas
03c2e11961 Update to upstream/master. Resolve merge conflicts 2015-07-27 13:54:13 +03:00
Marc Zinnschlag
420503d5fc Merge remote-tracking branch 'smbas/fix-bug-2728' 2015-07-27 11:23:49 +02:00
Marc Zinnschlag
bafa86d3e9 Merge remote-tracking branch 'scrawl/master' 2015-07-27 11:10:16 +02:00
Stanislav Bas
812fffbadc Don't inform about a nested row addition in proxy models for top-level tables 2015-07-26 20:25:46 +03:00
Stanislav Bas
2471e4d67a Rework Table to use rowAdded() signal of a proxy model 2015-07-26 20:09:31 +03:00
Stanislav Bas
86b7d2a43d Inform about a row addition after re-sorting in InfoTableProxyModel 2015-07-26 20:07:36 +03:00
Stanislav Bas
37fd733deb Create a custom signal to inform about a row addition in IdTableProxyModel 2015-07-26 20:06:30 +03:00
Stanislav Bas
c088cd4fa9 Proper index creation for nested data 2015-07-25 18:32:13 +03:00
scrawl
b3f5ac5dbb Include cleanup 2015-07-25 02:11:49 +02:00
Marc Zinnschlag
fcf9ae42f4 Merge remote-tracking branch 'smbas/fix-table-proxy-bugs' 2015-07-24 10:29:08 +02:00
Rohit Nirmal
6d2d32485f Fix building OpenCS with Qt 5. 2015-07-23 22:22:22 -05:00
Stanislav Bas
f5b1447c92 IdTableProxyModel refreshes the filter when the source model data or rows changed 2015-07-23 21:05:00 +03:00
Stanislav Bas
a7b3248ee7 Proper sorting of columns with enum values 2015-07-23 20:35:16 +03:00
Stanislav Bas
daaff1284e Remove unused includes 2015-07-22 22:18:26 +03:00
Stanislav Bas
13bb6be238 Load methods (for ESM records) accept a deleted flag in OpenCS 2015-07-22 22:17:26 +03:00
Stanislav Bas
1e8182220a Fix build errors & warnings 2015-07-19 23:44:16 +03:00
Stanislav Bas
8e6a7be6f5 Implement saving of deleted records 2015-07-19 14:58:20 +03:00
Stanislav Bas
e04e32bcff Delete infos of deleted dialogue when loading a content file 2015-07-19 14:58:18 +03:00
Stanislav Bas
a4d3e59e5c Add a separate method to check whether a record is deleted or not for IdCollection 2015-07-19 14:58:16 +03:00
Marc Zinnschlag
cdfa3006a3 incorrect sBribe GMSTs for new omwgame files (Fixes #2785) 2015-07-18 17:47:50 +02:00
Marc Zinnschlag
b2ab0122ab Merge branch 'scriptbuttons' 2015-07-18 17:37:43 +02:00
Marc Zinnschlag
f1ac440b78 do not allow editing of deleted scripts 2015-07-18 17:00:00 +02:00
Marc Zinnschlag
8763a3b3c3 make compilation delay configurable via a user setting 2015-07-18 15:32:38 +02:00
Marc Zinnschlag
73b6df8280 put script compilation in script subview behind a timer 2015-07-18 13:09:17 +02:00
scrawl
58720e6a28 Fix the OpenCS rendering crash on exit (Fixes #2735) 2015-07-18 03:52:48 +02:00
Marc Zinnschlag
5febb96012 do not try to jump to source location for errors that do not have a source location 2015-07-17 13:59:50 +02:00
Marc Zinnschlag
f665919046 consider column when jumping to error in source text 2015-07-17 13:53:22 +02:00
Marc Zinnschlag
0abd29a3b4 jump to line in source text when clicking on an error in error table 2015-07-17 13:42:25 +02:00
Marc Zinnschlag
100af80388 made error table read only 2015-07-17 13:06:51 +02:00
Marc Zinnschlag
56ed0926bd improved error table layout 2015-07-17 12:45:08 +02:00
Marc Zinnschlag
eab1ec9160 consider script warning settings for script subview 2015-07-17 11:52:59 +02:00
Marc Zinnschlag
9b12b4f1e2 refactored mapping from message severity enum to string 2015-07-16 14:46:02 +02:00
Marc Zinnschlag
2d8a78726d improved error reporting 2015-07-16 14:09:14 +02:00
Marc Zinnschlag
2016ff773f display script errors in script subview 2015-07-16 12:36:20 +02:00
Stanislav Bas
3ba73f5fd9 Handle deleted records in RefCollection 2015-07-15 21:14:00 +03:00
Stanislav Bas
a1389b87ba Return a correct index for a loaded record that was deleted 2015-07-14 23:31:16 +03:00
Stanislav Bas
5e623a2a1d Rework RefIdData code. Update the index map when a new record is loaded 2015-07-14 20:54:24 +03:00
Marc Zinnschlag
df027b3498 hooked up script subview buttons to bottom box (enables add and clone) 2015-07-14 13:52:48 +02:00
Marc Zinnschlag
cf1fb76bb4 fixed deleted button sensitivity state 2015-07-14 13:34:13 +02:00
Marc Zinnschlag
0860c27b03 improving consistency of subview layouts 2015-07-14 11:49:41 +02:00
Marc Zinnschlag
2202973c24 replaced the script subview status bar with a bottom box (including a status bar) 2015-07-14 10:05:45 +02:00
Marc Zinnschlag
fc6c14614b added user settings option to toggle toolbars in single-record subviews 2015-07-13 12:52:18 +02:00
Stanislav Bas
71e5fc7f04 Remove INAM handling from InfoCollection 2015-07-13 11:27:32 +03:00
Marc Zinnschlag
749eff5259 renaming a few user settings categories 2015-07-13 09:42:16 +02:00
Stanislav Bas
74a055f3cc Remove NAME and DELE handling from IdCollection 2015-07-13 10:40:11 +03:00
Stanislav Bas
42f9136141 Remove DELE and NAME handling from RefIdCollection and RefIdData 2015-07-12 15:22:51 +03:00
Marc Zinnschlag
b97a4cee44 added button bar to script subview 2015-07-11 16:09:13 +02:00
MiroslavR
13f289d1a5 Fix calculation of selected blocks in ScriptEdit 2015-07-06 16:35:45 +02:00
Stanislav Bas
47d21ff4b3 Add edit locking to ExtendedCommandConfigurator 2015-07-05 22:49:48 +03:00
Stanislav Bas
3c6bc74062 Close the extended configurator when all respective records were removed outside 2015-07-05 22:10:37 +03:00
Marc Zinnschlag
6c5dc5c7a0 Merge remote-tracking branch 'smbas/fix-cell-creating' 2015-07-05 20:43:59 +02:00
Stanislav Bas
ceb3dea55c Rewording of the user setting for extended configuration 2015-07-05 20:11:21 +03:00
Stanislav Bas
6162a46fbe Update to upstream/master. Resolve the merge conflict 2015-07-05 16:15:48 +03:00
Marc Zinnschlag
ea1ddb5c9f Merge remote-tracking branch 'smbas/feature-dialogue-edit-id' 2015-07-05 14:44:33 +02:00
Stanislav Bas
3ffa0aa185 Count of nested columns can be retrieved for a collection with no records 2015-07-05 15:36:41 +03:00
Stanislav Bas
4fbd24206b ExtendedCommandConfigurator: layout changes 2015-07-04 20:47:10 +03:00
Stanislav Bas
880bc31ddf TableBottomBox: Creator/Configurator can be closed via Escape 2015-07-04 20:30:02 +03:00
Stanislav Bas
c1b06538dc Add Edit 'ID' action for nested fields 2015-07-04 19:55:48 +03:00
Stanislav Bas
30fd711a47 TableEditIdAction: prevent creation of a UniversalId with Type_None 2015-07-04 19:39:53 +03:00
Stanislav Bas
86dc5a2c67 Add Edit 'ID' action for nested tables 2015-07-04 19:27:59 +03:00
Stanislav Bas
464e674a81 Rework Table (view) code to use a TableEditIdAction 2015-07-04 18:51:39 +03:00
Stanislav Bas
6b34845168 Create a separate class for Edit 'ID' action to use in tables' context menus 2015-07-04 18:49:32 +03:00
Stanislav Bas
1f826476ff Fix build error 2015-07-04 02:02:22 +03:00
Stanislav Bas
ff3c9a6fb2 ExtendedCommandConfigurator: the perform button is now the default for the widget 2015-07-03 23:35:00 +03:00
Stanislav Bas
e664ef7578 ExtendedCommandConfigurator: the perform button takes the name of the command that is executed 2015-07-03 23:15:26 +03:00
Stanislav Bas
05cc130212 The configuration panel gets a focus when opening 2015-07-03 22:31:38 +03:00
Stanislav Bas
95d16b24c0 ExtendedCommandConfigurator: disable the perform button when all tables are unchecked 2015-07-03 22:25:56 +03:00
Stanislav Bas
260f6f22ae TableBottomBox adjusts its size according to the current widget size 2015-07-03 22:07:37 +03:00
Stanislav Bas
d73fd471c3 IdContextMenu: don't add Edit action if it's already in the context menu 2015-07-03 19:07:44 +03:00
Stanislav Bas
61ab0ba482 Prevent the Edit 'ID' action for the current ID of the dialogue subview 2015-07-03 18:48:13 +03:00
Stanislav Bas
149cb9d004 IdContextMenu: if the ID field is empty show the standard context menu (if available) 2015-07-03 16:51:47 +03:00
Stanislav Bas
e8e34f37dd Edit 'ID' action is available in dialogue sub-views (for LineEdits and Labels) 2015-07-03 16:24:08 +03:00
Stanislav Bas
47b66b57ae Create a context menu handler for dialogue editors with ID information 2015-07-03 15:37:10 +03:00
Marc Zinnschlag
382cdb8c60 implemented sorting in report views (Fixes #2540) 2015-07-03 10:45:08 +02:00
scrawl
2385938485 Fix a typo 2015-07-03 02:42:40 +02:00
Stanislav Bas
12bf3694bd Rework widget layout of ExtendedCommandConfigurator 2015-07-02 22:05:45 +03:00
Stanislav Bas
b8772c6902 Add the ability to configure extended commands for tables 2015-07-02 20:44:59 +03:00
Stanislav Bas
fcf69555f4 Add the user setting for enabling the configuration of extended commands 2015-07-02 20:41:32 +03:00
Stanislav Bas
ba762ec1c1 Add the configuration widget to the bottom box 2015-07-02 17:21:47 +03:00
Stanislav Bas
1949fe4bf9 Add the configuration widget for extended commands 2015-07-02 15:47:12 +03:00
Stanislav Bas
1afa22f443 Add the RecordType column to the MetaData table 2015-07-01 21:36:17 +03:00
Stanislav Bas
51a2d4ef5a Merge remote-tracking branch 'upstream/master' 2015-06-30 13:50:33 +03:00
Marc Zinnschlag
d3bcf0711c Merge remote-tracking branch 'smbas/feature-cloning-enhancements' 2015-06-30 10:40:28 +02:00
Stanislav Bas
e2103287aa Not accepted drag event must be ignored 2015-06-30 01:08:42 +03:00
scrawl
1956e2c988 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
 2015-06-28 00:38:39 +02:00
Stanislav Bas
e4d52ff9b0 Deleted records can be cloned 2015-06-28 00:31:41 +03:00
Stanislav Bas
9d274ee156 Merge branch 'master' into feature-cloning-enhancements 2015-06-27 22:02:31 +03:00
Stanislav Bas
81c7ce5b06 Add the proper getErrors() method to CellCreator. 
Fix the impossibility of the Exterior Cell creation.
 2015-06-27 21:59:16 +03:00
Marc Zinnschlag
15bb2855a9 disable prev/next buttons if there is no previous/next record 2015-06-27 16:57:45 +02:00
Marc Zinnschlag
e27a75bd10 added user setting for cyclic prev/next 2015-06-27 15:56:41 +02:00
Marc Zinnschlag
95522fcad2 more general cleanup 2015-06-27 15:29:54 +02:00
Marc Zinnschlag
9aa153984a fixed inconsistent handling of deleted records in dialogue; general cleanup 2015-06-27 15:02:50 +02:00
Marc Zinnschlag
a8c26ec0c1 moved most of the code for next/prev buttons from DialogueSubView to RecordBUttonBar 2015-06-27 14:42:22 +02:00
Marc Zinnschlag
d5e6d8a58b disable dialogue subview buttons while document is locked 2015-06-27 14:25:48 +02:00
Marc Zinnschlag
6769479358 moved code for initiating record cloning from DialogueSubView to RecordButtonBar 2015-06-27 13:47:07 +02:00
Marc Zinnschlag
7f1129df3b cleaned up DialogueSubView constructor; moved bottom box below button bar 2015-06-27 12:53:46 +02:00
Marc Zinnschlag
49dc30683f refactored dialogue subview button bar into a new class 2015-06-27 12:49:56 +02:00
Stanislav Bas
cbb124ab4f Close the creator when the original record is removed (in clone mode) 2015-06-27 12:26:19 +03:00
Stanislav Bas
cad4ce4e0f Cell type can be changed when cloning a cell 2015-06-27 11:47:59 +03:00
Stanislav Bas
5761ec428d Creating/cloning Cell sets the proper Interior flag 2015-06-26 23:38:20 +03:00
Stanislav Bas
f3bb00e3d9 Add the ability to add nested values to the Create command 2015-06-26 22:16:12 +03:00
Stanislav Bas
a7f31988d1 Add the ability to search a nested column index 2015-06-26 22:14:11 +03:00
Marc Zinnschlag
6d5823e8aa killed some tabs 2015-06-26 18:54:49 +02:00
Marc Zinnschlag
fdf6645dbc Merge remote-tracking branch 'smbas/fix-info-tables' 2015-06-26 18:47:16 +02:00
Marc Zinnschlag
654e7428aa Merge remote-tracking branch 'smbas/master' 2015-06-26 18:39:40 +02:00
Marc Zinnschlag
2dada1a162 Merge branch 'meta' 2015-06-26 18:37:39 +02:00
Marc Zinnschlag
4487bda702 size limits for meta data strings 2015-06-26 18:19:00 +02:00
Marc Zinnschlag
a4c2c75d1f fixed overwriting of meta data when loading project file 2015-06-26 16:22:06 +02:00
Marc Zinnschlag
1e033fa8fe added meta data dialogue sub view 2015-06-26 16:11:00 +02:00
Marc Zinnschlag
57015f3666 fixed handling of numeric read-only fields in dialogue sub views 2015-06-26 15:50:36 +02:00
Marc Zinnschlag
10fbe6aada split DialogueSubView in SimpleDialogueSubView and DialogueSubView 2015-06-26 15:17:47 +02:00
Marc Zinnschlag
5a37530c1c added missing MetaData table UniversalId type 2015-06-26 15:17:18 +02:00
Marc Zinnschlag
1870b087e7 ported setting of meta data for saving to the new mechanism 2015-06-26 13:13:22 +02:00
Marc Zinnschlag
f3ff90e1fd moved meta data into a new single-row table 2015-06-26 13:01:25 +02:00
Stanislav Bas
feeb9ea8b0 Merge remote-tracking branch 'upstream/master' 2015-06-26 12:10:51 +03:00
Stanislav Bas
ea97b0a20c Refine InfoTableProxyModel::getFirstInfoRow() code 2015-06-25 20:08:42 +03:00
Stanislav Bas
844e5c504d Fix conversion to QString 2015-06-25 19:41:26 +03:00
Stanislav Bas
867ce686ae Proper conversion to QString for DropLineEdit::dropEvent() 2015-06-25 19:30:53 +03:00
Marc Zinnschlag
8fbc799655 Merge remote-tracking branch 'cc9cii/master' 2015-06-25 14:06:22 +02:00
Marc Zinnschlag
69db0179ca update refresh menu item on stateChanged signal instead of when opening the menu 2015-06-25 13:05:57 +02:00
cc9cii
c0f3d70f06 Use the new severity message attribute. 2015-06-25 20:23:43 +10:00
cc9cii
71f3b7ed4f Fix crash when user preference is missing. 2015-06-25 20:21:51 +10:00
Marc Zinnschlag
6fbdbb11d5 added refrash menu item to report table (Fixes #2620) 2015-06-25 12:03:40 +02:00
Stanislav Bas
d282bead23 InfoCreator accepts drops of Topic/Journal ID 2015-06-25 11:24:19 +03:00
Stanislav Bas
5b82b9d9d0 ReferenceCreator accepts drops of Cell ID 2015-06-25 11:20:35 +03:00
Stanislav Bas
21f0b586ec Rows with the same topic but in different letter case can be reordered 2015-06-24 20:01:29 +03:00
Marc Zinnschlag
e29d9bcc8e use a namespace instead of a class with only static functions 2015-06-24 17:29:47 +02:00
Marc Zinnschlag
b0aad9c8cb Merge remote-tracking branch 'smbas/feature-improved-dragndrop' 2015-06-24 17:20:43 +02:00
Stanislav Bas
270c17faa7 Prevent drops on non-editable table cells 2015-06-24 16:36:09 +03:00
Stanislav Bas
d1339a643a Fix for NestedTableProxyModel::forwardDataChanged() 2015-06-24 15:07:09 +03:00
scrawl
a5670b5133 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
	apps/openmw/mwworld/player.hpp
 2015-06-22 20:09:02 +02:00
Stanislav Bas
d606b62688 Nested tables accept drops 2015-06-21 21:35:00 +03:00
Stanislav Bas
b9882eb59a DragRecordTable checks drag type before accepting it 2015-06-21 18:40:13 +03:00
Stanislav Bas
a23de394f8 Refine DropLineEdit code 2015-06-21 17:16:13 +03:00
Stanislav Bas
2565452052 Add some drag'n'drop utils to work with TableMimeData 2015-06-21 17:08:10 +03:00
Stanislav Bas
dc37aea8eb Add missing mappings to TableMimeData 2015-06-20 21:00:15 +03:00
Stanislav Bas
7dcdd130bb Rework Dialogue subview code according to DropLineEdit changes 2015-06-20 20:52:47 +03:00
Marc Zinnschlag
c644f15167 calm down travis 2015-06-20 19:46:38 +02:00
Marc Zinnschlag
b9f6baf317 add normal script warnings mode (Fixes #2642) 2015-06-20 19:16:15 +02:00
Marc Zinnschlag
197b8ec731 added severity attribute for operation messages (Fixes #2717) 2015-06-20 19:08:31 +02:00
Marc Zinnschlag
8791832c86 standarised on the use of the Message struct when passing operations messages around 2015-06-20 17:56:42 +02:00
Stanislav Bas
64701b273d LineEdits for ID values accept drops with a proper type 2015-06-20 18:29:31 +03:00
Marc Zinnschlag
0e21c61297 replaced redundant CSMTools::ReportModel::Line struct with CSMDoc::Message struct 2015-06-20 16:55:34 +02:00
Stanislav Bas
27ece7f36a Rework DropLineEdit. Make it type-sensitive 2015-06-20 17:33:36 +03:00
Marc Zinnschlag
9a102f81c8 added setting for controlling script compiler warnings 2015-06-20 16:21:04 +02:00
Marc Zinnschlag
1ee1934053 framework for accessing user settings in operation stages 2015-06-20 16:20:31 +02:00
Stanislav Bas
ced4e237a8 Fix the sorting of Info tables when new row are added 2015-06-20 12:43:53 +03:00
Marc Zinnschlag
8aba52170f fixed a build error 2015-06-20 11:34:32 +02:00
Stanislav Bas
f1a38ffe93 InfoTableProxyModel: ignore the letter case in the search of the first Topic/Journal row 2015-06-20 11:29:15 +03:00
Stanislav Bas
170692b480 InfoTableProxyModel: invalidate first row cache after row insertion/deletion 2015-06-19 19:24:06 +03:00
Stanislav Bas
e212414bc7 Use an ID parent type as the collection ID in GenericCreator. 
Fix impossibility of creation/cloning records from Dialogue subviews in Info tables
 2015-06-19 13:49:48 +03:00
Stanislav Bas
581ba55db9 Add Topic/Journal Id completion to InfoCreator 2015-06-19 12:51:50 +03:00
Stanislav Bas
a6734a0ea4 Add Cell Id completion to ReferenceCreator 2015-06-19 11:50:02 +03:00
Stanislav Bas
36271f25ec Rework creator factories to accept Document as a parameter 2015-06-18 22:59:40 +03:00
Marc Zinnschlag
d5bc561d17 Merge remote-tracking branch 'smbas/feature-color-picking' 2015-06-18 16:37:49 +02:00
Marc Zinnschlag
88d1f158d0 made double click behaviour in report tables configurable (Fixes #2622) 2015-06-18 16:36:27 +02:00
scrawl
c719b7038e Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-06-18 15:00:21 +02:00
scrawl
76799982a5 Add missing include 2015-06-18 14:56:43 +02:00
Stanislav Bas
cf487581f7 Show the pop-up of ColorEditor immediately after the editor creation in tables 2015-06-18 12:50:46 +03:00
Marc Zinnschlag
12e0873446 Merge remote-tracking branch 'smbas/feature-info-tables-sorting' 2015-06-18 10:31:44 +02:00
Marc Zinnschlag
63d46f7e66 removed an unused variable 2015-06-18 10:26:35 +02:00
Marc Zinnschlag
0b32b24d60 Merge remote-tracking branch 'smbas/fix-enumdelegates' 2015-06-18 10:21:27 +02:00
Stanislav Bas
c60fed89ac Enable sorting for Info tables 2015-06-17 23:50:18 +03:00
Stanislav Bas
a6624ca576 Cache topic/journal first rows in InfoTableProxyModel 2015-06-17 23:46:51 +03:00
Stanislav Bas
2e40b68862 Add a custom proxy model for Info tables 2015-06-17 22:47:39 +03:00
Stanislav Bas
ed09424223 Correct the position of the colored rectangle in ColorEditor and ColorDelegate 2015-06-17 00:45:43 +03:00
Stanislav Bas
850f612c8b Merge branch 'master' into feature-color-picking 2015-06-16 22:39:12 +03:00
Stanislav Bas
1e368de289 Adjust columns of nested tables when a dialog subview is opened 2015-06-16 21:47:27 +03:00
Stanislav Bas
6cfee630aa Proper size hint for DataDisplayDelegate 2015-06-16 21:25:06 +03:00
scrawl
3663511cdb Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
 2015-06-16 19:53:41 +02:00
Stanislav Bas
2c1ca33a20 Refactor Enum- and DataDisplayDelegate code 2015-06-16 15:39:54 +03:00
Stanislav Bas
0ffb2bc6bc Proper size hint for EnumDelegate 2015-06-16 14:18:47 +03:00
Marc Zinnschlag
62c5f185d7 Merge remote-tracking branch 'cc9cii/master' 2015-06-16 12:30:21 +02:00
cc9cii
6a47ea9a67 fix typo 2015-06-16 13:09:44 +10:00
cc9cii
cccf6c6bdd Rebuild the list of available content files when opening the open/new dialogues. Should resolve Bug #2644. 2015-06-16 12:48:45 +10:00
Stanislav Bas
d906a9d7d1 DataDisplayDelegate doesn't draw a text outside a table cell 2015-06-16 00:19:51 +03:00
scrawl
609e146a22 Build fixes for windows 2015-06-15 16:48:18 +02:00
Marc Zinnschlag
675884ba30 Merge remote-tracking branch 'smbas/feature-soundgen-verifier' 2015-06-15 16:25:11 +02:00
scrawl
412e001edb Fix simulation time reset in OpenCS when opening a new view 2015-06-14 19:19:23 +02:00
scrawl
cad18969e3 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
	apps/openmw/mwmechanics/aitravel.cpp
 2015-06-14 16:32:13 +02:00
Marc Zinnschlag
e17f7ac81a Merge remote-tracking branch 'cc9cii/master' 2015-06-14 12:50:10 +02:00
scrawl
f70250a296 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/launcher/CMakeLists.txt
	apps/opencs/CMakeLists.txt
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/CMakeLists.txt
	components/CMakeLists.txt
	extern/osg-ffmpeg-videoplayer/CMakeLists.txt
 2015-06-13 21:11:24 +02:00
Stanislav Bas
281088c93b Add check for an empty sound field to SoundGens verifier 2015-06-13 19:47:39 +03:00
Stanislav Bas
2c15ad5e0c Add SoundGens verifier 2015-06-13 19:08:31 +03:00
cc9cii
5b6984d8d8 Set modified flag in setData() operations, without which the changes weren't being saved. Should resolve Bug #2656. 2015-06-13 22:24:22 +10:00
Marc Zinnschlag
c560f8b8a2 Merge remote-tracking branch 'smbas/fix-regionmap-colors' 2015-06-13 11:33:12 +02:00
cc9cii
b81454d226 Fix using wrong bit flag for NPC stats auto-calculation. Also set the corresponding mNpdtType which is used when determining which data structure to save. Should resolve Bug #2668. 2015-06-13 14:37:47 +10:00
Stanislav Bas
a294e24a85 Reset ColorEditor checked state after the popup is hidden 2015-06-13 00:37:10 +03:00
Stanislav Bas
b06d1f008f Redraw the color editor immediately after the color is updated 2015-06-12 23:34:08 +03:00
Stanislav Bas
f19d07b404 Rename ColorPickerDelegate to ColorDelegate 2015-06-12 23:09:31 +03:00
Stanislav Bas
650e37dba1 RegionMap uses proper colors 2015-06-12 22:31:12 +03:00
Stanislav Bas
e516d37cbf MapColourColumn::set() uses the correct color value 2015-06-12 22:03:47 +03:00
Stanislav Bas
caeba1b887 Draw the frame around rect in ColorEditor and ColorPickerDelegate 2015-06-12 20:34:35 +03:00
Stanislav Bas
eb5180ba86 Save selected color in a model when picking is finished 2015-06-12 18:33:55 +03:00
scrawl
e13a938896 Add support to build with Qt5 (Task #2665) 
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
 2015-06-12 15:13:42 +02:00
Stanislav Bas
4096d2851c Remove outdated ColorEditButton files 2015-06-12 14:09:25 +03:00
scrawl
cf95d3fc35 Refactor cmake scripts, reducing the amount of find_package(Boost) 2015-06-12 01:45:19 +02:00
scrawl
fc5176dc38 Refactor cmake scripts, reducing the amount of find_package(Qt4) 2015-06-11 23:38:08 +02:00
scrawl
d03880fbf0 Compile fix for old boost versions 2015-06-11 23:25:26 +02:00
Stanislav Bas
e257c915bf Add color picker popup to choose color 2015-06-12 00:00:23 +03:00
scrawl
6051c47eef Fix for incorrect QString -> path conversion 2015-06-11 22:36:19 +02:00
Marc Zinnschlag
8d22d26669 Merge remote-tracking branch 'cc9cii/scrollbar-fix' 2015-06-10 18:51:14 +02:00
Stanislav Bas
ef88b28c26 Create a custom item editor for color columns 2015-06-09 15:20:50 +03:00
Stanislav Bas
d7fb497255 Color values are displayed as colored rectangles in tables 2015-06-08 21:33:23 +03:00
Alexander "Ace" Olofsson
cd42448cd6 Windows build fixes and CMakeLists cleanup 
Adds some flags necessary to build and link with OSG.
This also moves LTO and MP switches to user-accessible options, and actually
applies the generated CXXFLAGS to the project. Since the generation
happens after the subdirectories are added.
 2015-06-08 15:41:39 +02:00
cc9cii
893ad11be1 Fix missing columns in tables. Should resolve Bug #2624. 
- Using Flag_Table in filterAcceptsColumn() does not work.
- Workaround by not allowing nested columns in sorting and filtering.
 2015-06-08 08:04:18 +10:00
scrawl
e66e9916db Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/document.hpp
 2015-06-07 15:23:54 +02:00
Marc Zinnschlag
d90aff4303 Merge remote-tracking branch 'smbas/feature-id-completion' 2015-06-07 08:52:44 +02:00
Stanislav Bas
d63b01dde3 Checkboxes in the table view use a combobox editor 2015-06-06 15:41:25 +03:00
cc9cii
5c37079f0c Include only the columns that are visible for sorting. Should resolve Bug #2611. 2015-06-05 12:19:21 +10:00
scrawl
958b34771a Fix clang warnings about 'typename' outside of a template 2015-06-04 20:42:05 +02:00
scrawl
4bb3cbf0fb Remove last remains of Ogre 2015-06-03 23:04:35 +02:00
scrawl
1ba3fa4169 Remove leftovers of the old OpenCS navigation 2015-06-03 18:11:34 +02:00
Stanislav Bas
bd46ddcf47 Correct the return type in IdTree::data() for Display_Role 2015-06-03 15:51:34 +03:00
Stanislav Bas
b25cc6bc55 IdCompletionManager uses Display type instread of ColumnId for creating completers 2015-06-03 12:01:13 +03:00
scrawl
974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
 2015-06-03 03:18:29 +02:00
scrawl
cd47dff196 Minor cleanup 2015-06-03 03:03:16 +02:00
scrawl
cdd0623009 Terrain rendering 2015-06-03 01:35:41 +02:00
Stanislav Bas
4e759370de Change Display_String to the proper display type where appropriate 2015-06-03 00:02:53 +03:00
Stanislav Bas
f84c36b500 CommandDelegate: extract a display type from a model if it isn't specified 2015-06-03 00:00:39 +03:00
Stanislav Bas
2c4025ec72 Rename the method isCompleterExistFor() to hasCompleterFor() 2015-06-02 00:26:31 +03:00
Marc Zinnschlag
b866e11873 Merge remote-tracking branch 'cc9cii/pathgrid-check-extra' 2015-06-01 16:49:28 +02:00
Stanislav Bas
dbe61115b2 Fix the mistyping header guard in the idcompletiondelegate.hpp 2015-05-31 18:22:43 +03:00
Stanislav Bas
e636101725 Add missing new lines at the ends of files 2015-05-31 18:18:49 +03:00
Stanislav Bas
9e405b69fa Create the custom completer popup to avoid the problem with the wrong height of the default popup 2015-05-31 16:43:28 +03:00
Stanislav Bas
994c6833bc Add missing columns for the ID completion 2015-05-30 23:54:16 +03:00
Stanislav Bas
e943d17b29 Check for invalid index in IdTable::flags(). This prevents QCompleter from crashes 2015-05-30 22:01:21 +03:00
Stanislav Bas
602f33bd91 Add ColumnId role to the IdTree data methods 2015-05-30 21:30:25 +03:00