1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-12 12:38:02 +00:00
Commit Graph

284 Commits

Author SHA1 Message Date
scrawl
2b7287cbd2 Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
Conflicts:
	CMakeLists.txt
2015-02-27 22:37:22 +01:00
scrawl
97cc2522c0 Merge remote-tracking branch 'upstream/master'
Conflicts:
	apps/openmw/mwgui/settingswindow.cpp
	extern/oics/ICSInputControlSystem_joystick.cpp
	files/mygui/openmw_settings_window.layout
2015-02-27 22:21:02 +01:00
Digmaster
e3e6190b85 Added multiple joystick support in ICS. Will fix other issues shortly 2015-02-27 22:19:12 +01:00
Digmaster
1e4a845b6f Minor code cleanup 2015-02-27 22:19:08 +01:00
scrawl
0c6e2170db Include cleanup 2015-02-05 04:18:42 +01:00
scrawl
fec8cf91f5 Add exception handling to various uses of DataStream::read 2015-01-31 22:40:42 +01:00
scrawl
472165097d Warning fix 2015-01-27 23:12:21 +01:00
scrawl
60f722b0a9 Treat the first mouse motion event as non-relative
This fixes incorrect starting camera orientation when using --skip-menu or --load-savegame.
2015-01-27 23:05:19 +01:00
scrawl
6b2df95167 Fix for some coverity defects 2015-01-15 02:03:27 +01:00
scrawl
f931ba2efc Fix some static analysis issues (coverity) 2014-12-24 15:45:12 +01:00
Digmaster
e076e8a9bd Fixed error when downgrading openmw versions 2014-12-09 14:53:50 -06:00
Digmaster
bb6ed06a4e read gamecontrollerdb file location from settings file 2014-12-09 14:37:32 -06:00
Digmaster
a7a211860a Fixed binding controls to A on joystick 2014-12-09 12:12:38 -06:00
Digmaster
ad54e09593 Inital value for joysticks is 0.5 2014-12-09 11:16:17 -06:00
Digmaster
c37881ead1 Joystick Support 2014-12-08 21:57:32 -06:00
scrawl
ad38345de4 Clean up listener in destruction of OgrePlatform (Fixes #2145) 2014-11-28 23:15:07 +01:00
scrawl
17cb181f88 Use av_get_default_channel_layout for unknown channel layouts 2014-11-01 19:37:54 +01: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
6126b3b84a Videoplayer: wait until we have the first picture before returning from playVideo() 2014-10-25 17:27:25 +02:00
Marc Zinnschlag
a4be214fb1 Merge remote-tracking branch 'scrawl/master' 2014-10-25 12:08:16 +02:00
cc9cii
ea67cf0ebe Try the fix again. 2014-10-25 15:37:09 +11:00
cc9cii
e01795556f Suppress some warnings for MSVC. 2014-10-25 10:37:57 +11:00
scrawl
102103e37b Add possibly missing include for av_rescale_q 2014-10-25 00:14:51 +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
scrawl
2a3627b5a8 avresample wrapper fix 2014-10-23 18:27:00 +02:00
scrawl
a9be8628b9 namespace fix, improve comment 2014-10-22 23:22:22 +02:00
scrawl
9da1c49276 Add missing header to CMakeLists, remove stale comment 2014-10-22 22:41:05 +02: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
sylar
964e42ab02 fixes errors in connecting Sdl and Ogre for nvidia tegra3 and in theory for other devices based on android 2014-10-11 21:21:23 +04:00
scrawl
f9b6cc468d Don't reset an unbound input action to its default binding if the key/mouse button for that default binding is already used by another action (Fixes #1960) 2014-10-01 17:54:18 +02:00
scrawl
7252cb63a6 Fix cppcheck issues 2014-09-26 17:48:14 +02:00
scrawl
319f4e0547 Bind to scancodes instead of keycodes 2014-09-13 20:39:59 +02:00
scrawl
24e5a90bab Fix crash when input settings contain extra channels 2014-09-03 02:15:58 +02:00
scrawl
7f95e1e6c2 Don't warn about SDL_CLIPBOARDUPDATE events 2014-09-02 15:16:26 +02:00
Corporama
ccca6db865 Compile fixes for Linux 2014-08-30 23:11:09 +02:00
scrawl
3d47f2ceb0 Fix bad indentation 2014-08-26 03:06:29 +02:00
scrawl
7b2070de5a unloadUnreferencedMaterials: Properly unload materials instead of removing techniques 2014-08-18 19:23:16 +02:00
scrawl
fc0465eeb0 Add missing header to CMakeLists 2014-08-09 15:42:54 +02:00
scrawl
c5a9cd0aa1 Sync upstream changes to shiny 2014-08-06 20:13:58 +02:00
root
3cd98e5259 fix code v5 2014-09-06 02:02:39 +04:00
root
d8772156a7 fixe all code v 2 2014-08-06 00:46:21 +04:00
root
9757ad4031 fixed code 2014-09-04 23:27:14 +04:00
root
8a8b91dfe1 fixed all code for building on all platforms inlcudng ANDROID 2014-09-04 22:47:03 +04:00
root
7cd2d4809c android-build 2014-08-04 19:50:53 +04:00
scrawl
d7acb7fc7d Ignore invalid shader cache index (Bug #1664) 2014-07-27 20:33:45 +02:00
scrawl
07cfa2abd5 Set texture unit indices for GLSL ES 2014-07-24 02:17:44 +02:00
cc9cii
9713873538 Minor change to improve generated STL code (only tested with MSVC 2012). More details in forum post https://forum.openmw.org/viewtopic.php?f=6&t=2153#p24065 2014-07-05 15:41:40 +10:00
slothlife
9ea22324f7 Fix some MSVC warnings.
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
2014-06-23 01:13:30 -05:00
scrawl
162549b7af Remove a wrong comment 2014-06-13 22:23:24 +02:00