39185e6f8c
purge the rest of boost::shared and any other boost related things that no longer are required
...
put boost system back in, clean others up
revert Qt
add back boost fstream
8 years ago
d785344fad
purge all instances of <boost/shared_ptr.hpp>, clean up unused headers
8 years ago
07f75e1104
replace boost::shared_ptr in extern and components
8 years ago
38a2de3c51
convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis
8 years ago
89f6c6df96
Merge pull request #225 from OpenMW/master
...
Add OpenMW commits up to 4 Jun 2017
8 years ago
6f878327bf
Fix unused ICS_MAX warning
8 years ago
08faad9f32
Merge pull request #134 from OpenMW/master
...
Add OpenMW commits up to 28 Jan
8 years ago
0f20312012
Fix MSVC warnings
8 years ago
a6467c9c47
Add breakpad to server
8 years ago
3136a12051
Resolve conflicts in pull request #75
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
8 years ago
530fb61ad0
Use OpenThreads instead of boost thread
...
This should allow OpenMW to work better with git versions of openscenegraph. OSG dev version 3.5.5 added the setting of thread affinity for the main thread. The problem is that in the boost/standard threading libraries, the affinity of a thread is inherited by any further threads launched from that thread, leading to these threads always running on the same core as the main thread unless you tell them not to.
With OpenThreads, the default affinity of a thread is none, no matter what parent thread it was launched from.
So, when using custom threading with OSG 3.6+, we have these options:
1. explicitely tell OSG to *not* set the thread affinity
or 2. explicitely set the thread affinity of additional threads created (possible with boost, but not possible with std::thread)
or 3. use OpenThreads
or 4. accept the suboptimal performance of non-OSG threads (in OpenMW's case the sound streaming & video threads) running on the same core as the main thread
This patch opts for 3.)
Reference: http://forum.openscenegraph.org/viewtopic.php?t=16158
8 years ago
d9cfd5bac2
Resolve conflicts with OpenMW
8 years ago
0d439750a2
Clang warning fix
8 years ago
b4a000913c
Merge remote-tracking branch 'yar/master' into Even
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwdialogue/filter.cpp
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwworld/localscripts.cpp
# components/CMakeLists.txt
# components/compiler/exprparser.cpp
# components/sceneutil/workqueue.cpp
9 years ago
1b259e2d33
Syncing inventory, animations, position, 8 key attributes
...
Created Package system
9 years ago
28c63aea72
Uses FindTinyXML to find package
9 years ago
2f39a6e20d
Fix camera input not being reset when focus for widget is lost.
9 years ago
a1f323f528
Fix build against OSG 3.5.3
9 years ago
da59ef0f67
Rewrites FindFFmpeg using LibFindMacros handling components properly
9 years ago
2c90b0b78d
fix a few spelling mistakes
9 years ago
0e75b4a234
Remove warning about */ outside of comment
9 years ago
48047beb9a
Stripped OSG mouse and keyboard handling.
9 years ago
80392775ef
Fix copy&paste error
9 years ago
647a5e091f
Add osgQt to the repository
...
Ensures that it will be built against the correct Qt version.
9 years ago
06f9922822
Performance improvements for loading Info records.
...
- The order of info records with the same topic are maintained in Collection::mRecords
- The index lookup data structure are not ordered. The topic string is hashed. The infos for the topic are simply placed in a vector.
- The index values for appending or inserting a record takes prev/next values (if exist)
- FIXME: prev/next values are not adjusted for adding or removing records
- FIXME: undo after reordering does not reset the modified flag
9 years ago
3ea3d07d44
really purge libav
9 years ago
39f89f967b
from kcat: We can't simply get rid of this, otherwise it may break for certain kinds of packets.
9 years ago
8d2990cc03
add support for ffmpeg29 thanks to Andreas Cadhalpun; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803848
9 years ago
fcb9068c19
Fix tab indentations in apps/ and components/
...
(cherry picked from commit a47617c21f
9 years ago
cd2e6d4436
Move the __STDC_CONSTANT_MACROS define to cmakelists
10 years ago
3663511cdb
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
10 years ago
609e146a22
Build fixes for windows
10 years ago
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
10 years ago
45fcea929a
Refactor cmake scripts, reducing the amount of find_package(FFmpeg)
10 years ago
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
10 years ago
e6ecb39d94
Potential include fix
10 years ago
7ac4b2bb66
Fix for travis build issue
10 years ago
60ad568004
Another missing include
10 years ago
7991ea25c0
Potentially missing includes
10 years ago
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
10 years ago
4d5c446a44
Minor cleanup
10 years ago
d7cd4203ad
Merge remote-tracking branch 'k1ll/mingw'
10 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
10 years ago
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
10 years ago
9ea416b852
Readded HW cursor manager (no image rotation yet)
10 years ago
39fb46601a
Readded input & event handling
10 years ago
7a2a7633d5
Fix videoplayer destruction issue that valgrind complained about
10 years ago
00f4f78717
Give a name to video streams for logging purposes
10 years ago
b0804734e5
Port VideoWidget
10 years ago
96d9afec38
More header case fixes
10 years ago
c61919501d
Fix unnecessary include, ssize_t define and use pretty function instead of funcsig for mingw
10 years ago
de247ec94b
Fix ifdef
10 years ago
c53a56ed6e
clear stream errors before attempting the read
10 years ago
92ef9b1c57
Rename to osg-ffmpeg-videoplayer
10 years ago
168c0d9b39
Dead code removal
10 years ago
42f6d9e15b
Port video player
10 years ago
af67de73a5
Delete shiny
10 years ago
1d7f3474fa
Fixed more MSVC 2013 warnings.
10 years ago
e2ef8c4022
fix -Wnewline-eof warnings
10 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
10 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
10 years ago
ba482fa41f
Merge remote-tracking branch 'dteviot/FixWarnings'
10 years ago
45b6538820
fixed MSVC 2013 warning C4800
...
forcing value to bool 'true' or 'false'
10 years ago
5a47b7ae6e
Warning fix
10 years ago
0fda1cdd53
Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs
10 years ago
2b7287cbd2
Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
...
Conflicts:
CMakeLists.txt
10 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
10 years ago
e3e6190b85
Added multiple joystick support in ICS. Will fix other issues shortly
10 years ago
1e4a845b6f
Minor code cleanup
10 years ago
0c6e2170db
Include cleanup
10 years ago
fec8cf91f5
Add exception handling to various uses of DataStream::read
10 years ago
472165097d
Warning fix
10 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.
10 years ago
6b2df95167
Fix for some coverity defects
10 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
Bret Curtis
Ewan Higgs
David Cernat
scrawl
Allofich
Koncord
Aesylwinn
Roman Proskuryakov
cc9cii
Marc Zinnschlag
Rohit Nirmal
k1ll
dteviot
Scott Howard
Digmaster
sylar