mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 16:49:55 +00:00
Code Issues Releases Wiki Activity
27996 commits 38 branches 54 tags 122 MiB
Commit graph

465 commits

Author SHA1 Message Date
elsid
847cd41b01
Update recastnavigation to 57610fa6ef31b39020231906f8c5d40eaa8294ae 2020-04-24 20:40:22 +02:00
AnyOldName3
ac256f05ff Close graphics context while it still exists 2020-04-22 19:20:48 +01:00
David Cernat
25a632c650 Add OpenMW commits up to 13 Apr 2020 
# Conflicts:
#	CMakeLists.txt
#	README.md
#	apps/openmw/engine.cpp
#	apps/openmw/mwclass/creaturelevlist.cpp
#	apps/openmw/mwgui/quickkeysmenu.cpp
 2020-04-13 19:53:42 +03:00
Andrei Kortunov
2e7712a390 Fix C5204 warnings by adding default virtual destructors 2020-03-26 14:49:12 +04:00
David Cernat
a58f09fd6c Add OpenMW commits up to 2 Jan 2020 
# Conflicts:
#	apps/openmw/mwmechanics/enchanting.cpp
#	apps/openmw/mwworld/scene.cpp
 2020-01-02 22:09:54 +02:00
Andrei Kortunov
fd17a5acf4 Make R&D patch more noticable 2019-12-23 10:51:25 +04:00
David Cernat
ca9cd90a4d Add OpenMW commits up to 20 Dec 2019 
# Conflicts:
#	apps/openmw/mwworld/scene.cpp
 2019-12-20 15:43:50 +02:00
Andrei Kortunov
e1958b671e Make dtMeshTile POD 2019-12-20 14:16:39 +04:00
David Cernat
9d6f3fdd09 Add OpenMW commits up to 1 Dec 2019 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwscript/aiextensions.cpp
#	apps/openmw/mwscript/statsextensions.cpp
 2019-12-01 23:52:42 +02:00
David Cernat
0c98c5d09e Add OpenMW commits up to 19 Nov 2019 
# Conflicts:
#	apps/openmw/mwmechanics/aipursue.cpp
#	apps/openmw/mwmechanics/summoning.cpp
 2019-11-19 17:16:48 +02:00
Andrei Kortunov
040d2675c6 Fix the C4267 MSVC warning 2019-11-19 15:31:44 +04:00
Andrei Kortunov
ad256e8343 Validate input bindings to avoid crashes 2019-11-15 11:41:01 +04:00
David Cernat
5762a36fc2 Add OpenMW commits up to 7 Nov 2019 
# Conflicts:
#	apps/openmw/mwmechanics/aifollow.hpp
 2019-11-08 06:20:41 +02:00
