Thoronador
|
ab364c9440
|
fix some more uninitialized class member fields
|
2014-10-11 00:50:32 +02:00 |
|
cc9cii
|
3e5027abbb
|
Incorporate terrain height to labels and camera.
|
2014-10-10 13:36:16 +11:00 |
|
cc9cii
|
bfd10a03c0
|
User configuration manager's resource directory.
|
2014-10-10 13:35:14 +11:00 |
|
cc9cii
|
406135ee96
|
Merge remote-tracking branch 'upstream/master' into terrain
|
2014-10-09 23:47:30 +01:00 |
|
Marc Zinnschlag
|
c85735abed
|
Merge remote-tracking branch 'scrawl/terrain'
|
2014-10-09 12:56:42 +02:00 |
|
cc9cii
|
13f028e27b
|
Avoid out of range exceptions.
|
2014-10-09 07:01:18 +11:00 |
|
cc9cii
|
b3ef7a71e2
|
Different implementation of update overlay fix.
|
2014-10-09 05:56:44 +11:00 |
|
scrawl
|
8786fb639f
|
Implement terrain rendering in OpenCS (Fixes #1597)
|
2014-10-08 17:17:31 +02:00 |
|
cc9cii
|
5d8022bdc5
|
Update overlay upon control elements button signal.
|
2014-10-08 21:22:12 +11:00 |
|
cc9cii
|
e2560de05a
|
Don't use windows path separator.
|
2014-10-08 08:08:03 +11:00 |
|
cc9cii
|
e1197e75bc
|
Handle change of names or regions to dynamically update the overlay.
|
2014-10-08 07:54:22 +11:00 |
|
cc9cii
|
7836ee9ab6
|
Fixed crash exiting internal cells. Better starting camera position for external cells.
|
2014-10-07 21:18:32 +11:00 |
|
cc9cii
|
0cccdfd114
|
Added description below the cell id (name if exists, or region)
|
2014-10-07 19:35:28 +11:00 |
|
cc9cii
|
7640875f9d
|
More cleanup.
|
2014-10-07 10:34:30 +11:00 |
|
cc9cii
|
f48f841d31
|
Add full path for Ogre Overlay headers (workaround for osx).
|
2014-10-07 06:40:28 +11:00 |
|
cc9cii
|
0197f7088f
|
Remove extra frame rendering after enabling/disabling the label.
|
2014-10-07 06:04:13 +11:00 |
|
cc9cii
|
b3e09cce00
|
Remove mouse picking code.
|
2014-10-06 22:29:45 +11:00 |
|
cc9cii
|
972c789060
|
Add Ogre Overlay path to cmake.
|
2014-10-06 20:25:09 +11:00 |
|
cc9cii
|
cc6153eb8e
|
Removed temporary key bindings.
|
2014-10-06 14:21:44 +11:00 |
|
cc9cii
|
6d687993b8
|
Remove C++11 stuff.
|
2014-10-06 14:08:35 +11:00 |
|
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.
|
2014-10-06 13:55:36 +11:00 |
|
cc9cii
|
dbb2781817
|
Mouse click on text overlay implemented. Removed 'm' keybinding for overlay toggle. White lines not visible by default.
|
2014-10-06 08:20:09 +11:00 |
|
cc9cii
|
85d93807c5
|
Working version. White lines still present. Marker toggle hard-coded to 'm' key. Mouse events not implemented.
|
2014-10-05 19:25:37 +11:00 |
|
cc9cii
|
c9e054cdd7
|
Merge remote-tracking branch 'remotes/upstream/master' into QtOgre
This reverts commit 0b133d5c2e0d258274ef5f272d7c1a185225673a, reversing
changes made to 3aea1bf5f9 .
|
2014-10-04 06:20:10 +10:00 |
|
Marc Zinnschlag
|
9fd82212b3
|
Merge remote-tracking branch 'cc9cii/opencs-settings'
|
2014-10-03 13:11:05 +02:00 |
|
cc9cii
|
5ffb740120
|
Fix silly mistake (thanks scrawl for picking that up)
|
2014-10-01 07:19:15 +10:00 |
|
cc9cii
|
a9745cce1e
|
Suppress some compiler warnings.
|
2014-09-30 21:02:31 +10:00 |
|
cc9cii
|
dee090355f
|
Changes to compile on Ubuntu 14.04.
|
2014-09-30 19:23:19 +10:00 |
|
cc9cii
|
687b62dfd3
|
Revert some changes (mostly iostream adds)
|
2014-09-30 18:46:26 +10:00 |
|
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
|
2014-09-30 10:52:04 +10:00 |
|
cc9cii
|
7675df60ba
|
Fix far clip distance (again), workaround for broken settings minimum value.
|
2014-09-29 08:17:51 +10:00 |
|
cc9cii
|
f0c739b763
|
Apply camera setting changes immediately. Remove current value check for shader setting changes.
|
2014-09-29 06:27:54 +10:00 |
|
cc9cii
|
6e8977348a
|
Check the FSAA setting of windows rather than system value.
|
2014-09-28 19:43:26 +10:00 |
|
cc9cii
|
303b0ee8c6
|
Update scenewidget when antialiasing settings change.
|
2014-09-28 15:43:33 +10:00 |
|
cc9cii
|
8a0ff17c22
|
Update SceneWidget when relevant user settings change.
|
2014-09-28 14:08:14 +10:00 |
|
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.
|
2014-09-28 10:17:54 +10:00 |
|
scrawl
|
7252cb63a6
|
Fix cppcheck issues
|
2014-09-26 17:48:14 +02:00 |
|
cc9cii
|
61bab6b1f1
|
Sanitised version. Some settings are only accessible via manually editing the config file.
|
2014-09-25 08:15:07 +10:00 |
|
cc9cii
|
67503c93b2
|
Added some scenewidget user settings but noticed during testing that the spinbox view resets the value if enter key is pressed.
|
2014-09-23 22:33:49 +10:00 |
|
Marc Zinnschlag
|
1254198d90
|
add debug profiles to scene subviews view drag and drop
|
2014-09-13 18:54:29 +02:00 |
|
Marc Zinnschlag
|
717c1b15f5
|
fixed drop implementation for unpaged worldspace (wasn't updating cell object)
|
2014-09-11 13:08:30 +02:00 |
|
Marc Zinnschlag
|
0db288ce07
|
generalising and cleaning up drop implementation of worldspace widget
|
2014-09-11 13:04:20 +02:00 |
|
Marc Zinnschlag
|
5a9376450b
|
some cleanup of the scene view drop code
|
2014-09-11 11:27:56 +02:00 |
|
Marc Zinnschlag
|
f913d51e35
|
remove deleted debug profiles from run tool
|
2014-09-07 12:55:52 +02:00 |
|
Marc Zinnschlag
|
51128d2d57
|
added run button to scene subview toolbar
|
2014-09-06 16:11:06 +02:00 |
|
gus
|
1ac220593d
|
clean up
|
2014-08-12 21:32:07 +02:00 |
|
gus
|
11922dc53a
|
code is shorter, thanks scrawl
|
2014-08-12 17:41:13 +02:00 |
|
gus
|
465914c77c
|
more clean up
|
2014-08-12 17:20:02 +02:00 |
|
gus
|
321d385a5d
|
clean up
|
2014-08-12 17:18:08 +02:00 |
|
gus
|
d4d8f07bf3
|
clean up
|
2014-08-12 13:32:56 +02:00 |
|
gus
|
e9cc1df69e
|
use QPainter
|
2014-08-12 13:31:32 +02:00 |
|
Marc Zinnschlag
|
1e6d557089
|
Merge branch 'visibility'
|
2014-07-31 14:34:25 +02:00 |
|
Marc Zinnschlag
|
f381451ae0
|
added control element selector toolbar button
|
2014-07-31 14:33:38 +02:00 |
|
Marc Zinnschlag
|
507e5c4f6e
|
explicitly flag scene as modified when changing visibility mask
|
2014-07-31 14:29:52 +02:00 |
|
Marc Zinnschlag
|
439ba57d46
|
added visual element selector toolbar button
|
2014-07-31 14:06:04 +02:00 |
|
Marc Zinnschlag
|
a25758c3b1
|
fixed visibility flags setting
|
2014-07-31 14:02:55 +02:00 |
|
Marc Zinnschlag
|
92d322cbd1
|
added visibility flags
|
2014-07-31 13:25:30 +02:00 |
|
Marc Zinnschlag
|
7a5f73de9e
|
added navigation mode icons to buttons
|
2014-07-30 17:02:23 +02:00 |
|
Marc Zinnschlag
|
4421e7a5cc
|
added lighting mode toolbar icons
|
2014-07-25 11:15:04 +02:00 |
|
gus
|
baf6cca051
|
modified tab to space
|
2014-07-22 13:32:15 +02:00 |
|
gus
|
195767db7f
|
link back to OGre Wiki for some copied past code
|
2014-07-22 12:25:31 +02:00 |
|
gus
|
546b44a3be
|
bugfixes
|
2014-07-22 12:10:58 +02:00 |
|
gus
|
875daed4ec
|
Merge branch 'master' of https://github.com/OpenMW/openmw.git into QtOGre
|
2014-07-22 11:09:53 +02:00 |
|
gus
|
a5058625b3
|
clean up + toggle function for the billboard
|
2014-07-21 18:57:35 +02:00 |
|
gus
|
f8019b4a97
|
added a bilboard with the Cell coord. Can't be toggled off yet, and no clean up too.
|
2014-07-21 18:35:51 +02:00 |
|
Marc Zinnschlag
|
17fc570e38
|
new keyboard shortcut (T): move focus from toolbar to scene widget
|
2014-07-14 13:49:55 +02:00 |
|
Marc Zinnschlag
|
92af093856
|
new keyboard shortcut (T): move focus from scene widget to toolbar
|
2014-07-14 11:19:59 +02:00 |
|
Marc Zinnschlag
|
c2ea8f3f0a
|
added self-adjusting tooltips to the top-level toolbar buttons
|
2014-07-13 14:21:50 +02:00 |
|
Marc Zinnschlag
|
26f87f5d23
|
added navigation mode button tooltips
|
2014-07-13 12:15:05 +02:00 |
|
Marc Zinnschlag
|
490442cf62
|
added lighting mode tooltips
|
2014-07-10 13:18:24 +02:00 |
|
Marc Zinnschlag
|
930f782bc5
|
SceneWidget::setLighting was missing an update call
|
2014-07-10 10:09:21 +02:00 |
|
Marc Zinnschlag
|
03f67cd6bd
|
moved low level widgets from CSVWorld into a separate namespace/directory
|
2014-07-08 12:39:12 +02:00 |
|
Marc Zinnschlag
|
a25321f07e
|
update paged scene view according to changes made to cell records
|
2014-06-30 17:57:38 +02:00 |
|
Marc Zinnschlag
|
5fb2e1a877
|
do not render deleted exterior cells in scene view
|
2014-06-30 17:33:03 +02:00 |
|
Marc Zinnschlag
|
2fe2def64c
|
added cell rendering in paged worldspaces
|
2014-06-29 16:00:06 +02:00 |
|
Marc Zinnschlag
|
a6626b94c8
|
added cell rendering in unpaged worldspaces
|
2014-06-29 14:19:10 +02:00 |
|
Marc Zinnschlag
|
74ed9cbb2d
|
added cell rendering class
|
2014-06-29 14:18:46 +02:00 |
|
Marc Zinnschlag
|
c35b87de95
|
various Object class fixes
|
2014-06-28 11:25:28 +02:00 |
|
Marc Zinnschlag
|
099c406226
|
Merge branch 'objects'
|
2014-06-27 11:55:28 +02:00 |
|
Marc Zinnschlag
|
6020edf60f
|
make preview watch for changes in modification state of relevant records
|
2014-06-27 11:55:02 +02:00 |
|
Marc Zinnschlag
|
36c1170d09
|
fixed some function names
|
2014-06-27 10:35:00 +02:00 |
|
Marc Zinnschlag
|
0c1ad54e68
|
refactored object rendering into a separate class
|
2014-06-27 09:12:26 +02:00 |
|
scrawl
|
e19bbfd1b5
|
Fix OpenCS crash when drag and drop is used with unexpected data, e.g. plain text (Fixes #1543)
|
2014-06-26 20:49:22 +02:00 |
|
slothlife
|
9ea22324f7
|
Fix some MSVC warnings.
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
|
2014-06-23 01:13:30 -05:00 |
|
cc9cii
|
8971db8962
|
SceneWidget windowHandle fix for Windows.
|
2014-05-17 23:53:33 +10:00 |
|
Marek Kochanowicz
|
f51f826dad
|
fixed compilation
|
2014-05-04 15:13:03 +02:00 |
|
Marek Kochanowicz
|
5e99381019
|
Drag and drop works.
|
2014-05-03 14:00:30 +02:00 |
|
Marek Kochanowicz
|
7f1df878f6
|
make getDropType static and public.
|
2014-05-02 20:28:28 +02:00 |
|
Marek Kochanowicz
|
ea1aaef8ca
|
replace paged with unpaged (and vice versa)
|
2014-05-01 18:25:28 +02:00 |
|
Marek Kochanowicz
|
d00dbf47d5
|
working on worldspace drops
|
2014-05-01 15:09:47 +02:00 |
|
Marek Kochanowicz
|
57131332f4
|
fixing minor issues
|
2014-05-01 12:34:54 +02:00 |
|
Marek Kochanowicz
|
6aaa15b2e8
|
paged worldspace drop
|
2014-04-30 15:03:46 +02:00 |
|
Marek Kochanowicz
|
19dac9dc86
|
that would be it
|
2014-04-30 14:27:11 +02:00 |
|
Marc Zinnschlag
|
e0550ba336
|
allow multiple cell coordinates in c-type hint for scene subviews
|
2014-04-07 15:23:14 +02:00 |
|
Marc Zinnschlag
|
0d352cb883
|
replaced rectangular cell selection with a CellSelection object
|
2014-04-07 14:16:02 +02:00 |
|
Marc Zinnschlag
|
5b5069535e
|
keep track of active cells in PagedWorldspaceWidget and update SubView title accordingly
|
2014-04-01 10:04:14 +02:00 |
|
Marc Zinnschlag
|
ed524b2fd4
|
added bright lighting mode
|
2014-03-26 18:29:15 +01:00 |
|
Marc Zinnschlag
|
9746f8bd32
|
added night lighting mode
|
2014-03-26 17:59:42 +01:00 |
|
Marc Zinnschlag
|
fa29942b27
|
added day lighting mode
|
2014-03-26 17:47:56 +01:00 |
|
Marc Zinnschlag
|
d5506172e8
|
added lighting switching
|
2014-03-23 15:14:26 +01:00 |
|