teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
12036 commits 34 branches 0 tags 66 MiB
Commit graph

9126 commits

Author SHA1 Message Date
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
cc9cii
e01795556f Suppress some warnings for MSVC. 2014-10-25 10:37:57 +11:00
scrawl
dbe30e31b9 Make creature's model take priority over base_anim.nif (Fixes #2055) 2014-10-25 00:56:43 +02:00
scrawl
b39d69e98c Videoplayer fixes, play/pause & seeking 
- Fix rindex overflow
 - Fix audio sample size bugs (was using sample_fmt and channel count of the decoder, instead of the resampled settings). We didn't notice this bug before, because the OpenAL MovieAudioFactory tries to resample to a format of the same byte size.
 - Add support for play/pause and seeking controls (not used by cutscenes in OpenMW)
 - Closing the video when arriving at the stream end is now handled by the user (we may also want to keep the video open and seek back)

The video player now has a standalone demo, at https://github.com/scrawl/ogre-ffmpeg-videoplayer
 2014-10-24 21:31:11 +02:00
MiroslavR
ed3a3f717f Handle getdistance on objects inside a container (Fixes #2046) 2014-10-24 19:05:43 +02:00
MiroslavR
fa746b8e54 Do not display weight or value in tooltip for zero-weight items (Fixes #2047) 2014-10-24 19:05:43 +02:00
MiroslavR
925fa8d193 Reset ownership of items dropped via 'drop' instruction (Fixes #2053) 2014-10-24 19:04:47 +02:00
scrawl
e2bad395e5 Leak fix 2014-10-24 18:07:17 +02:00
cc9cii
54a6897df8 Use QString rather than std::to_string 2014-10-24 20:43:29 +10:00
cc9cii
e5dd8d06a0 Store object reference id to RigidBody instead of scene node handles. 2014-10-24 21:18:29 +11:00
cc9cii
cb53e714f7 Convert PhysicsSystem to a singleton. 2014-10-24 19:14:02 +10:00
cc9cii
98ff3e7307 No physics or mouse picking for object preview. 2014-10-24 07:57:29 +11:00
Marc Zinnschlag
19b380d0b4 Merge remote-tracking branch 'scrawl/master' 2014-10-23 20:07:40 +02:00
Marc Zinnschlag
6ff41c6a00 intercept shift/ctrl double-clicks in tables 2014-10-23 11:28:58 +02:00
cc9cii
2f26fc1188 Avoid Ogre exceptions and null pointers. 2014-10-23 20:14:01 +11:00
cc9cii
39cd89a9af Make gcc happy. 2014-10-23 18:51:31 +11:00
cc9cii
4d86371ca3 Minor refactoring and cleanup. 2014-10-23 15:35:01 +11:00
cc9cii
cca6d0a024 Fixed issue with mouse picking accuracy. 2014-10-23 12:43:06 +11:00
scrawl
eb1c24ffe6 Refactor video player engine to get rid of MWSound dependencies 
- Split video player to separate source files.
 - Move video player engine sources to extern/ (repository will be set up on github soon).
 - Audio is handled in a MovieAudioFactory, implemented by the user (here in MWSound subsystem).
 - Handle conversion of unsupported channel layouts via ffmpeg's swresample.
 2014-10-22 22:33:32 +02:00
cc9cii
fdee3fd919 Added debug lines to show ray hit position. Added highlighting the Entity hit by the ray. Incorporated user setting far clip distance. 2014-10-23 06:59:14 +11:00
Marc Zinnschlag
c1d867a213 Merge remote-tracking branch 'origin/master' 2014-10-22 09:48:30 +02:00
Marc Zinnschlag
8f0add75f5 Merge remote-tracking branch 'scrawl/master' 2014-10-22 09:42:28 +02:00
Marc Zinnschlag
94d5151273 Merge remote-tracking branch 'miroslavr/master' 2014-10-22 09:39:54 +02:00
scrawl
bcb2d714c0 Add TODO comments for future videoplayer enhancements 2014-10-21 23:46:04 +02:00
cc9cii
4b53b8658b Debug rendering toggled by double clicking the right mouse button. Raycasting works, but inaccurate. 2014-10-22 07:11:04 +11:00
scrawl
41df4289c6 Merge remote-tracking branch 'upstream/openmw-33' into HEAD 
Conflicts:
	apps/openmw/mwworld/store.hpp
 2014-10-21 19:40:58 +02:00
Alexander "Ace" Olofsson
b5a57920b6 Fix compile error on Windows 2014-10-21 19:35:17 +02:00
scrawl
5711103322 Remove leftover comment 2014-10-21 17:51:59 +02:00
scrawl
202cfa879f Implement frame drop support in the videoplayer (Fixes #1343) 2014-10-21 17:01:53 +02:00
scrawl
290aacd2a6 Fix videoplayer crash on quit 
The sound stream thread was trying to update the stream during/after destruction of the video state.
 2014-10-21 17:01:53 +02:00
scrawl
8472695f89 Revert "Fix for compiler warnings and deprecated functions usage in videoplayer." 
This reverts commit d77546b7dc.

Conflicts:
	apps/openmw/mwrender/videoplayer.cpp
 2014-10-21 17:01:53 +02:00
scrawl
de0e0fedff Revert "Fix for compiler warnings and deprecated functions usage in videoplayer." 
This reverts commit f5589b42ea.

Conflicts:
	apps/openmw/mwrender/videoplayer.cpp
 2014-10-21 17:01:53 +02:00
scrawl
681f3fa530 Revert "Removed a warning about comparision between signed and unsigned variable in ffmpeg_decoder." 
This reverts commit b40c1ff26c.
 2014-10-21 17:01:52 +02:00
Marc Zinnschlag
5fdd264d07 Merge remote-tracking branch 'origin/master' 2014-10-21 12:38:35 +02:00
Marc Zinnschlag
843493e90a fixed case-problem in OpenCS script compiler 2014-10-21 12:38:18 +02:00
scrawl
8b3755a770 Compile fix 2014-10-20 17:45:24 +02:00
scrawl
f2877c69d7 Fix old alchemy apparatus still showing in alchemy window after removal 2014-10-20 17:45:18 +02:00
scrawl
192069a181 Add automatic potion naming 2014-10-20 17:45:11 +02:00
scrawl
fd7c181e06 Fix alchemy producing potion IDs from content files 2014-10-20 17:45:06 +02:00
scrawl
9bb51fd9c2 Compile fix 2014-10-20 17:42:51 +02:00
scrawl
ace8e0175b Fix old alchemy apparatus still showing in alchemy window after removal 2014-10-20 17:28:51 +02:00
scrawl
29ac97be7a Add automatic potion naming 2014-10-20 17:28:51 +02:00
scrawl
7f06e3e7e3 Fix alchemy producing potion IDs from content files 2014-10-20 17:07:54 +02:00
MiroslavR
5a7dbb19f7 Code clarity 2014-10-20 01:10:08 +02:00
scrawl
4047e3c928 Properly handle DialInfo records that were marked as Deleted (Fixes #2035) 2014-10-19 17:46:28 +02:00
scrawl
b0f98687e6 Properly handle DialInfo records that were marked as Deleted (Fixes #2035) 2014-10-19 17:45:18 +02:00
Marc Zinnschlag
94ae222f0e Merge branch 'settings' 2014-10-19 13:44:15 +02:00
Marc Zinnschlag
a5bbfff9e2 another layout correction 2014-10-19 13:43:40 +02:00
Marc Zinnschlag
5a1ce4943e added advance 3D rendering user settings section 2014-10-19 13:41:56 +02:00
cc9cii
8bcd415cca Fix duplicate calls to OEngine. Use correct position, rotation and scale. Debug draw not working. 2014-10-19 07:25:54 +11:00
MiroslavR
ed6bdc0bde Use all topics to search for keywords in dialogues (Fixes #2013) 
Move KeywordSearch to MWDialogue
Move hypertext parsing functions to a new file
 2014-10-18 20:07:40 +02:00
scrawl
deabc52c16 Treat "Root Bone" as the animation root if existing (Fixes #2019) 2014-10-17 23:29:59 +02:00
scrawl
415f67f859 Treat "Root Bone" as the animation root if existing (Fixes #2019) 2014-10-17 23:29:13 +02:00
scrawl
5892fd9e65 Fix NpcAnimation non-existing skeleton crash (Fixes #2028) 2014-10-17 23:07:01 +02:00
scrawl
8233f5894a Fix NpcAnimation non-existing skeleton crash (Fixes #2028) 2014-10-17 23:04:36 +02:00
cc9cii
03a30c3f1d Experimental, compiles but does not work. 2014-10-18 06:16:48 +11:00
scrawl
f117a75747 Force walk animation when flying (Fixes #2015) 2014-10-17 19:11:06 +02:00
scrawl
5f11ccc298 Show tooltip for non-affordable list items (Fixes #2025) 2014-10-17 19:02:31 +02:00
scrawl
2be65a89a7 Show tooltip for non-affordable list items (Fixes #2025) 2014-10-17 19:01:28 +02:00
Marc Zinnschlag
2106893563 silenced a compiler warning regarding null pointer dereferencing 2014-10-17 15:47:31 +02:00
Marc Zinnschlag
49938182e8 silenced a compiler warning regarding null pointer dereferencing 2014-10-17 15:46:07 +02:00
Marc Zinnschlag
a3c894c1e2 Merge branch 'cellmarker' 2014-10-17 14:26:16 +02:00
Marc Zinnschlag
994159fafd fixed broken iterator 2014-10-17 14:23:37 +02:00
Marc Zinnschlag
8a05c0e5c0 fixed overlay singleton 2014-10-17 14:23:27 +02:00
Marc Zinnschlag
ba46bcad40 Revert "Don't allow viewing non-existent cells from the regionmap." 
This reverts commit 7cdab41501.
 2014-10-17 13:52:21 +02:00
Marc Zinnschlag
4b921c3876 user settings cleanup 2014-10-17 13:49:33 +02:00
Marc Zinnschlag
c97845d35d better script compiler diagnostics 2014-10-17 10:59:25 +02:00
scrawl
c3ef39eb6f Fix ItemWidget text cleanup (Fixes #2022) 2014-10-17 02:41:43 +02:00
Marc Zinnschlag
ed44f3ec7d added tooltip support to user settings UI 2014-10-16 16:22:36 +02:00
scrawl
c4e81adb83 Fix settings window being too small for all tabs on some localizations 2014-10-16 15:49:01 +02:00