Commit Graph

347 Commits (d3b623b5d32e8eba6c135ba62acfe049840040a4)

Author SHA1 Message Date
scrawl c53a56ed6e clear stream errors before attempting the read 10 years ago
scrawl 92ef9b1c57 Rename to osg-ffmpeg-videoplayer 10 years ago
scrawl 168c0d9b39 Dead code removal 10 years ago
scrawl 42f6d9e15b Port video player 10 years ago
scrawl af67de73a5 Delete shiny 10 years ago
dteviot 1d7f3474fa Fixed more MSVC 2013 warnings. 10 years ago
Scott Howard e2ef8c4022 fix -Wnewline-eof warnings 10 years ago
dteviot 36141b0c53 Merge remote-tracking branch 'OpenMW/master' into FixWarnings
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/actors.cpp
	extern/sdl4ogre/sdlcursormanager.cpp
10 years ago
dteviot e197f5318b fixing MSVC 2013 warning C4244: & C4305
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
10 years ago
Marc Zinnschlag ba482fa41f Merge remote-tracking branch 'dteviot/FixWarnings' 10 years ago
dteviot 45b6538820 fixed MSVC 2013 warning C4800
forcing value to bool 'true' or 'false'
10 years ago
scrawl 5a47b7ae6e Warning fix 10 years ago
scrawl 0fda1cdd53 Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs 10 years ago
scrawl 2b7287cbd2 Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
Conflicts:
	CMakeLists.txt
