cc9cii
|
0515159b74
|
Fix typo.
|
10 years ago |
cc9cii
|
1741043f20
|
Revert to storing Scene Node names as the key in RigidBody. Allow moving objects up/down using scroll wheel or touchpad while dragging. Cleanup code a little.
|
10 years ago |
Alexander "Ace" Olofsson
|
c1ce570e37
|
Use the enum value from Qt::KeyboardModifiers
This fixes the windows build at least
|
10 years ago |
cc9cii
|
792fbd119f
|
Resolve incorrect merge issues.
|
10 years ago |
cc9cii
|
c990ed4335
|
Merge branch 'mouse-picking-state' into mouse-picking
Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
apps/opencs/view/render/pagedworldspacewidget.hpp
|
10 years ago |
cc9cii
|
6ca88dc541
|
Merge branch 'master' into mouse-picking
Conflicts:
apps/opencs/model/settings/usersettings.cpp
|
10 years ago |
cc9cii
|
8e2a0ea90a
|
Implemented moving objects around x-y plane.
|
10 years ago |
cc9cii
|
68b7532383
|
Move code to WorldspaceWidget so that UnpagedWorldspaceWidget can be supported.
|
10 years ago |
cc9cii
|
5afaa0083f
|
Minimise false detection of grab & drag operation.
|
10 years ago |
cc9cii
|
a01a921644
|
Experimental mouse event state machine for 3d editing, starting with drag & drop objects.
|
10 years ago |
Marc Zinnschlag
|
e604fcf282
|
Merge branch 'double'
|
10 years ago |
Marc Zinnschlag
|
6f4b753750
|
replaced regular function call from SubView to View with signal-slot-connection
|
10 years ago |
Marc Zinnschlag
|
1aef9304e9
|
replaced the signal/slot user settings update with a regular function call
|
10 years ago |
Marc Zinnschlag
|
b0a7b457f7
|
made double click actions in tables configurable
|
10 years ago |
cc9cii
|
815e832dbb
|
Merge branch 'master' into mouse-picking-state
|
10 years ago |
Marc Zinnschlag
|
275bf854ed
|
added new user setting: window/hide-subview (hide subview titlebar if there is only one subview in the window)
|
10 years ago |
cc9cii
|
6c8320a638
|
More cleanup.
|
10 years ago |
cc9cii
|
c2c33eac0f
|
Minor cleanup.
|
10 years ago |
cc9cii
|
0b63ba5727
|
Move debug rendering code out of PhysicsSystem.
|
10 years ago |
cc9cii
|
dd2c067e17
|
Cleanup for better legibility.
|
10 years ago |
cc9cii
|
fb0f85c8db
|
Report terrain position on cursor position.
|
10 years ago |
cc9cii
|
95683bc8c3
|
Add user interface for top level window status-bar setting (implementation already existed). For feature #854.
|
10 years ago |
cc9cii
|
8b0dc88db8
|
Use the correct name for deleting objects.
|
10 years ago |
cc9cii
|
b46df4034d
|
Cleanup bullet objects in the destructors.
|
10 years ago |
Marc Zinnschlag
|
aad13e6bff
|
close view when closing last sub-view unless this view is the last view
|
10 years ago |
Marc Zinnschlag
|
a9f5632afd
|
extended double click functionality in tables
|
10 years ago |
cc9cii
|
9337d6533a
|
Add terrain collision. Support visibility mask for objects and terrain.
|
10 years ago |
cc9cii
|
cc0acec64c
|
Add settings to enable/disable debug rendering of mouse picking.
|
10 years ago |
cc9cii
|
dd9208afeb
|
Merge remote-tracking branch 'upstream/master' into mouse-picking
|
10 years ago |
cc9cii
|
54a6897df8
|
Use QString rather than std::to_string
|
10 years ago |
cc9cii
|
e5dd8d06a0
|
Store object reference id to RigidBody instead of scene node handles.
|
10 years ago |
cc9cii
|
cb53e714f7
|
Convert PhysicsSystem to a singleton.
|
10 years ago |
cc9cii
|
98ff3e7307
|
No physics or mouse picking for object preview.
|
10 years ago |
Marc Zinnschlag
|
6ff41c6a00
|
intercept shift/ctrl double-clicks in tables
|
10 years ago |
cc9cii
|
2f26fc1188
|
Avoid Ogre exceptions and null pointers.
|
10 years ago |
cc9cii
|
39cd89a9af
|
Make gcc happy.
|
10 years ago |
cc9cii
|
4d86371ca3
|
Minor refactoring and cleanup.
|
10 years ago |
cc9cii
|
cca6d0a024
|
Fixed issue with mouse picking accuracy.
|
10 years ago |
cc9cii
|
fdee3fd919
|
Added debug lines to show ray hit position. Added highlighting the Entity hit by the ray. Incorporated user setting far clip distance.
|
10 years ago |
cc9cii
|
4b53b8658b
|
Debug rendering toggled by double clicking the right mouse button. Raycasting works, but inaccurate.
|
10 years ago |
Marc Zinnschlag
|
843493e90a
|
fixed case-problem in OpenCS script compiler
|
10 years ago |
Marc Zinnschlag
|
94ae222f0e
|
Merge branch 'settings'
|
10 years ago |
Marc Zinnschlag
|
a5bbfff9e2
|
another layout correction
|
10 years ago |
Marc Zinnschlag
|
5a1ce4943e
|
added advance 3D rendering user settings section
|
10 years ago |
cc9cii
|
8bcd415cca
|
Fix duplicate calls to OEngine. Use correct position, rotation and scale. Debug draw not working.
|
10 years ago |
cc9cii
|
03a30c3f1d
|
Experimental, compiles but does not work.
|
10 years ago |
Marc Zinnschlag
|
2106893563
|
silenced a compiler warning regarding null pointer dereferencing
|
10 years ago |
Marc Zinnschlag
|
49938182e8
|
silenced a compiler warning regarding null pointer dereferencing
|
10 years ago |
Marc Zinnschlag
|
a3c894c1e2
|
Merge branch 'cellmarker'
|
10 years ago |
Marc Zinnschlag
|
994159fafd
|
fixed broken iterator
|
10 years ago |
Marc Zinnschlag
|
8a05c0e5c0
|
fixed overlay singleton
|
10 years ago |
Marc Zinnschlag
|
ba46bcad40
|
Revert "Don't allow viewing non-existent cells from the regionmap."
This reverts commit 7cdab41501 .
|
10 years ago |
Marc Zinnschlag
|
4b921c3876
|
user settings cleanup
|
10 years ago |
Marc Zinnschlag
|
ed44f3ec7d
|
added tooltip support to user settings UI
|
10 years ago |
Marc Zinnschlag
|
f4894deff1
|
removed special value text from spin boxes (broken feature, not used anyway)
|
10 years ago |
Marc Zinnschlag
|
dddd20ba1e
|
added default values for display format settings
|
10 years ago |
Marc Zinnschlag
|
799cd87b52
|
name convention and spelling fixes
|
10 years ago |
Marc Zinnschlag
|
e27da6a0d4
|
removed settings file mixup
|
10 years ago |
Marc Zinnschlag
|
c94c1adaf3
|
split off settings page label from internal section name
|
10 years ago |
cc9cii
|
7cdab41501
|
Don't allow viewing non-existent cells from the regionmap.
|
10 years ago |
cc9cii
|
094f046087
|
Convert OverlaySystem to a OpenCS style singleton.
|
10 years ago |
Marc Zinnschlag
|
720ba2c0d8
|
split off settings label from internal settings name
|
10 years ago |
Marc Zinnschlag
|
daf7cab416
|
refactored section handling
|
10 years ago |
Marc Zinnschlag
|
219fbd427f
|
unclutter user settings declarations
|
10 years ago |
Marc Zinnschlag
|
868fdfba51
|
reclaiming some unused space
|
10 years ago |
Marc Zinnschlag
|
e20fa209cc
|
user settings UI layout improvements
|
10 years ago |
cc9cii
|
aff6f6fdb2
|
Setup OverlaySystem after Ogre::Root but before initialisation as per the API documentation.
|
10 years ago |
cc9cii
|
1d0ac3b4df
|
Delete Ogre::OverlaySystem before Ogre::Root
|
10 years ago |
cc9cii
|
8cebfc411b
|
Minor visual improvements.
|
10 years ago |
cc9cii
|
994420aa57
|
Singleton wrapper for Ogre OverlaySystem.
|
10 years ago |
cc9cii
|
57b337d368
|
Fix corruption issue when the initial scenewidget is closed before subsequent ones. Also place the label closer to the terrain height at the center of the cell, should reduce the perception of the label jumping around too much.
|
10 years ago |
Marc Zinnschlag
|
e23a32c44f
|
some cleanup
|
10 years ago |
Marc Zinnschlag
|
8062faa51a
|
fixed member variable access in OpenCS script compiler (Fixes #2011)
|
10 years ago |
Marc Zinnschlag
|
02acf60c0b
|
added tooltips for scopes in creator bar
|
10 years ago |
cc9cii
|
961867e39f
|
Hide overlay if off screen.
|
10 years ago |
cc9cii
|
313aed078e
|
Merge remote-tracking branch 'remotes/upstream/master' into QtOgre
Conflicts:
apps/opencs/CMakeLists.txt
|
10 years ago |
Marc Zinnschlag
|
eb45793eab
|
Merge remote-tracking branch 'thoronador/fix-numeric-limits-usage'
|
10 years ago |
cc9cii
|
43838ccf01
|
Remove override (c++11)
|
10 years ago |
cc9cii
|
e58e5c2bf5
|
Update overlays independently from multiple viewports.
|
10 years ago |
Thoronador
|
46496a35a1
|
fix uninitialized pointer variable in CSVDoc::SubView class
|
10 years ago |
cc9cii
|
47c5bc9a19
|
Set bounding box on manual objects rather than creating meshes.
|
10 years ago |
scrawl
|
9323f96211
|
Move terrainstorage to opencs_units_noqt
|
10 years ago |
cc9cii
|
758ce0ed98
|
Various fixes as per feedback comments.
|
10 years ago |
cc9cii
|
809b8c6d5b
|
Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
|
10 years ago |
Thoronador
|
ab364c9440
|
fix some more uninitialized class member fields
|
10 years ago |
Thoronador
|
51cd2bb5d9
|
remove unused/double variable from CSMWorld::Column class
|
10 years ago |
Thoronador
|
a799353f60
|
fix uninitialized fields in CSMDoc::Operation class
|
10 years ago |
Thoronador
|
deb6452e0d
|
fix uninitialized pointer fields in CS::Editor class
|
10 years ago |
Marc Zinnschlag
|
21b16f8425
|
Merge branch 'tables'
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/world/data.cpp
apps/opencs/model/world/data.hpp
|
10 years ago |
Marc Zinnschlag
|
23e969eae7
|
fixed pathgrid saving again (previous fix was incomplete)
|
10 years ago |
cc9cii
|
3e5027abbb
|
Incorporate terrain height to labels and camera.
|
10 years ago |
cc9cii
|
bfd10a03c0
|
User configuration manager's resource directory.
|
10 years ago |
cc9cii
|
406135ee96
|
Merge remote-tracking branch 'upstream/master' into terrain
|
10 years ago |
Marc Zinnschlag
|
c85735abed
|
Merge remote-tracking branch 'scrawl/terrain'
|
10 years ago |
cc9cii
|
13f028e27b
|
Avoid out of range exceptions.
|
10 years ago |
cc9cii
|
b3ef7a71e2
|
Different implementation of update overlay fix.
|
10 years ago |
scrawl
|
8786fb639f
|
Implement terrain rendering in OpenCS (Fixes #1597)
|
10 years ago |
cc9cii
|
5d8022bdc5
|
Update overlay upon control elements button signal.
|
10 years ago |
cc9cii
|
e2560de05a
|
Don't use windows path separator.
|
10 years ago |
cc9cii
|
4fd7537155
|
Use default sort until a more generic sort that uses numeric order can be implemented.
|
10 years ago |