David Cernat
fba07194cf
Add OpenMW commits up to 29 Oct 2018
...
# Conflicts:
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwinput/inputmanagerimp.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/aicombat.cpp
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
2019-08-20 13:15:00 +03:00
Bernd Schoolmann
1f2349ef6e
Update LuaBridge to e3f7a022
2019-05-12 03:14:03 +02:00
Andrei Kortunov
229d1bb425
Backport loop from tinyxml 2.6 to avoid CVE
2018-10-19 19:43:19 +04:00
David Cernat
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
2018-08-20 14:08:44 +03:00
Andrei Kortunov
57e1462417
Do not use fall-through
2018-08-09 11:01:23 +04:00
Andrei Kortunov
e4f862c0b9
Check if next char exists
2018-08-03 16:42:43 +04:00
David Cernat
c20a0c72c5
Merge pull request #442 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
2018-06-04 19:34:26 +03:00
elsid
c71df7249d
Fix UTF-8 econding
...
To be able run gcovr
2018-06-03 13:46:10 +03:00
David Cernat
9e5ddeac50
Merge pull request #408 from OpenMW/master
...
Add OpenMW commits up to 18 Apr 2018
2018-04-18 18:05:09 +03:00
Andreas Sturmlechner
2c9d46a60b
Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
2018-04-17 23:03:56 +02:00
David Cernat
b7c6261e16
Merge pull request #392 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
2018-03-09 21:07:46 +02:00
Harald H
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
2018-03-08 21:23:24 +01:00
David Cernat
78df8c5ebe
Merge pull request #375 from OpenMW/master
...
Add OpenMW commits up to 29 Jan 2018
2018-01-29 02:36:48 +02:00
Ilya Zhuravlev
b4ec8aaf5e
VideoState::queue_picture: ffmpeg expects a buffer of 4 pointers in sws_scale
2018-01-21 12:21:22 -05:00
David Cernat
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
2017-10-16 07:37:29 +03:00
scrawl
4c174ecd12
Merge changes to coverity scan script
2017-10-15 17:06:58 +02:00
David Cernat
77758596a1
Merge pull request #230 from OpenMW/master
...
Add OpenMW commits up to 25 Jun 2017
2017-06-26 03:13:00 +03:00
scrawl
8d17565efd
Fix joystick binding for an action being discarded when default for another action is loaded (Bug #3900 )
2017-06-25 14:44:17 +02:00
scrawl
ca5b351eef
Fix saved joystick bindings being discarded when running without joystick connected
2017-06-25 14:43:03 +02:00
David Cernat
fa3baac0f3
Merge pull request #228 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
2017-06-18 18:16:10 +03:00
Bret Curtis
11c4aed4e5
algo needed for std::min/max in msvc2013
2017-06-10 09:09:30 +02:00
Bret Curtis
d48b829b45
replace and purge boost::lexical_cast
2017-06-09 19:08:53 +02:00
Bret Curtis
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
2017-06-09 19:08:53 +02:00
Bret Curtis
d785344fad
purge all instances of <boost/shared_ptr.hpp>, clean up unused headers
2017-06-09 19:08:53 +02:00
Bret Curtis
07f75e1104
replace boost::shared_ptr in extern and components
2017-06-09 19:08:53 +02:00
Ewan Higgs
38a2de3c51
convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis
2017-06-09 16:49:25 +02:00
David Cernat
89f6c6df96
Merge pull request #225 from OpenMW/master
...
Add OpenMW commits up to 4 Jun 2017
2017-06-05 03:38:58 +03:00
scrawl
6f878327bf
Fix unused ICS_MAX warning
2017-06-04 12:50:25 +02:00
David Cernat
08faad9f32
Merge pull request #134 from OpenMW/master
...
Add OpenMW commits up to 28 Jan
2017-01-29 07:07:06 +02:00
Allofich
0f20312012
Fix MSVC warnings
2017-01-28 04:37:47 +09:00
Koncord
a6467c9c47
Add breakpad to server
2016-10-23 17:07:46 +08:00
David Cernat
3136a12051
Resolve conflicts in pull request #75
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
2016-10-14 18:34:17 +03:00
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
2016-10-10 18:23:06 +02:00
David Cernat
d9cfd5bac2
Resolve conflicts with OpenMW
2016-08-15 19:14:13 +03:00
scrawl
0d439750a2
Clang warning fix
2016-08-14 15:20:52 +02:00
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
2016-07-17 23:50:52 -04:00
Koncord
1b259e2d33
Syncing inventory, animations, position, 8 key attributes
...
Created Package system
2016-07-07 23:50:48 +08:00
Roman Proskuryakov
28c63aea72
Uses FindTinyXML to find package
2016-06-12 21:40:02 +03:00
Aesylwinn
2f39a6e20d
Fix camera input not being reset when focus for widget is lost.
2016-06-08 13:25:47 -04:00
scrawl
a1f323f528
Fix build against OSG 3.5.3
2016-06-06 13:32:27 +02:00
Roman Proskuryakov
da59ef0f67
Rewrites FindFFmpeg using LibFindMacros handling components properly
2016-05-10 12:43:54 +03:00
Bret Curtis
2c90b0b78d
fix a few spelling mistakes
2016-04-07 11:55:49 +02:00
Aesylwinn
0e75b4a234
Remove warning about */ outside of comment
2016-03-18 14:49:00 -04:00
Aesylwinn
48047beb9a
Stripped OSG mouse and keyboard handling.
2016-03-14 00:40:40 -04:00
scrawl
80392775ef
Fix copy&paste error
2016-02-15 15:18:06 +01:00
scrawl
647a5e091f
Add osgQt to the repository
...
Ensures that it will be built against the correct Qt version.
2016-02-15 15:16:48 +01:00
Bret Curtis
3ea3d07d44
really purge libav
2015-11-12 16:39:29 +01:00
Bret Curtis
39f89f967b
from kcat: We can't simply get rid of this, otherwise it may break for certain kinds of packets.
2015-11-12 16:39:29 +01:00
Bret Curtis
8d2990cc03
add support for ffmpeg29 thanks to Andreas Cadhalpun; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803848
2015-11-12 16:39:29 +01:00
scrawl
cd2e6d4436
Move the __STDC_CONSTANT_MACROS define to cmakelists
2015-06-28 05:53:03 +02:00
