Gleb Mazovetskiy
4098b455f5
extern/CMakeLists.txt: Bump OSG
...
All the necessary fixes have been upstreamed
4 years ago
Gleb Mazovetskiy
3d334dae75
Fix MYGUI/OSG_STATIC and BUILD_SHARED_LIBS
4 years ago
Gleb Mazovetskiy
daf080ff19
cmake: Move MYGUI/OSG_STATIC default to top-level
...
Makes it clear that the USE_SYSTEM variables affect the defaults of
STATIC variables.
4 years ago
Gleb Mazovetskiy
377bd27aa7
set(BUILD_SHARED_LIBS ${OSG/MYGUI_STATIC})
4 years ago
Gleb Mazovetskiy
eba151884e
Fix Android build
...
https://github.com/openscenegraph/OpenSceneGraph/pull/1037
4 years ago
Gleb Mazovetskiy
f0febe095c
extern/CMakeLists.txt: Set OSG/MYGUI_STATIC on PARENT_SCOPE
4 years ago
Gleb Mazovetskiy
402e43678c
extern/CMakeLists.txt: Bump OSG
4 years ago
Gleb Mazovetskiy
98564b0aae
cmake: move cmake_minimum_required bump to extern/CMakeLists.txt
4 years ago
Gleb Mazovetskiy
93fe84aea8
cmake: Move USED_OSG_(COMPONENTS|PLUGINS) from extern to top-level
4 years ago
Gleb Mazovetskiy
99ba45a308
Optional static builds of OSG, MyGUI, Bullet
4 years ago
Andrei Kortunov
7fc4c9f3f6
Avoid dead code
4 years ago
Andrei Kortunov
8084a336b5
Replace zeroes and nulls by nullptrs
4 years ago
elsid
9363bc2d48
Update recastnavigation to 6624e7aef5e15df11cb2f5673574df8e4c96af6a
4 years ago
Andrei Kortunov
8ca3c3b123
Mark overrided methods by override keyword
4 years ago
Eli2
257a6b4629
Use cmake method to enable interprocedural optimizations
4 years ago
Bret Curtis
0c2fea8254
Merge pull request #2932 from elsid/replace_open_threads
...
Replace OpenThreads by std types
5 years ago
Andrei Kortunov
230e06dec7
Make joysticks dead zone configurable (bug #5502 )
5 years ago
elsid
40ad87bc4d
Replace OpenThreads by std types
5 years ago
Andrei Kortunov
2b4274bca8
Use modern Qt flag declarations
5 years ago
Bret Curtis
61a5c6125d
#5480 : Drop Qt4 support and require Qt 5.12 or later.
5 years ago
psi29a
b9cd8d23a4
Merge branch 'cs-crash-on-exit-fix' into 'master'
...
Stop the CS crashing on exit - Close graphics context while it still exists
See merge request OpenMW/openmw!182
5 years ago
elsid
847cd41b01
Update recastnavigation to 57610fa6ef31b39020231906f8c5d40eaa8294ae
5 years ago
AnyOldName3
ac256f05ff
Close graphics context while it still exists
5 years ago
Andrei Kortunov
2e7712a390
Fix C5204 warnings by adding default virtual destructors
5 years ago
Andrei Kortunov
fd17a5acf4
Make R&D patch more noticable
5 years ago
Andrei Kortunov
e1958b671e
Make dtMeshTile POD
5 years ago
Andrei Kortunov
040d2675c6
Fix the C4267 MSVC warning
5 years ago
Andrei Kortunov
ad256e8343
Validate input bindings to avoid crashes
5 years ago
Michael Stopa
e4bec88a68
Implement mouse wheel bindings (bug #2679 )
5 years ago
elsid
acb939a81b
Update Recastnavigation to c40188c796f089f89a42e0b939d934178dbcfc5c
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
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
Andrei Kortunov
57e1462417
Do not use fall-through
6 years ago
Andrei Kortunov
e4f862c0b9
Check if next char exists
6 years ago
elsid
c71df7249d
Fix UTF-8 econding
...
To be able run gcovr
7 years ago
Andreas Sturmlechner
2c9d46a60b
Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
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
Ilya Zhuravlev
b4ec8aaf5e
VideoState::queue_picture: ffmpeg expects a buffer of 4 pointers in sws_scale
7 years ago
scrawl
4c174ecd12
Merge changes to coverity scan script
7 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
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
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
8 years ago
Bret Curtis
d785344fad
purge all instances of <boost/shared_ptr.hpp>, clean up unused headers
8 years ago
Bret Curtis
07f75e1104
replace boost::shared_ptr in extern and components
8 years ago
Ewan Higgs
38a2de3c51
convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis
8 years ago
scrawl
6f878327bf
Fix unused ICS_MAX warning
8 years ago
Allofich
0f20312012
Fix MSVC warnings
8 years ago
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
8 years ago
scrawl
0d439750a2
Clang warning fix
8 years ago
Roman Proskuryakov
28c63aea72
Uses FindTinyXML to find package
9 years ago
Aesylwinn
2f39a6e20d
Fix camera input not being reset when focus for widget is lost.
9 years ago
scrawl
a1f323f528
Fix build against OSG 3.5.3
9 years ago
Roman Proskuryakov
da59ef0f67
Rewrites FindFFmpeg using LibFindMacros handling components properly
9 years ago
Bret Curtis
2c90b0b78d
fix a few spelling mistakes
9 years ago
Aesylwinn
0e75b4a234
Remove warning about */ outside of comment
9 years ago
Aesylwinn
48047beb9a
Stripped OSG mouse and keyboard handling.
9 years ago
scrawl
80392775ef
Fix copy&paste error
9 years ago
scrawl
647a5e091f
Add osgQt to the repository
...
Ensures that it will be built against the correct Qt version.
9 years ago
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
9 years ago
Bret Curtis
3ea3d07d44
really purge libav
9 years ago
Bret Curtis
39f89f967b
from kcat: We can't simply get rid of this, otherwise it may break for certain kinds of packets.
9 years ago
Bret Curtis
8d2990cc03
add support for ffmpeg29 thanks to Andreas Cadhalpun; https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803848
9 years ago
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
9 years ago
scrawl
cd2e6d4436
Move the __STDC_CONSTANT_MACROS define to cmakelists
10 years ago
scrawl
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
scrawl
609e146a22
Build fixes for windows
10 years ago
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
10 years ago
scrawl
45fcea929a
Refactor cmake scripts, reducing the amount of find_package(FFmpeg)
10 years ago
scrawl
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
10 years ago
scrawl
e6ecb39d94
Potential include fix
10 years ago
scrawl
7ac4b2bb66
Fix for travis build issue
10 years ago
scrawl
60ad568004
Another missing include
10 years ago
scrawl
7991ea25c0
Potentially missing includes
10 years ago
scrawl
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
10 years ago
scrawl
4d5c446a44
Minor cleanup
10 years ago
Marc Zinnschlag
d7cd4203ad
Merge remote-tracking branch 'k1ll/mingw'
10 years ago
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
10 years ago
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
10 years ago
scrawl
9ea416b852
Readded HW cursor manager (no image rotation yet)
10 years ago
scrawl
39fb46601a
Readded input & event handling
10 years ago
scrawl
7a2a7633d5
Fix videoplayer destruction issue that valgrind complained about
10 years ago
scrawl
00f4f78717
Give a name to video streams for logging purposes
10 years ago
scrawl
b0804734e5
Port VideoWidget
10 years ago
k1ll
96d9afec38
More header case fixes
10 years ago
k1ll
c61919501d
Fix unnecessary include, ssize_t define and use pretty function instead of funcsig for mingw
10 years ago
k1ll
de247ec94b
Fix ifdef
10 years ago
scrawl
c53a56ed6e
clear stream errors before attempting the read
10 years ago
scrawl
92ef9b1c57
Rename to osg-ffmpeg-videoplayer
10 years ago
scrawl
168c0d9b39
Dead code removal
10 years ago
scrawl
42f6d9e15b
Port video player
10 years ago
scrawl
af67de73a5
Delete shiny
10 years ago
dteviot
1d7f3474fa
Fixed more MSVC 2013 warnings.
10 years ago
Scott Howard
e2ef8c4022
fix -Wnewline-eof warnings
10 years ago
dteviot
36141b0c53
Merge remote-tracking branch 'OpenMW/master' into FixWarnings
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwmechanics/actors.cpp
extern/sdl4ogre/sdlcursormanager.cpp
10 years ago
dteviot
e197f5318b
fixing MSVC 2013 warning C4244: & C4305
...
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
10 years ago
Marc Zinnschlag
ba482fa41f
Merge remote-tracking branch 'dteviot/FixWarnings'
10 years ago
dteviot
45b6538820
fixed MSVC 2013 warning C4800
...
forcing value to bool 'true' or 'false'
10 years ago
scrawl
5a47b7ae6e
Warning fix
10 years ago
scrawl
0fda1cdd53
Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs
10 years ago
scrawl
2b7287cbd2
Merge branch 'master' of https://github.com/OpenMW/openmw into joystick
...
Conflicts:
CMakeLists.txt
10 years ago
scrawl
97cc2522c0
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
apps/openmw/mwgui/settingswindow.cpp
extern/oics/ICSInputControlSystem_joystick.cpp
files/mygui/openmw_settings_window.layout
10 years ago
Digmaster
e3e6190b85
Added multiple joystick support in ICS. Will fix other issues shortly
10 years ago
Digmaster
1e4a845b6f
Minor code cleanup
10 years ago
scrawl
0c6e2170db
Include cleanup
10 years ago
scrawl
fec8cf91f5
Add exception handling to various uses of DataStream::read
10 years ago
scrawl
472165097d
Warning fix
10 years ago
scrawl
60f722b0a9
Treat the first mouse motion event as non-relative
...
This fixes incorrect starting camera orientation when using --skip-menu or --load-savegame.
10 years ago
scrawl
6b2df95167
Fix for some coverity defects
10 years ago
scrawl
f931ba2efc
Fix some static analysis issues (coverity)
10 years ago
Digmaster
e076e8a9bd
Fixed error when downgrading openmw versions
10 years ago
Digmaster
bb6ed06a4e
read gamecontrollerdb file location from settings file
10 years ago
Digmaster
a7a211860a
Fixed binding controls to A on joystick
10 years ago
Digmaster
ad54e09593
Inital value for joysticks is 0.5
10 years ago
Digmaster
c37881ead1
Joystick Support
10 years ago
scrawl
ad38345de4
Clean up listener in destruction of OgrePlatform ( Fixes #2145 )
10 years ago
scrawl
17cb181f88
Use av_get_default_channel_layout for unknown channel layouts
10 years ago
scrawl
dc6a99d32a
Add missing virtual destructor
10 years ago
scrawl
4680bc6c93
Merge branch 'master' of https://github.com/OpenMW/openmw
10 years ago
scrawl
6126b3b84a
Videoplayer: wait until we have the first picture before returning from playVideo()
10 years ago
Marc Zinnschlag
a4be214fb1
Merge remote-tracking branch 'scrawl/master'
10 years ago
cc9cii
ea67cf0ebe
Try the fix again.
10 years ago
cc9cii
e01795556f
Suppress some warnings for MSVC.
10 years ago
scrawl
102103e37b
Add possibly missing include for av_rescale_q
10 years ago
scrawl
b39d69e98c
Videoplayer fixes, play/pause & seeking
...
- Fix rindex overflow
- Fix audio sample size bugs (was using sample_fmt and channel count of the decoder, instead of the resampled settings). We didn't notice this bug before, because the OpenAL MovieAudioFactory tries to resample to a format of the same byte size.
- Add support for play/pause and seeking controls (not used by cutscenes in OpenMW)
- Closing the video when arriving at the stream end is now handled by the user (we may also want to keep the video open and seek back)
The video player now has a standalone demo, at https://github.com/scrawl/ogre-ffmpeg-videoplayer
10 years ago
scrawl
2a3627b5a8
avresample wrapper fix
10 years ago
scrawl
a9be8628b9
namespace fix, improve comment
10 years ago
scrawl
9da1c49276
Add missing header to CMakeLists, remove stale comment
10 years ago
scrawl
eb1c24ffe6
Refactor video player engine to get rid of MWSound dependencies
...
- Split video player to separate source files.
- Move video player engine sources to extern/ (repository will be set up on github soon).
- Audio is handled in a MovieAudioFactory, implemented by the user (here in MWSound subsystem).
- Handle conversion of unsupported channel layouts via ffmpeg's swresample.
10 years ago
sylar
964e42ab02
fixes errors in connecting Sdl and Ogre for nvidia tegra3 and in theory for other devices based on android
10 years ago