mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 23:26:41 +00:00
Code Issues Releases Wiki Activity
19637 commits 115 branches 76 tags 128 MiB
Commit graph

349 commits

Author SHA1 Message Date
elsid
c71df7249d
Fix UTF-8 econding 
To be able run gcovr
 2018-06-03 13:46:10 +03:00
Andreas Sturmlechner
2c9d46a60b
Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) 2018-04-17 23:03:56 +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
Ilya Zhuravlev
b4ec8aaf5e VideoState::queue_picture: ffmpeg expects a buffer of 4 pointers in sws_scale 2018-01-21 12:21:22 -05:00
scrawl
4c174ecd12 Merge changes to coverity scan script 2017-10-15 17:06:58 +02: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
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
scrawl
6f878327bf Fix unused ICS_MAX warning 2017-06-04 12:50:25 +02:00
Allofich
0f20312012 Fix MSVC warnings 2017-01-28 04:37:47 +09: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
scrawl
0d439750a2 Clang warning fix 2016-08-14 15:20:52 +02: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
scrawl
3663511cdb Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/opencs/CMakeLists.txt
	extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
 2015-06-16 19:53:41 +02:00
scrawl
609e146a22 Build fixes for windows 2015-06-15 16:48:18 +02:00
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
 2015-06-13 21:11:24 +02:00
scrawl
45fcea929a Refactor cmake scripts, reducing the amount of find_package(FFmpeg) 2015-06-12 01:45:48 +02:00
scrawl
cf95d3fc35 Refactor cmake scripts, reducing the amount of find_package(Boost) 2015-06-12 01:45:19 +02:00
scrawl
e6ecb39d94 Potential include fix 2015-06-04 20:42:05 +02:00
scrawl
7ac4b2bb66 Fix for travis build issue 2015-06-04 01:26:23 +02:00
scrawl
60ad568004 Another missing include 2015-06-03 23:55:04 +02:00
scrawl
7991ea25c0 Potentially missing includes 2015-06-03 23:32:49 +02:00
scrawl
974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
 2015-06-03 03:18:29 +02:00
scrawl
4d5c446a44 Minor cleanup 2015-06-02 19:36:57 +02:00
Marc Zinnschlag
d7cd4203ad Merge remote-tracking branch 'k1ll/mingw' 2015-05-30 11:39:53 +02:00
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
 2015-05-23 20:33:44 +02:00
Rohit Nirmal
396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05:00
scrawl
9ea416b852 Readded HW cursor manager (no image rotation yet) 2015-05-13 18:56:14 +02:00
scrawl
39fb46601a Readded input & event handling 2015-05-13 16:50:47 +02:00
scrawl
7a2a7633d5 Fix videoplayer destruction issue that valgrind complained about 2015-05-08 17:11:40 +02:00
scrawl
00f4f78717 Give a name to video streams for logging purposes 2015-05-07 23:08:52 +02:00
scrawl
b0804734e5 Port VideoWidget 2015-05-01 03:03:44 +02:00
k1ll
96d9afec38 More header case fixes 2015-04-29 18:31:30 +02:00