cc9cii
|
4f685092fb
|
Merge remote-tracking branch 'remotes/upstream/master' into mouse-picking
|
10 years ago |
|
cc9cii
|
aa7b693a13
|
Remove debug settings and minor cleanup.
|
10 years ago |
|
cc9cii
|
fbadaf55ee
|
Multiple SceneManagers per physics engine now working.
|
10 years ago |
|
cc9cii
|
a2ac4c7650
|
Allow multiple scene managers per physics engine. Compiles but does not work properly.
|
10 years ago |
|
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
|
94ae222f0e
|
Merge branch 'settings'
|
10 years ago |
|
Marc Zinnschlag
|
a5bbfff9e2
|
another layout correction
|
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 |
scrawl
|
e413bebe99
|
Toggle addon files when activated or clicked on checkbox rather than clicked (Fixes #1980)
|
10 years ago |
|
Marc Zinnschlag
|
f4894deff1
|
removed special value text from spin boxes (broken feature, not used anyway)
|
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
|
868fdfba51
|
reclaiming some unused space
|
10 years ago |
|
Marc Zinnschlag
|
e20fa209cc
|
user settings UI layout improvements
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
e1197e75bc
|
Handle change of names or regions to dynamically update the overlay.
|
10 years ago |
|
cc9cii
|
7836ee9ab6
|
Fixed crash exiting internal cells. Better starting camera position for external cells.
|
10 years ago |
|
cc9cii
|
0cccdfd114
|
Added description below the cell id (name if exists, or region)
|
10 years ago |
|
cc9cii
|
7640875f9d
|
More cleanup.
|
10 years ago |
|
cc9cii
|
f48f841d31
|
Add full path for Ogre Overlay headers (workaround for osx).
|
10 years ago |
|
cc9cii
|
0197f7088f
|
Remove extra frame rendering after enabling/disabling the label.
|
10 years ago |
|
cc9cii
|
b3e09cce00
|
Remove mouse picking code.
|
10 years ago |
|
cc9cii
|
972c789060
|
Add Ogre Overlay path to cmake.
|
10 years ago |
|
cc9cii
|
cc6153eb8e
|
Removed temporary key bindings.
|
10 years ago |
|
cc9cii
|
6d687993b8
|
Remove C++11 stuff.
|
10 years ago |
|
cc9cii
|
e38417e662
|
Visibility mask implemented. For testing rigged up 'M' and 'N' keys for show/hide.
The scenewidget doesn't receive any mouse events for about a second after toggling the visibility flag. No idea what is causing this.
|
10 years ago |
|
cc9cii
|
dbb2781817
|
Mouse click on text overlay implemented. Removed 'm' keybinding for overlay toggle. White lines not visible by default.
|
10 years ago |
|
cc9cii
|
85d93807c5
|
Working version. White lines still present. Marker toggle hard-coded to 'm' key. Mouse events not implemented.
|
10 years ago |
|
cc9cii
|
c9e054cdd7
|
Merge remote-tracking branch 'remotes/upstream/master' into QtOgre
This reverts commit 0b133d5c2e0d258274ef5f272d7c1a185225673a, reversing
changes made to 3aea1bf5f9.
|
10 years ago |
|
Marc Zinnschlag
|
9fd82212b3
|
Merge remote-tracking branch 'cc9cii/opencs-settings'
|
10 years ago |
|
cc9cii
|
115841d31d
|
Do not save window size on exit.
|
10 years ago |
|
Marc Zinnschlag
|
f4c9897bbd
|
Merge branch 'master' into tables
|
10 years ago |
|
Marc Zinnschlag
|
00073694c6
|
added pathgrid subview
|
10 years ago |
|
cc9cii
|
517a797a3e
|
Remove seemingly unnecessary clearFocus() call (thanks scrawl for help). Fix saving window size on linux.
|
10 years ago |
|
cc9cii
|
5ffb740120
|
Fix silly mistake (thanks scrawl for picking that up)
|
10 years ago |
|
cc9cii
|
a9745cce1e
|
Suppress some compiler warnings.
|
10 years ago |
|
Marc Zinnschlag
|
ff530a2e19
|
added missing magic effect table columns
|
10 years ago |
|
cc9cii
|
dee090355f
|
Changes to compile on Ubuntu 14.04.
|
10 years ago |
|
cc9cii
|
687b62dfd3
|
Revert some changes (mostly iostream adds)
|
10 years ago |
|
cc9cii
|
312b7cd571
|
Merge branch 'master' into QtOGre
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/pagedworldspacewidget.cpp
apps/opencs/view/render/pagedworldspacewidget.hpp
components/nif/niffile.hpp
libs/openengine/bullet/physic.hpp
|
10 years ago |
|
cc9cii
|
7675df60ba
|
Fix far clip distance (again), workaround for broken settings minimum value.
|
10 years ago |
|
cc9cii
|
54c77cf875
|
Silence clang warnings.
|
10 years ago |
|
cc9cii
|
f0c739b763
|
Apply camera setting changes immediately. Remove current value check for shader setting changes.
|
10 years ago |
|
cc9cii
|
6e8977348a
|
Check the FSAA setting of windows rather than system value.
|
10 years ago |
|
cc9cii
|
303b0ee8c6
|
Update scenewidget when antialiasing settings change.
|
10 years ago |
|
cc9cii
|
8a0ff17c22
|
Update SceneWidget when relevant user settings change.
|
10 years ago |
|
cc9cii
|
a25cffc242
|
Fixed default value not being set for spinbox. Changed the default value of max subviews to 256. Simplified the call signature to get settings & set an initial value. Fixed missing settings for num_lights.
|
10 years ago |
|
scrawl
|
7252cb63a6
|
Fix cppcheck issues
|
10 years ago |
|
Marc Zinnschlag
|
23fd314294
|
added magic effects table
|
10 years ago |
|
Marc Zinnschlag
|
33cd04b37d
|
added missing sound gen table columns
|
10 years ago |
|
cc9cii
|
127f9bb30d
|
Fix reverting to wrong version.
|
10 years ago |
|
cc9cii
|
61bab6b1f1
|
Sanitised version. Some settings are only accessible via manually editing the config file.
|
10 years ago |
|
cc9cii
|
31fb160376
|
More cleanup.
|
10 years ago |
|
cc9cii
|
66852d5392
|
Code cleanup and revert incorrect settings.
|
10 years ago |
|
cc9cii
|
fdf375fb4d
|
Reusing subviews implemented.
|
10 years ago |
|
cc9cii
|
3f9b73812b
|
Minor fixes and workarounds.
|
10 years ago |
|
cc9cii
|
970f3609c9
|
Fixed spinbox issue with integer entry via keyboard. Removed shader settings as per feedback comments.
|
10 years ago |
|
cc9cii
|
67503c93b2
|
Added some scenewidget user settings but noticed during testing that the spinbox view resets the value if enter key is pressed.
|
10 years ago |
|
Marc Zinnschlag
|
7ab4881661
|
added sound gen table
|
10 years ago |
|
cc9cii
|
d41230a0c5
|
Tweak the look of the recordfilterbox. Keep titlebar if floating.
|
10 years ago |
|
cc9cii
|
ffae816aab
|
Max subviews setting working. However there is no way to remove the last subview once the title bar is removed and the look of the filter box is broken without the title bar.
|
10 years ago |
|
cc9cii
|
62406d5322
|
Use reasonable values for the spinbox.
|
10 years ago |
|
cc9cii
|
437fb774c5
|
Re-implemented subview minimum size setting.
|
10 years ago |
|
cc9cii
|
c8ae8f4a6d
|
Added minimum width setting for subviews - regionmap, table, scene, preview and dialogue. It should be noted that the setting is not the starting minimum width, i.e. it won't be possible to reduce the width of the subview after the creation. Also, one setting applies to all subviews. It may be desirable to have individual settings.
|
10 years ago |
|
cc9cii
|
c4f11785ec
|
Added a window size change easter egg.
|
10 years ago |
|
cc9cii
|
48f96df29d
|
Fixed checkboxes saving invalid values.
|
10 years ago |
|
Marc Zinnschlag
|
5c8ef842b6
|
Merge branch 'edit'
|
10 years ago |
|
Marc Zinnschlag
|
51151bc43e
|
minor fix
|
10 years ago |
|
cc9cii
|
fc8d6da6a2
|
Added more shader settings.
|
10 years ago |
|
cc9cii
|
71a3880884
|
Added workarounds to add QLabel. Add stylesheet option to apply to View's QGroupBox. RangeViews are now right aligned. Added content margins to the page/tab's layout.
|
10 years ago |
|
cc9cii
|
02f8f54192
|
Fixed checkbox behaviour. Added some shader settings.
|
10 years ago |
|
cc9cii
|
17a74da650
|
Cleaned up comments and dead code.
|
10 years ago |
|
cc9cii
|
dbd1ab05d3
|
Integrated into the original settings design, except using tabs rather than list & stacked widgets. Works but visuals need updating.
|
10 years ago |
|
Marc Zinnschlag
|
9d316a8745
|
Merge branch 'records'
|
10 years ago |
|
Marc Zinnschlag
|
8499ceb35d
|
set default value for topic when cloning info records
|
10 years ago |
|
Marc Zinnschlag
|
8ce87803c4
|
set default value for cell when cloning references
|
10 years ago |
|
Marc Zinnschlag
|
b39cdb7645
|
fixed referenceable cloning (and as a side-effect enabled showing the type of the refereceable in the clone UI)
|
10 years ago |