mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 02:49:55 +00:00
Code Issues Releases Wiki Activity
18775 commits 38 branches 54 tags 122 MiB
Commit graph

2805 commits

Author SHA1 Message Date
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