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
16645 commits 38 branches 54 tags 122 MiB
Commit graph

470 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Rob Cutmore
d60786b5da Do not show cell markers for interior cells 2016-02-26 07:42:05 -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
Marc Zinnschlag
dececf6c38 instance moving via drag in 3D scenes 2016-02-16 16:02:29 +01: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
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
Rob Cutmore
d28e7db65c Fix tooltip spelling errors in WorldspaceWidget 2016-01-31 08:45:05 -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
scrawl
b0431833a1 Fix some defects reported by Coverity CI 2016-01-21 16:08:04 +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
0305ae3693 added selection mode UI 2016-01-19 12:17:13 +01: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
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
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
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
c646533448 removed old user settings system 2015-12-15 12:49:55 +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
cf9fa0e0e9 first batch of changing over user settings usage to the new system 2015-12-12 14:49:16 +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
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
63ee37d914 added 3D scene tooltips 2015-11-13 11:39:57 +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
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