1f2349ef6e
Update LuaBridge to e3f7a022
6 years ago
a083439139
Merge pull request #469 from davidcernat/master while resolving conflicts
...
# Conflicts:
# apps/openmw/main.cpp
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
# apps/openmw/mwworld/worldimp.hpp
6 years ago
57e1462417
Do not use fall-through
6 years ago
e4f862c0b9
Check if next char exists
6 years ago
c20a0c72c5
Merge pull request #442 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
7 years ago
c71df7249d
Fix UTF-8 econding
...
To be able run gcovr
7 years ago
9e5ddeac50
Merge pull request #408 from OpenMW/master
...
Add OpenMW commits up to 18 Apr 2018
7 years ago
2c9d46a60b
Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
7 years ago
b7c6261e16
Merge pull request #392 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
d3b623b5d3
http to https for supported urls ( #1625 )
...
* http to https for supported urls
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http tp https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* some url fixes
* http to https
7 years ago
78df8c5ebe
Merge pull request #375 from OpenMW/master
...
Add OpenMW commits up to 29 Jan 2018
7 years ago
b4ec8aaf5e
VideoState::queue_picture: ffmpeg expects a buffer of 4 pointers in sws_scale
7 years ago
e164e6305e
Merge pull request #313 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
7 years ago
4c174ecd12
Merge changes to coverity scan script
7 years ago
77758596a1
Merge pull request #230 from OpenMW/master
...
Add OpenMW commits up to 25 Jun 2017
8 years ago
8d17565efd
Fix joystick binding for an action being discarded when default for another action is loaded (Bug #3900 )
8 years ago
ca5b351eef
Fix saved joystick bindings being discarded when running without joystick connected
8 years ago
fa3baac0f3
Merge pull request #228 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
8 years ago
11c4aed4e5
algo needed for std::min/max in msvc2013
8 years ago
d48b829b45
replace and purge boost::lexical_cast
8 years ago
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
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
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
Bernd Schoolmann
David Cernat
Andrei Kortunov
elsid
Andreas Sturmlechner
Harald H
Ilya Zhuravlev
scrawl
scrawl
Bret Curtis
Ewan Higgs
Allofich
Koncord
Aesylwinn
Roman Proskuryakov