Michael Stopa
e4bec88a68 Implement mouse wheel bindings (bug #2679) 2019-10-30 20:45:51 +04:00
David Cernat
54301f5f89 Add OpenMW commits up to 29 Oct 2019 
# Conflicts:
#	apps/openmw/mwmechanics/combat.cpp
#	apps/openmw/mwworld/inventorystore.cpp
 2019-10-29 23:49:31 +02:00
elsid
acb939a81b
Update Recastnavigation to c40188c796f089f89a42e0b939d934178dbcfc5c 2019-10-20 17:25:25 +02:00
okdshin
c15b3377da [General] Add PicoSHA2 hash generator to extern 2019-09-20 10:25:34 +03:00
David Cernat
353e7d530a Add OpenMW commits up to 18 Aug 2019 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-08-22 22:44:00 +03:00
David Cernat
b57c0bcafe Add OpenMW commits up to 6 June 2019 
# Conflicts:
#	apps/openmw/mwgui/hud.cpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwgui/waitdialog.cpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-08-22 11:42:02 +03:00
David Cernat
f671c0bddc Add OpenMW commits up to 1 Apr 2019 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/engine.cpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwgui/trainingwindow.cpp
#	apps/openmw/mwgui/travelwindow.cpp
#	apps/openmw/mwgui/waitdialog.cpp
 2019-08-21 23:54:39 +03:00
David Cernat
8729c3c5e3 Add OpenMW commits up to 9 Mar 2019 
# Conflicts:
#	.travis.yml
#	CI/before_script.linux.sh
#	README.md
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwscript/animationextensions.cpp
#	apps/openmw/mwscript/guiextensions.cpp
#	apps/openmw/mwscript/miscextensions.cpp
#	apps/openmw/mwscript/soundextensions.cpp
 2019-08-21 19:04:04 +03:00
David Cernat
6fdef4fd0a Add OpenMW commits up to 1 Jan 2019 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwphysics/physicssystem.hpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
 2019-08-21 14:37:54 +03:00
David Cernat
cbba81df03 Add OpenMW commits up to 14 Nov 2018 
# Conflicts:
#	.travis.yml
#	CI/before_install.linux.sh
#	CI/before_script.linux.sh
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwworld/containerstore.cpp
#	apps/openmw/mwworld/inventorystore.cpp
 2019-08-21 09:04:36 +03:00
David Cernat
3efffe92e3 Add OpenMW commits up to 5 Nov 2018 
# Conflicts:
#	CI/before_install.linux.sh
#	CMakeLists.txt
#	apps/openmw/mwmechanics/aifollow.cpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
#	apps/openmw/mwphysics/physicssystem.hpp
#	apps/openmw/mwworld/scene.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	components/CMakeLists.txt
 2019-08-21 05:08:50 +03:00
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
capostrophic
1f3740225b Purge unnecessary recast stuff 2019-08-05 01:40:35 +03:00
Andrei Kortunov
454bae2c43 Make PacketQueue fields atomic to avoid data races (e.g. with ParseThread) 2019-05-24 08:04:20 +04:00
Bernd Schoolmann
1f2349ef6e Update LuaBridge to e3f7a022 2019-05-12 03:14:03 +02:00
Capostrophic
5f86933dc6 Merge upstream osgQt changes 2019-03-17 01:41:13 +03:00
Andrei Kortunov
46fee678a7 Place QWindow include under Qt version check 2019-03-13 22:57:01 +04:00
Andrei Kortunov
4aa21b9088 Do not swap buffers for non-exposed windows (bug #4911) 2019-03-13 14:35:21 +04:00
elsid
dbf6780dde
Update Recastnavigation to 3a619d773deb7e3a15ee215217c825995fe71312 2019-03-03 13:46:24 +03:00
Capostrophic
c9df63ffd1 Replace BSAOpt hash calculation with a custom function 2019-01-22 02:22:57 +03:00
Azdul
a8c1c4315c Missing header on Linux 2019-01-18 21:19:59 +01:00
Azdul
a3bcd95546 Merge branch 'cc9cii' of https://github.com/cc9cii/openmw into tes4_bsa 2019-01-18 09:11:41 +01:00
Azdul
42ea609d1d Remove files with incorrect Git history / attribution 2019-01-18 09:03:34 +01:00
Azdul
96d19e07ca Fix Linux build 2019-01-16 20:59:07 +01:00
Azdul
25650e65bf Read any BSA file - detection based on version in BSA header 2019-01-16 20:19:15 +01:00
Ilya Zhuravlev
07e9ce84b3 Replace volatile bools with std::atomic<bool> 2018-12-24 14:19:35 -05:00
Stanislaw Halik
59d96d808e fix missing include 2018-12-07 04:23:52 +01:00
Bret Curtis
63a2487630 bump /extern/recastnavigation to commit 3087e805b02d5eb8fff7851234fa2b3f71290eba; fixes clang warning about missing delete: https://github.com/recastnavigation/recastnavigation/issues/359 2018-11-05 16:37:47 +01:00
Andrei Kortunov
f88d5e808c Rewrite media decoder to use FFMpeg 3.2+ API (task #4686) 2018-11-03 22:34:25 +04:00
elsid
70b5160bf1 Add files with recastnavigation current commit hash and url to clone 2018-11-01 17:01:22 +01:00
elsid
792a0585c0 Add recastnavigation as subdirectory 2018-11-01 17:01:22 +01:00
Andrei Kortunov
229d1bb425 Backport loop from tinyxml 2.6 to avoid CVE 2018-10-19 19:43:19 +04:00
cc9cii
5ad440cb45 TES4/TES5 ESM/ESP file reader. 
To support the possibility of a standalone implementation of TES4, the ESM/ESP code is placed in the 'extern' folder.

Much more work needs to be done.
 2018-10-07 07:54:57 +11:00
cc9cii
3982573035 BSA enhancements. 
* Implement hash based lookup for TES3 BSA files.
* Added TES4/TES5 BSA support.
* Implemented a hack (non-portable code) in an attempt to reduce startup time under Windows because  Boost::filesystem seems to take forever on GetFileAttributeW.  This implementation uses FindFirstFile/FindNextFile/FindClose instead.
 2018-10-06 13:35:51 +10: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
cc9cii
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
 2015-12-19 17:30:55 +11: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
fcb9068c19 Fix tab indentations in apps/ and components/ 
(cherry picked from commit a47617c21f)

Conflicts:
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/aicombat.cpp
	apps/openmw/mwphysics/physicssystem.cpp
 2015-11-01 21:34:23 +11: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