140 commits

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