David Cernat
08faad9f32
Merge pull request #134 from OpenMW/master
...
Add OpenMW commits up to 28 Jan
8 years ago
Allofich
0f20312012
Fix MSVC warnings
8 years ago
Koncord
a6467c9c47
Add breakpad to server
8 years ago
David Cernat
3136a12051
Resolve conflicts in pull request #75
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
8 years ago
scrawl
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
David Cernat
d9cfd5bac2
Resolve conflicts with OpenMW
8 years ago
scrawl
0d439750a2
Clang warning fix
8 years ago
Aesylwinn
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
Koncord
1b259e2d33
Syncing inventory, animations, position, 8 key attributes
...
Created Package system
9 years ago
Roman Proskuryakov
28c63aea72
Uses FindTinyXML to find package
9 years ago
Aesylwinn
2f39a6e20d
Fix camera input not being reset when focus for widget is lost.
9 years ago
scrawl
a1f323f528
Fix build against OSG 3.5.3
9 years ago
Roman Proskuryakov
da59ef0f67
Rewrites FindFFmpeg using LibFindMacros handling components properly
9 years ago
Bret Curtis
2c90b0b78d
fix a few spelling mistakes
9 years ago
Aesylwinn
0e75b4a234
Remove warning about */ outside of comment
9 years ago
Aesylwinn
48047beb9a
Stripped OSG mouse and keyboard handling.
9 years ago
scrawl
80392775ef
Fix copy&paste error
9 years ago
scrawl
647a5e091f
Add osgQt to the repository
...
Ensures that it will be built against the correct Qt version.
9 years ago
Bret Curtis
3ea3d07d44
really purge libav
9 years ago
Bret Curtis
39f89f967b
from kcat: We can't simply get rid of this, otherwise it may break for certain kinds of packets.
9 years ago
Bret Curtis
8d2990cc03
add support for ffmpeg29 thanks to Andreas Cadhalpun; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803848
9 years ago
scrawl
cd2e6d4436
Move the __STDC_CONSTANT_MACROS define to cmakelists
10 years ago
scrawl
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
scrawl
609e146a22
Build fixes for windows
10 years ago
scrawl
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
scrawl
45fcea929a
Refactor cmake scripts, reducing the amount of find_package(FFmpeg)
10 years ago
scrawl
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
10 years ago
scrawl
e6ecb39d94
Potential include fix
10 years ago
scrawl
7ac4b2bb66
Fix for travis build issue
10 years ago
scrawl
60ad568004
Another missing include
10 years ago
scrawl
7991ea25c0
Potentially missing includes
10 years ago
scrawl
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
10 years ago
scrawl
4d5c446a44
Minor cleanup
10 years ago
Marc Zinnschlag
d7cd4203ad
Merge remote-tracking branch 'k1ll/mingw'
10 years ago
scrawl
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
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
10 years ago
scrawl
9ea416b852
Readded HW cursor manager (no image rotation yet)
10 years ago
scrawl
39fb46601a
Readded input & event handling
10 years ago
scrawl
7a2a7633d5
Fix videoplayer destruction issue that valgrind complained about
10 years ago
scrawl
00f4f78717
Give a name to video streams for logging purposes
10 years ago
scrawl
b0804734e5
Port VideoWidget
10 years ago
k1ll
96d9afec38
More header case fixes
10 years ago
k1ll
c61919501d
Fix unnecessary include, ssize_t define and use pretty function instead of funcsig for mingw
10 years ago
k1ll
de247ec94b
Fix ifdef
10 years ago
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