f70250a296
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/CMakeLists.txt
apps/opencs/CMakeLists.txt
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/CMakeLists.txt
components/CMakeLists.txt
extern/osg-ffmpeg-videoplayer/CMakeLists.txt
9 years ago
45fcea929a
Refactor cmake scripts, reducing the amount of find_package(FFmpeg)
9 years ago
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
9 years ago
e6ecb39d94
Potential include fix
9 years ago
7ac4b2bb66
Fix for travis build issue
9 years ago
60ad568004
Another missing include
9 years ago
7991ea25c0
Potentially missing includes
9 years ago
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
9 years ago
4d5c446a44
Minor cleanup
9 years ago
d7cd4203ad
Merge remote-tracking branch 'k1ll/mingw'
9 years ago
22f01b1232
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/graphicspage.cpp
apps/opencs/editor.cpp
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/textoverlay.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwgui/inventorywindow.cpp
apps/openmw/mwgui/loadingscreen.cpp
apps/openmw/mwgui/mapwindow.cpp
apps/openmw/mwgui/pickpocketitemmodel.cpp
apps/openmw/mwgui/waitdialog.cpp
apps/openmw/mwmechanics/combat.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwrender/globalmap.cpp
apps/openmw/mwworld/physicssystem.cpp
apps/openmw/mwworld/refdata.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
components/sdlutil/sdlinputwrapper.cpp
extern/shiny/Main/Factory.cpp
extern/shiny/Main/MaterialInstance.cpp
extern/shiny/Main/Platform.cpp
extern/shiny/Main/ShaderSet.cpp
9 years ago
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
9 years ago
9ea416b852
Readded HW cursor manager (no image rotation yet)
9 years ago
39fb46601a
Readded input & event handling
9 years ago
7a2a7633d5
Fix videoplayer destruction issue that valgrind complained about
9 years ago
00f4f78717
Give a name to video streams for logging purposes
9 years ago
b0804734e5
Port VideoWidget
9 years ago
96d9afec38
More header case fixes
9 years ago
c61919501d
Fix unnecessary include, ssize_t define and use pretty function instead of funcsig for mingw
9 years ago
de247ec94b
Fix ifdef
9 years ago
c53a56ed6e
clear stream errors before attempting the read
9 years ago
92ef9b1c57
Rename to osg-ffmpeg-videoplayer
9 years ago
168c0d9b39
Dead code removal
9 years ago
42f6d9e15b
Port video player
9 years ago
af67de73a5
Delete shiny
9 years ago
1d7f3474fa
Fixed more MSVC 2013 warnings.
9 years ago
e2ef8c4022
fix -Wnewline-eof warnings
9 years ago
36141b0c53
Merge remote-tracking branch 'OpenMW/master' into FixWarnings
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
extern/sdl4ogre/sdlcursormanager.cpp
9 years ago
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
9 years ago
ba482fa41f
Merge remote-tracking branch 'dteviot/FixWarnings'
9 years ago
45b6538820
fixed MSVC 2013 warning C4800
...
forcing value to bool 'true' or 'false'
9 years ago
5a47b7ae6e
Warning fix
9 years ago
0fda1cdd53
Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs
9 years ago
2b7287cbd2
Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
...
Conflicts:
CMakeLists.txt
9 years ago
97cc2522c0
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwgui/settingswindow.cpp
extern/oics/ICSInputControlSystem_joystick.cpp
files/mygui/openmw_settings_window.layout
9 years ago
e3e6190b85
Added multiple joystick support in ICS. Will fix other issues shortly
9 years ago
1e4a845b6f
Minor code cleanup
9 years ago
0c6e2170db
Include cleanup
9 years ago
fec8cf91f5
Add exception handling to various uses of DataStream::read
9 years ago
472165097d
Warning fix
9 years ago
60f722b0a9
Treat the first mouse motion event as non-relative
...
This fixes incorrect starting camera orientation when using --skip-menu or --load-savegame.
9 years ago
6b2df95167
Fix for some coverity defects
9 years ago
f931ba2efc
Fix some static analysis issues (coverity)
10 years ago
e076e8a9bd
Fixed error when downgrading openmw versions
10 years ago
bb6ed06a4e
read gamecontrollerdb file location from settings file
10 years ago
a7a211860a
Fixed binding controls to A on joystick
10 years ago
ad54e09593
Inital value for joysticks is 0.5
10 years ago
c37881ead1
Joystick Support
10 years ago
ad38345de4
Clean up listener in destruction of OgrePlatform ( Fixes #2145 )
10 years ago
17cb181f88
Use av_get_default_channel_layout for unknown channel layouts
10 years ago
dc6a99d32a
Add missing virtual destructor
10 years ago
4680bc6c93
Merge branch 'master' of https://github.com/OpenMW/openmw
10 years ago
6126b3b84a
Videoplayer: wait until we have the first picture before returning from playVideo()
10 years ago
a4be214fb1
Merge remote-tracking branch 'scrawl/master'
10 years ago
ea67cf0ebe
Try the fix again.
10 years ago
e01795556f
Suppress some warnings for MSVC.
10 years ago
102103e37b
Add possibly missing include for av_rescale_q
10 years ago
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
2a3627b5a8
avresample wrapper fix
10 years ago
a9be8628b9
namespace fix, improve comment
10 years ago
9da1c49276
Add missing header to CMakeLists, remove stale comment
10 years ago
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
964e42ab02
fixes errors in connecting Sdl and Ogre for nvidia tegra3 and in theory for other devices based on android
10 years ago
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
7252cb63a6
Fix cppcheck issues
10 years ago
319f4e0547
Bind to scancodes instead of keycodes
10 years ago
24e5a90bab
Fix crash when input settings contain extra channels
10 years ago
7f95e1e6c2
Don't warn about SDL_CLIPBOARDUPDATE events
10 years ago
ccca6db865
Compile fixes for Linux
10 years ago
3d47f2ceb0
Fix bad indentation
10 years ago
7b2070de5a
unloadUnreferencedMaterials: Properly unload materials instead of removing techniques
10 years ago
fc0465eeb0
Add missing header to CMakeLists
10 years ago
c5a9cd0aa1
Sync upstream changes to shiny
10 years ago
3cd98e5259
fix code v5
10 years ago
d8772156a7
fixe all code v 2
10 years ago
9757ad4031
fixed code
10 years ago
8a8b91dfe1
fixed all code for building on all platforms inlcudng ANDROID
10 years ago
7cd2d4809c
android-build
10 years ago
d7acb7fc7d
Ignore invalid shader cache index (Bug #1664 )
10 years ago
07cfa2abd5
Set texture unit indices for GLSL ES
10 years ago
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
10 years ago
9ea22324f7
Fix some MSVC warnings.
...
Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations.
10 years ago
162549b7af
Remove a wrong comment
10 years ago
fcab53b3f7
Fix locked mouse cursor due to SDL_SetRelativeMouseMode even when --no-grab was specified
10 years ago
2eebb0bf73
Merge remote-tracking branch 'scrawl/master'
10 years ago
36e380c6be
Merge remote-tracking branch 'upstream/master'
10 years ago
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.
10 years ago
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.
10 years ago
97caa1f8a4
Alternative fix strategy by checking for binding state
10 years ago
fd758bacd3
Remove #ifdef guards.
10 years ago
76bf774485
Small changes for compiling with MSVC 2013.
10 years ago
bbb7ceab43
Merge branch 'master' into bug1196jumpdialog
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
10 years ago
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.
10 years ago
be88168e91
Merge remote-tracking branch 'scrawl/master'
10 years ago
afc1fa49f6
Use mouse release instead of press for binding actions
...
Resolves difficulties binding actions to mouse buttons (Fixes #1364 )
10 years ago
bbe77d656a
Minor fixes from static analysis.
10 years ago
663d5c314e
be more verbose on change reasons
10 years ago
3721174ae4
proof-of-concept boost::wave iteration policy
10 years ago
1b7ed98325
fix typos, reset memory before using
10 years ago
a46662043a
tinyxml convert path to UTF-16 on Windows
10 years ago
scrawl
Marc Zinnschlag
Rohit Nirmal
k1ll
dteviot
Scott Howard
Digmaster
cc9cii
sylar
Corporama
root
slothlife
Fil Krynicki
greye