10 years ago
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
10 years ago
Digmaster e3e6190b85 Added multiple joystick support in ICS. Will fix other issues shortly 10 years ago
Digmaster 1e4a845b6f Minor code cleanup 10 years ago
scrawl 0c6e2170db Include cleanup 10 years ago
scrawl fec8cf91f5 Add exception handling to various uses of DataStream::read 10 years ago
scrawl 472165097d Warning fix 10 years ago
scrawl 60f722b0a9 Treat the first mouse motion event as non-relative
This fixes incorrect starting camera orientation when using --skip-menu or --load-savegame.
10 years ago
scrawl 6b2df95167 Fix for some coverity defects 10 years ago
scrawl f931ba2efc Fix some static analysis issues (coverity) 10 years ago
Digmaster e076e8a9bd Fixed error when downgrading openmw versions 10 years ago
Digmaster bb6ed06a4e read gamecontrollerdb file location from settings file 10 years ago
Digmaster a7a211860a Fixed binding controls to A on joystick 10 years ago
Digmaster ad54e09593 Inital value for joysticks is 0.5 10 years ago
Digmaster c37881ead1 Joystick Support 10 years ago
scrawl ad38345de4 Clean up listener in destruction of OgrePlatform (Fixes #2145) 10 years ago
scrawl 17cb181f88 Use av_get_default_channel_layout for unknown channel layouts 10 years ago
scrawl dc6a99d32a Add missing virtual destructor 10 years ago
scrawl 4680bc6c93 Merge branch 'master' of https://github.com/OpenMW/openmw 10 years ago
scrawl 6126b3b84a Videoplayer: wait until we have the first picture before returning from playVideo() 10 years ago
Marc Zinnschlag a4be214fb1 Merge remote-tracking branch 'scrawl/master' 10 years ago
cc9cii ea67cf0ebe Try the fix again. 10 years ago
cc9cii e01795556f Suppress some warnings for MSVC. 10 years ago
scrawl 102103e37b Add possibly missing include for av_rescale_q 10 years ago
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
10 years ago
scrawl 2a3627b5a8 avresample wrapper fix 10 years ago
scrawl a9be8628b9 namespace fix, improve comment 10 years ago
scrawl 9da1c49276 Add missing header to CMakeLists, remove stale comment 10 years ago
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.
10 years ago
sylar 964e42ab02 fixes errors in connecting Sdl and Ogre for nvidia tegra3 and in theory for other devices based on android 10 years ago
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) 10 years ago
scrawl 7252cb63a6 Fix cppcheck issues 10 years ago
scrawl 319f4e0547 Bind to scancodes instead of keycodes 10 years ago
scrawl 24e5a90bab Fix crash when input settings contain extra channels 10 years ago
scrawl 7f95e1e6c2 Don't warn about SDL_CLIPBOARDUPDATE events 10 years ago
Corporama ccca6db865 Compile fixes for Linux 10 years ago
scrawl 3d47f2ceb0 Fix bad indentation 10 years ago
scrawl 7b2070de5a unloadUnreferencedMaterials: Properly unload materials instead of removing techniques 11 years ago
scrawl fc0465eeb0 Add missing header to CMakeLists 11 years ago
scrawl c5a9cd0aa1 Sync upstream changes to shiny 11 years ago
root 3cd98e5259 fix code v5 10 years ago
root d8772156a7 fixe all code v 2 11 years ago
root 9757ad4031 fixed code 10 years ago
root 8a8b91dfe1 fixed all code for building on all platforms inlcudng ANDROID 10 years ago
root 7cd2d4809c android-build 11 years ago
scrawl d7acb7fc7d Ignore invalid shader cache index (Bug #1664) 11 years ago
scrawl 07cfa2abd5 Set texture unit indices for GLSL ES 11 years ago
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 11 years ago
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.
11 years ago
scrawl 162549b7af Remove a wrong comment 11 years ago
scrawl fcab53b3f7 Fix locked mouse cursor due to SDL_SetRelativeMouseMode even when --no-grab was specified 11 years ago
Marc Zinnschlag 2eebb0bf73 Merge remote-tracking branch 'scrawl/master' 11 years ago
cc9cii 36e380c6be Merge remote-tracking branch 'upstream/master' 11 years ago
scrawl 41ab7329a8 Store keybindings as keycode, not keyname. Also use SDL_GetKeyName instead of a manually created map. Fixes #1202
Note: breaks compatibility with input.xml, so the filename was changed.
11 years ago
Fil Krynicki cd693b6d37 Fixed mouse closing containers, and injection/gui test order
Called setEnabled on channels now effects whether those channels
notify listeners, rather than whether they register changes to
their controls. This was making channels get stuck on "1" when the
GUI was activated.

Also ensured GUI activity can invalidate player controls even if
that activity is closing the GUI, by re-ordering a check.

And fixed a comment.
11 years ago
Fil Krynicki 97caa1f8a4 Alternative fix strategy by checking for binding state 11 years ago
cc9cii fd758bacd3 Remove #ifdef guards. 11 years ago
cc9cii 76bf774485 Small changes for compiling with MSVC 2013. 11 years ago
Fil Krynicki bbb7ceab43 Merge branch 'master' into bug1196jumpdialog
Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
11 years ago
Fil Krynicki cd131e7f86 1196/1217 fix
Fixes an issue where inputs could be processed by both GUI and
gameplay systems. An enabled/disable has been added to OIS
channels, and OpenMW now disables player gameplay hotkeys when
a GUI element has focus. GUI hotkeys are left enabled.
11 years ago
Marc Zinnschlag be88168e91 Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl afc1fa49f6 Use mouse release instead of press for binding actions
Resolves difficulties binding actions to mouse buttons (Fixes #1364)
11 years ago
cc9cii bbe77d656a Minor fixes from static analysis. 11 years ago
greye 663d5c314e be more verbose on change reasons 11 years ago
greye 3721174ae4 proof-of-concept boost::wave iteration policy 11 years ago
greye 1b7ed98325 fix typos, reset memory before using 11 years ago
greye a46662043a tinyxml convert path to UTF-16 on Windows 11 years ago
scrawl eff648e3ab Show unhandled SDL events in hexadecimal (easier to compare with the enum) 11 years ago
scrawl e7b9b6d87a Fix a confusing variable name 11 years ago
scrawl a3dffd5d57 Add some missing SDL to MyGUI key translations.
Most importantly to allow numpad enter as alternative to return key.
11 years ago
scrawl edb5a54092 Include some more required Ogre headers explicitely. 11 years ago
Bret Curtis ab224f93c9 remove our stdint.h version that uses boost and force usage of system stdint.h 11 years ago
cc9cii 5539c75ef0 Typo fix to avoid divide by zero. 11 years ago
scrawl 439018e706 Get rid of useless return values 11 years ago
scrawl c004fb778f Get rid of underscore defines. They are reserved by the standard. 11 years ago
scrawl 6d27ebabb6 Integrate AddGlow with material controllers 11 years ago
scrawl 19e5978a01 Merge branch 'master' of https://github.com/zinnschlag/openmw
Conflicts:
	apps/openmw/main.cpp
11 years ago
scrawl 4bc4af6bf0 Enable microcode caching for Ogre 1.9+ 11 years ago
Lukasz Gromanowski bfd79bfbe6 Various fixes for CppCheck warnings.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
scrawl bcf61331ab Bring back the option to not grab mouse. Useful if running in a mouse-controlled GUI debugger. 11 years ago
scrawl 7f735c2c4c Release and show the cursor when focus lost 11 years ago
scrawl 3452bd2e0b Add glow effect for enchanted items 11 years ago
Marc Zinnschlag b7bb7d6902 Merge remote-tracking branch 'scrawl/master'
Conflicts:
	apps/opencs/editor.cpp
11 years ago
scrawl c3d9bc31bb Fix exiting OpenMW via the window close button (regression) 11 years ago
scrawl e6960d915a Add simple Ogre widget 11 years ago
scrawl 2fb059e2fa Don't destroy the SDL window twice 11 years ago
Marc Zinnschlag 6f64b1b9db cmake option to use system tinyxml instead of embedded one 11 years ago