11981 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
cc9cii	a2ac4c7650	Allow multiple scene managers per physics engine. Compiles but does not work properly.	2014-10-31 08:18:15 +11:00
cc9cii	0515159b74	Fix typo.	2014-10-29 23:38:19 +11:00
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.	2014-10-29 23:02:38 +11:00
cc9cii	792fbd119f	Resolve incorrect merge issues.	2014-10-29 10:43:55 +11:00
cc9cii	c990ed4335	Merge branch 'mouse-picking-state' into mouse-picking ... Conflicts: apps/opencs/view/render/pagedworldspacewidget.cpp apps/opencs/view/render/pagedworldspacewidget.hpp	2014-10-29 09:33:48 +11:00
cc9cii	6ca88dc541	Merge branch 'master' into mouse-picking ... Conflicts: apps/opencs/model/settings/usersettings.cpp	2014-10-29 09:28:23 +11:00
cc9cii	8e2a0ea90a	Implemented moving objects around x-y plane.	2014-10-29 08:13:13 +11:00
cc9cii	68b7532383	Move code to WorldspaceWidget so that UnpagedWorldspaceWidget can be supported.	2014-10-29 00:50:48 +11:00
cc9cii	5afaa0083f	Minimise false detection of grab & drag operation.	2014-10-28 06:42:33 +11:00
cc9cii	a01a921644	Experimental mouse event state machine for 3d editing, starting with drag & drop objects.	2014-10-28 06:01:19 +11:00
Marc Zinnschlag	e604fcf282	Merge branch 'double'	2014-10-27 09:56:52 +01:00
Marc Zinnschlag	6f4b753750	replaced regular function call from SubView to View with signal-slot-connection	2014-10-27 09:51:55 +01:00
Marc Zinnschlag	1aef9304e9	replaced the signal/slot user settings update with a regular function call	2014-10-27 09:44:18 +01:00
Marc Zinnschlag	b0a7b457f7	made double click actions in tables configurable	2014-10-27 09:32:02 +01:00
cc9cii	815e832dbb	Merge branch 'master' into mouse-picking-state	2014-10-27 18:57:42 +11:00
Marc Zinnschlag	275bf854ed	added new user setting: window/hide-subview (hide subview titlebar if there is only one subview in the window)	2014-10-27 08:57:18 +01:00
Marc Zinnschlag	5114eee40d	Merge remote-tracking branch 'cc9cii/status-bar'	2014-10-27 07:20:50 +01:00
Marc Zinnschlag	e5a087f8d6	Merge remote-tracking branch 'miroslavr/master'	2014-10-27 07:17:56 +01:00
Marc Zinnschlag	9d15e0d56f	Merge remote-tracking branch 'sandstranger/fixes-shadows-on-glsles-shaders'	2014-10-27 07:16:32 +01:00
sylar	a5b509ca70	Merge branch 'fixes-shadows-on-glsles-shaders' of https://github.com/sandstranger/openmw	2014-11-26 06:56:28 +04:00
sylar	925f1487b0	fix for world_matrix error	2014-11-26 06:55:41 +04:00
cc9cii	6c8320a638	More cleanup.	2014-10-27 12:09:20 +11:00
cc9cii	c2c33eac0f	Minor cleanup.	2014-10-27 08:26:01 +11:00
cc9cii	0b63ba5727	Move debug rendering code out of PhysicsSystem.	2014-10-27 08:08:33 +11:00
cc9cii	dd2c067e17	Cleanup for better legibility.	2014-10-27 06:50:51 +11:00
cc9cii	fb0f85c8db	Report terrain position on cursor position.	2014-10-26 21:15:47 +11:00
cc9cii	95683bc8c3	Add user interface for top level window status-bar setting (implementation already existed). For feature #854.	2014-10-26 15:04:52 +10:00
MiroslavR	450e951b2d	Adjusted book layout to better match vanilla	2014-10-26 01:54:25 +02:00
cc9cii	8b0dc88db8	Use the correct name for deleting objects.	2014-10-26 08:15:18 +11:00
cc9cii	b46df4034d	Cleanup bullet objects in the destructors.	2014-10-26 07:56:51 +11:00
scrawl	dab05471be	Reset crime when bounty is reset to 0 by a script (Fixes #2057)	2014-10-25 21:09:37 +02:00
scrawl	ac067564ea	Don't include al.h in decoder classes, format support check will need to be redone later. For now, resample all formats that might not be supported on any hardware.	2014-10-25 20:50:41 +02:00
scrawl	dc6a99d32a	Add missing virtual destructor	2014-10-25 20:30:42 +02:00
scrawl	4680bc6c93	Merge branch 'master' of https://github.com/OpenMW/openmw	2014-10-25 19:59:23 +02:00
scrawl	c8a273f552	Stats window layout fix	2014-10-25 19:57:01 +02:00
Marc Zinnschlag	aad13e6bff	close view when closing last sub-view unless this view is the last view	2014-10-25 18:13:56 +02:00
scrawl	6126b3b84a	Videoplayer: wait until we have the first picture before returning from playVideo()	2014-10-25 17:27:25 +02:00
scrawl	55c9c0a266	Audio resampling fixes ... - Don't try to use float audio or extended channel layouts if the hardware does not support them - Add channel layout resampling support to ffmpeg_decoder	2014-10-25 17:17:57 +02:00
sylar	c9750dc7c6	fixes shadows on glsles	2014-10-25 19:00:23 +04:00
Marc Zinnschlag	a9f5632afd	extended double click functionality in tables	2014-10-25 16:27:36 +02:00
cc9cii	9337d6533a	Add terrain collision. Support visibility mask for objects and terrain.	2014-10-25 22:09:19 +11:00
Marc Zinnschlag	a87092d11b	Merge remote-tracking branch 'miroslavr/master'	2014-10-25 12:09:36 +02:00
Marc Zinnschlag	a4be214fb1	Merge remote-tracking branch 'scrawl/master'	2014-10-25 12:08:16 +02:00
Marc Zinnschlag	4678d26c22	Merge remote-tracking branch 'cc9cii/master'	2014-10-25 12:07:07 +02:00
Marc Zinnschlag	18b63d2e16	Merge remote-tracking branch 'lgro/issue_1982_long_class_names_are_cut_off'	2014-10-25 12:05:01 +02:00
cc9cii	cc0acec64c	Add settings to enable/disable debug rendering of mouse picking.	2014-10-25 21:02:40 +11:00
cc9cii	dd9208afeb	Merge remote-tracking branch 'upstream/master' into mouse-picking	2014-10-25 10:59:17 +01:00
Lukasz Gromanowski	d7716e7314	Fixes #1982: Long class names are cut off in the UI ... Corrected HBox, AutoSizedTextBox and TextBox positions and alignment. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2014-10-25 09:37:51 +02:00
cc9cii	ea67cf0ebe	Try the fix again.	2014-10-25 15:37:09 +11:00
cc9cii	69d0c7fd70	Cleanup leftover from previous osx support attempts.	2014-10-25 10:40:33 +11:00