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
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
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
Marc Zinnschlag
f4894deff1
removed special value text from spin boxes (broken feature, not used anyway)
2014-10-16 14:47:55 +02:00
Marc Zinnschlag
dddd20ba1e
added default values for display format settings
2014-10-16 14:31:13 +02:00
Marc Zinnschlag
799cd87b52
name convention and spelling fixes
2014-10-16 14:24:17 +02:00
Marc Zinnschlag
e27da6a0d4
removed settings file mixup
2014-10-16 13:59:34 +02:00
Marc Zinnschlag
c94c1adaf3
split off settings page label from internal section name
2014-10-16 13:48:07 +02:00
cc9cii
7cdab41501
Don't allow viewing non-existent cells from the regionmap.
2014-10-16 07:36:47 +11:00
cc9cii
094f046087
Convert OverlaySystem to a OpenCS style singleton.
2014-10-16 07:29:46 +11:00
scrawl
244db5cbfe
Merge branch 'openmw-33' of https://github.com/OpenMW/openmw into openmw-33
2014-10-15 17:22:53 +02:00
Marc Zinnschlag
984b586bb1
fix for implicit references
2014-10-15 16:27:03 +02:00
Marc Zinnschlag
8afdf0f46b
dagoth fix
2014-10-15 16:12:57 +02:00
scrawl
69bbbefc09
setDynamic workaround for broken endgame scripts ( Fixes #2016 )
2014-10-15 15:00:45 +02:00
Marc Zinnschlag
720ba2c0d8
split off settings label from internal settings name
2014-10-15 13:39:53 +02:00
Marc Zinnschlag
daf7cab416
refactored section handling
2014-10-15 12:38:17 +02:00
Marc Zinnschlag
219fbd427f
unclutter user settings declarations
2014-10-15 12:13:22 +02:00
Marc Zinnschlag
868fdfba51
reclaiming some unused space
2014-10-15 11:07:40 +02:00
Marc Zinnschlag
e20fa209cc
user settings UI layout improvements
2014-10-15 11:02:41 +02:00
cc9cii
aff6f6fdb2
Setup OverlaySystem after Ogre::Root but before initialisation as per the API documentation.
2014-10-15 18:48:01 +11:00
cc9cii
1d0ac3b4df
Delete Ogre::OverlaySystem before Ogre::Root
2014-10-15 07:02:19 +11:00
Alexander "Ace" Olofsson
dc788512e2
Fix LNK2019 link error on Visual Studio 2010 builds
...
For some reason VS2010 (Haven't tested 2013) is REALLY pedantic about class/struct being two different things when it comes to function signatures
2014-10-14 16:10:19 +02:00
cc9cii
8cebfc411b
Minor visual improvements.
2014-10-14 17:34:10 +11:00
cc9cii
994420aa57
Singleton wrapper for Ogre OverlaySystem.
2014-10-14 13:21:43 +11:00
cc9cii
57b337d368
Fix corruption issue when the initial scenewidget is closed before subsequent ones. Also place the label closer to the terrain height at the center of the cell, should reduce the perception of the label jumping around too much.
2014-10-14 11:43:56 +11:00
Marc Zinnschlag
6beee95151
Merge remote-tracking branch 'terrorfisch/aistate'
2014-10-13 19:14:15 +02:00
Marc Zinnschlag
528dcf761d
Merge remote-tracking branch 'internecine/master'
2014-10-13 19:11:14 +02:00
Marc Zinnschlag
e23a32c44f
some cleanup
2014-10-13 15:26:47 +02:00
Marc Zinnschlag
8062faa51a
fixed member variable access in OpenCS script compiler ( Fixes #2011 )
2014-10-13 15:25:27 +02:00
Marc Zinnschlag
02acf60c0b
added tooltips for scopes in creator bar
2014-10-13 14:24:27 +02:00
cc9cii
961867e39f
Hide overlay if off screen.
2014-10-13 20:58:07 +11:00
cc9cii
313aed078e
Merge remote-tracking branch 'remotes/upstream/master' into QtOgre
...
Conflicts:
apps/opencs/CMakeLists.txt
2014-10-13 20:45:30 +11:00
