cc9cii
ade7f09203
Keep track of terrain in physics engine. Should resolve crash exiting after opening multiple subviews of the same cell.
2014-11-01 00:03:09 +11:00
cc9cii
ac7acb2c22
Disable more debug code.
2014-10-31 22:21:24 +11:00
cc9cii
4f685092fb
Merge remote-tracking branch 'remotes/upstream/master' into mouse-picking
2014-10-31 22:05:24 +11:00
cc9cii
aa7b693a13
Remove debug settings and minor cleanup.
2014-10-31 22:04:10 +11:00
cc9cii
fbadaf55ee
Multiple SceneManagers per physics engine now working.
2014-10-31 21:50:57 +11:00
Marc Zinnschlag
ac58dd735b
do not crash on exceptions while adding startup scripts
2014-10-31 11:02:42 +01:00
Marc Zinnschlag
4fa0bf63c5
Merge remote-tracking branch 'scrawl/master'
2014-10-31 08:18:18 +01:00
scrawl
45f14f0704
Fix stolen faction-owned items not being confiscated
2014-10-31 00:25:37 +01:00
cc9cii
a2ac4c7650
Allow multiple scene managers per physics engine. Compiles but does not work properly.
2014-10-31 08:18:15 +11:00
Marc Zinnschlag
8ed3454774
Merge remote-tracking branch 'corristo/unshiled-include-fix'
2014-10-29 14:49:04 +01: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
Nikolay Kasyanov
0dc08e2983
Properly add libunshiled include dir
2014-10-29 11:26:06 +02:00
Alexander "Ace" Olofsson
c1ce570e37
Use the enum value from Qt::KeyboardModifiers
...
This fixes the windows build at least
2014-10-29 04:55:06 +01: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
scrawl
f7ba1dbfc8
Add error handling for getPcRank and similar defines ( Fixes #2071 )
2014-10-28 16:07:37 +01:00
cc9cii
68b7532383
Move code to WorldspaceWidget so that UnpagedWorldspaceWidget can be supported.
2014-10-29 00:50:48 +11:00
scrawl
e48dc45ede
Fix creatures not being able to move with 0/0 encumbrance
2014-10-27 21:53:00 +01:00
scrawl
c194226d08
Increase maximum height for finding spawn points to 500 ( Fixes #2056 )
2014-10-27 21:52:59 +01:00
scrawl
aa02974d3b
Fix Journal instruction for non-existing journal indices ( Fixes #2063 )
2014-10-27 21:52:59 +01: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
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
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
4680bc6c93
Merge branch 'master' of https://github.com/OpenMW/openmw
2014-10-25 19:59:23 +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
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
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
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
