okdshin
c15b3377da
[General] Add PicoSHA2 hash generator to extern
5 years ago
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
5 years ago
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
5 years ago
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
5 years ago
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
5 years ago
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
5 years ago
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
5 years ago
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
5 years ago
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
5 years ago
capostrophic
1f3740225b
Purge unnecessary recast stuff
5 years ago
Andrei Kortunov
454bae2c43
Make PacketQueue fields atomic to avoid data races (e.g. with ParseThread)
6 years ago
Bernd Schoolmann
1f2349ef6e
Update LuaBridge to e3f7a022
6 years ago
Capostrophic
5f86933dc6
Merge upstream osgQt changes
6 years ago
Andrei Kortunov
46fee678a7
Place QWindow include under Qt version check
6 years ago
Andrei Kortunov
4aa21b9088
Do not swap buffers for non-exposed windows (bug #4911 )
6 years ago
elsid
dbf6780dde
Update Recastnavigation to 3a619d773deb7e3a15ee215217c825995fe71312
6 years ago
Capostrophic
c9df63ffd1
Replace BSAOpt hash calculation with a custom function
6 years ago
Azdul
a8c1c4315c
Missing header on Linux
6 years ago
Azdul
a3bcd95546
Merge branch 'cc9cii' of https://github.com/cc9cii/openmw into tes4_bsa
6 years ago
Azdul
42ea609d1d
Remove files with incorrect Git history / attribution
6 years ago
Azdul
96d19e07ca
Fix Linux build
6 years ago
Azdul
25650e65bf
Read any BSA file - detection based on version in BSA header
6 years ago
Ilya Zhuravlev
07e9ce84b3
Replace volatile bools with std::atomic<bool>
6 years ago
Stanislaw Halik
59d96d808e
fix missing include
6 years ago
Bret Curtis
63a2487630
bump /extern/recastnavigation to commit 3087e805b02d5eb8fff7851234fa2b3f71290eba; fixes clang warning about missing delete: https://github.com/recastnavigation/recastnavigation/issues/359
6 years ago
Andrei Kortunov
f88d5e808c
Rewrite media decoder to use FFMpeg 3.2+ API (task #4686 )
6 years ago
elsid
70b5160bf1
Add files with recastnavigation current commit hash and url to clone
6 years ago
elsid
792a0585c0
Add recastnavigation as subdirectory
6 years ago
Andrei Kortunov
229d1bb425
Backport loop from tinyxml 2.6 to avoid CVE
6 years ago
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.
6 years ago
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.
6 years ago
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
6 years ago
Andrei Kortunov
57e1462417
Do not use fall-through
6 years ago
Andrei Kortunov
e4f862c0b9
Check if next char exists
7 years ago
David Cernat
c20a0c72c5
Merge pull request #442 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
7 years ago
elsid
c71df7249d
Fix UTF-8 econding
...
To be able run gcovr
7 years ago
David Cernat
9e5ddeac50
Merge pull request #408 from OpenMW/master
...
Add OpenMW commits up to 18 Apr 2018
7 years ago
Andreas Sturmlechner
2c9d46a60b
Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
7 years ago
David Cernat
b7c6261e16
Merge pull request #392 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
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
7 years ago
David Cernat
78df8c5ebe
Merge pull request #375 from OpenMW/master
...
Add OpenMW commits up to 29 Jan 2018
7 years ago
Ilya Zhuravlev
b4ec8aaf5e
VideoState::queue_picture: ffmpeg expects a buffer of 4 pointers in sws_scale
7 years ago
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
7 years ago
scrawl
4c174ecd12
Merge changes to coverity scan script
7 years ago
David Cernat
77758596a1
Merge pull request #230 from OpenMW/master
...
Add OpenMW commits up to 25 Jun 2017
8 years ago
scrawl
8d17565efd
Fix joystick binding for an action being discarded when default for another action is loaded (Bug #3900 )
8 years ago
scrawl
ca5b351eef
Fix saved joystick bindings being discarded when running without joystick connected
8 years ago
David Cernat
fa3baac0f3
Merge pull request #228 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
8 years ago
Bret Curtis
11c4aed4e5
algo needed for std::min/max in msvc2013
8 years ago
Bret Curtis
d48b829b45
replace and purge boost::lexical_cast
8 years ago