Azdul
25650e65bf
Read any BSA file - detection based on version in BSA header
2019-01-16 20:19:15 +01:00
Nikolay Kasyanov
2306d904c7
[macOS] Fail CMake when trying to use CMake 3.13 for macOS packaging
2018-12-26 17:00:17 +01:00
Nikolay Kasyanov
c3a2a2d73f
Do not package Recastnavigation headers and static libs
2018-12-20 21:18:41 +01:00
AnyOldName3
e2515f6db7
Merge branch 'master' into osgshadow-test-vdsm
2018-12-18 19:51:27 +00:00
Chris Djali
066b74eb43
Merge pull request #2078 from AnyOldName3/cmake-13.1-osg-lib-fix
...
Adapt to CMake 3.13's new meaning of OSGDB_LIBRARY
2018-12-18 19:23:44 +00:00
Bret Curtis
44a408635a
wrap git command in gitfound
2018-12-17 16:30:12 +01:00
Bret Curtis
76d380e852
if unable to run git at this moment, use empty string
2018-12-16 20:58:14 +01:00
AnyOldName3
dcbca4b90b
Use if(EXISTS ${OSGDB_LIB} AND NOT IS_DIRECTORY ${OSGDB_LIB})
2018-12-14 14:30:56 +00:00
AnyOldName3
9067731a96
Adapt to CMake 3.13's new meaning of OSGDB_LIBRARY (i.e. that it can now be a list) while allowing for the possibility that the found libraries may be in different directories when debug and optimised versions exist.
2018-12-13 02:08:35 +00:00
Bret Curtis
b8b1a52216
add commit date; revert boost as we are not breaking anything yet
2018-12-12 10:27:09 +01:00
Bret Curtis
6596c400f3
indentation
2018-12-11 21:34:11 +01:00
Bret Curtis
fc10adb608
makes openmw.appdata.xml a template that accepts @OPENMW_VERSION@ so we do not have to update it all the time; fix deprecated warning for boost header; un-ignore openmw.appdata.xml
2018-12-11 21:30:37 +01:00
AnyOldName3
642002b302
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-11-29 01:19:01 +00:00
Bret Curtis
caad388c26
bump our versions to 0.46, keep this commit in mind when trying to automate this into one place
2018-11-14 16:32:24 +01:00
Bret Curtis
25e4156940
enable niftest by default, coverity branch covers everything but openmw now due to timeouts; we run coverity manually for openmw for now; re-order options to be readable and logical sequence
2018-11-14 10:01:12 +01:00
Andrei Kortunov
f88d5e808c
Rewrite media decoder to use FFMpeg 3.2+ API (task #4686 )
2018-11-03 22:34:25 +04:00
AnyOldName3
b178e1868a
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-11-03 00:27:40 +00:00
AnyOldName3
719c9f0766
Remove compile definition which inadvertently broke other compile definitons
2018-11-02 18:39:46 +00:00
AnyOldName3
a5afae71e6
Remove unwanted compile definition.
2018-11-02 17:18:10 +00:00
AnyOldName3
a6d3210a9c
Include missing Windows header before calling Windows-specific functions
2018-11-02 01:05:39 +00:00
AnyOldName3
d0c254bc7e
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2018-11-01 16:48:21 +00:00
elsid
4c82470933
Do not build recastnavigation tests
2018-11-01 17:01:22 +01:00
elsid
bc59a3c455
Build recastnavigation static libraries
2018-11-01 17:01:22 +01:00
elsid
792a0585c0
Add recastnavigation as subdirectory
2018-11-01 17:01:22 +01:00
AnyOldName3
0124be5713
Merge upstream/master
2018-10-10 21:23:19 +01:00
cc9cii
6ec6b9bc2a
OpenMW Integration.
...
Read the ESM/ESP records but do nothing with them for the moment.
2018-10-07 08:55:30 +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
Andrei Kortunov
d3defd83fc
Disable C4643 MSVC warning, caused by boost
2018-09-04 13:05:30 +04:00
AnyOldName3
cc23a968d1
Merge upstream/master
2018-08-01 14:13:45 +01:00
Capostrophic
d000f2756e
Update disabled warnings
2018-07-10 14:20:26 +03:00
Capostrophic
7fd66c77e6
Update CMake lists for Windows
...
Don't use the debug console on Release-mode builds
Disable spammy 4297 and 5032 warnings that are not specific to OpenMW
2018-07-10 14:20:25 +03:00
AnyOldName3
553094669b
Merge upstream/master (& fix merge conflicts)
2018-06-20 00:11:23 +01:00
Marc Zinnschlag
cae744161b
increased version number
2018-06-04 15:08:22 +02:00
Andrei Kortunov
de2513653e
AppVeyor: build with Release configuration
2018-05-28 09:08:30 +04:00
AnyOldName3
759e6fb804
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-05-27 15:41:42 +01:00
Andrei Kortunov
48e15dabc3
Try to generate PDB for release builds
2018-05-25 14:25:04 +04:00
AnyOldName3
44b2cf2b7f
Merge upstream.
2018-05-11 19:15:04 +01:00
scrawl
789f552ad4
Delete old mygui_resource_plugin which is unlikely to be brought back in its current form because resources can't be accessed by MyGUI's editor if not using the Ogre resources system.
2018-04-18 12:36:09 +00:00
bret curtis
4890ecd357
remove native GLESv* support, as it never worked; make things less complicated as result, fixed lighting.glsl to work with gl2es thanks to ptitSeb
2018-03-27 20:20:40 +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
AnyOldName3
451d0de463
Remove dependency on osgAnimation that somehow snuck in
2018-02-27 16:18:42 +00:00
AnyOldName3
6ec893b618
Merge remote-tracking branch 'refs/remotes/upstream/master'
2018-01-22 15:54:13 +00:00
Thunderforge
bd072b131b
Moving controller file out of the controllers subdirectory
2018-01-02 20:58:43 -06:00
Thunderforge
3f7143556a
Providing different mappings depending on the version of SDL installed
2018-01-01 22:16:54 -06:00
AnyOldName3
f56a117bde
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2017-12-26 23:52:25 +00:00
Thunderforge
e4a1b6b5b8
Explicitly setting CMAKE_CXX_STANDARD to C++11
2017-12-16 14:36:27 -06:00
AnyOldName3
0e481a457e
Merge remote-tracking branch 'refs/remotes/upstream/master'
2017-12-08 23:26:08 +00:00
scrawl
a4d8aef40d
Merge branch openmw-43 into master
...
Conflicts:
CMakeLists.txt
README.md
files/mygui/openmw_trade_window.layout
2017-11-29 22:37:50 +00:00
AnyOldName3
25432146f7
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2017-11-07 22:08:21 +00:00
scrawl
3d347730dc
Merge pull request #1524 from psi29a/cmake_31
...
standerdise on 3.1.0
2017-11-05 16:18:34 +00:00
Miloslav Číž
282800b5b2
Create LICENSE ( #1532 )
...
* Create LICENSE
Let's add the license file so that GitHub officially registers it and displays it next to the project.
* move license files
* update licenses in cmakelists.txt
* fix link in README
2017-11-05 15:37:38 +00:00
Bret Curtis
d19839a666
standerdise on 3.1.0
2017-10-25 21:55:58 +02:00
Alexander "Ace" Olofsson
2e6cf53fdd
Update CPack configuration for NSIS packages
...
Now grabs generated files from the configuration directory where they're
generated
2017-10-24 23:05:56 +02:00
Marc Zinnschlag
0153b54c3f
increased version number
2017-10-23 14:08:08 +02:00
AnyOldName3
2a90dff388
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2017-10-19 15:06:49 +01:00
AnyOldName3
9571cd8754
Switch defaultfilters to be handled by a binary-friendly version of the resource macro
2017-10-19 00:50:57 +01:00
AnyOldName3
147455626e
Merge OpenMW/master
2017-10-13 21:39:15 +01:00
AnyOldName3
ef7102899a
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
2017-10-13 21:26:58 +01:00
AnyOldName3
f8fe992dc0
Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files
2017-10-11 21:58:55 +01:00
Alexander "Ace" Olofsson
dc127fbb93
Add a launch checkbox to the OpenMW installer
2017-10-08 11:58:38 +02:00
AnyOldName3
76e8a0b768
Add changes I missed in a merge.
2017-09-11 22:32:45 +01:00
AnyOldName3
afbdc27a34
Move calls to cmake_minimum_required as early in the CMake process as possible.
2017-09-10 18:30:10 +01:00
scrawl
5d524a6a10
Add custom version of MorphGeometry replacing osgAnimation
...
Double buffering, custom bounding box and the update in the cull visitor (instead of update) are now all handled internally rather than needing hacks and/or callbacks.
2017-09-01 21:42:36 +00:00
scrawl
60c7876c3d
Merge pull request #1364 from OpenMW/openmw-42
...
Merge openmw-42
2017-08-01 22:16:45 +00:00
Nikolay Kasyanov
49b02a1bf4
[macOS] remove use of deprecated CMake policy
2017-07-30 15:48:00 +02:00
Nikolay Kasyanov
fd0be7008d
[macOS] Fixes accidental loading of plugins from system-wide Qt install
...
I was too eager to remove the workaround in 014a2fc0e9http://doc.qt.io/qt-5/qt-conf.html .
Also, moves Qt plugins from Contents/MacOS to Contents/PlugIns
for consistency.
2017-07-30 15:43:45 +02:00
Bret Curtis
cf6f368560
rtd backport fix
2017-07-29 11:52:13 +02:00
Bret Curtis
ac7b1bf97d
appstream to new location: https://lintian.debian.org/tags/appstream-metadata-in-legacy-location.html
2017-07-28 19:16:32 +02:00
PlutonicOverkill
9924e4a35b
Stop VS2017 spamming warnings
...
Disable warning caused by the string and stream-related standard headers.
2017-07-24 17:49:39 +12:00
Nikolay Kasyanov
4138723bbf
[OS X] Add libc++ to linker flags
2017-06-09 16:49:25 +02:00
Bret Curtis
5fa2f46499
only set libc++ for APPLE
2017-06-09 16:49:25 +02:00
Bret Curtis
26c023efe2
stdlib to libc++
2017-06-09 16:49:25 +02:00
Bret Curtis
cb26f52032
matching ifs
2017-06-09 16:49:25 +02:00
Bret Curtis
5a65d6e18d
fix std::move
2017-06-09 16:49:25 +02:00
Bret Curtis
433129e728
only bundle with Qt5, for now
2017-06-09 16:49:25 +02:00
Bret Curtis
dbc29854b2
try to fix enums
2017-06-09 16:48:40 +02:00
Bret Curtis
b657517bea
use c++11 and see what happens
2017-06-09 16:48:40 +02:00
Marc Zinnschlag
13517e723a
increased version number
2017-04-11 10:05:57 +02:00
Nikolay Kasyanov
7f429f26e1
Allow getting available version information even when clone is shallow
2017-03-07 21:53:49 +01:00
scrawl
cdca9b0488
Accept bullet 283 on appveyor as well
2017-02-07 20:40:07 +01:00
scrawl
dfa43af818
Update bullet dependency to 2.86
2017-02-07 18:05:24 +01:00
Nikolay Kasyanov
ee7f5d7d85
[macOS] Move all configs & resources into app bundles
...
Fixes #3566 (https://bugs.openmw.org/issues/3566 ).
2016-11-25 02:54:02 +01:00
Marc Zinnschlag
0874d69546
increased version number
2016-11-24 17:07:52 +01:00
Phillip Andrews
aeaedbc57a
Moved install commands to target-specific cmakelists so that all configurations work.
2016-11-13 22:49:01 -06:00
Phillip Andrews
7383cc9de4
Forgot to undo my test edits because I am a big dum-dum
2016-11-13 17:06:00 -06:00
Phillip Andrews
59eba1dede
Changed tabs to spaces, oops
2016-11-13 16:59:36 -06:00
Phillip Andrews
2efd38b1ab
Fix install procedure so it works with all MSVC build configurations, not just Release
2016-11-13 13:32:42 -06:00
scrawl
105fcc5e20
Move the setting of BOOST_COMPONENTS closer to where it's actually used
2016-10-10 18:23:06 +02:00
scrawl
50bcb65ee0
Move USED_OSG_PLUGINS to the top of the CMakeLists to be used by all platforms
2016-10-08 19:20:24 +02:00
Nikolay Kasyanov
4815938de2
[OS X] Add missing plugins to packaging script
...
Source: https://wiki.openmw.org/index.php?title=Development_Environment_Setup#OSG_plugins
Issue: https://bugs.openmw.org/issues/3585
2016-10-08 17:07:06 +02:00
Bret Curtis
55fb33670c
Make building osgQt dependant on building openmw-cs
2016-09-28 14:36:51 +02:00
Alexander "Ace" Olofsson
c01d9e9ec5
Only package the Qt 5 platform DLLs on Qt 5
2016-09-08 02:19:12 +02:00
Alexander "Ace" Olofsson
c9d4ff35c4
Install Qt5 platform DLLs on Windows
2016-08-29 18:40:40 +02:00
Alexander "Ace" Olofsson
d781846f53
Fix the /bigobj issue and some script cleanup
...
Surprisingly specific problem I must say, 32-bit vs2015 unity builds
2016-08-28 23:23:44 +02:00
Alexander "Ace" Olofsson
dd5b6a46f5
Visual Studio 2015 support
2016-08-28 21:42:48 +02:00
Marc Zinnschlag
cc7b1f8543
Merge branch 'openmw-40'
2016-08-24 09:59:50 +02:00
Roman Proskuryakov
95dc1258d6
Rewrites find_package for OpenSceneGraph plugins using LibFindMacros and osg_find_library
2016-08-16 06:06:30 +03:00
scrawl
a44ba0e461
Merge pull request #966 from kpp/find_mygui
...
Find mygui
2016-08-15 16:36:48 +02:00
Roman Proskuryakov
4cffdb67d8
Uses case-sensitive MyGUI_* variables
2016-08-15 15:59:02 +03:00
Marc Zinnschlag
d170a50e8a
increased version number
2016-08-01 11:18:35 +02:00
Marc Zinnschlag
2db5cec98b
Merge remote-tracking branch 'psi29a/sphinx'
2016-07-30 08:22:27 +02:00
Bret Curtis
7f0d5bde2d
make conf.py independant from cmake macros
...
merged openmw-cs in, using per directory statics
add requirements.txt for sphinx docs
it is breath
update gitignore and openmw-cs
2016-07-29 18:14:54 +02:00
Nikolay Kasyanov
bf0ec550da
OS X: specify minimum CMake version & remove redundant argument from CI script
2016-07-07 01:09:59 +02:00
Bret Curtis
ac8d347e9e
we have html output and autodoc functionality
2016-07-05 12:07:31 +02:00
Roman Proskuryakov
28c63aea72
Uses FindTinyXML to find package
2016-06-12 21:40:02 +03:00
Roman Proskuryakov
edb41b5b08
Rewrites FindLIBUNSHIELD using LibFindMacros
...
Renames LIBUNSHIELD_INCLUDE_DIR -> LIBUNSHIELD_INCLUDE_DIRS, LIBUNSHIELD_LIBRARY -> LIBUNSHIELD_LIBRARIES
2016-06-12 14:44:04 +03:00
Roman Proskuryakov
3bcd23022a
Rewrites FindBullet using LibFindMacros handling version properly
2016-05-31 07:18:37 +03:00
makson96
56548b384d
Include FindPkgMacros to use make_library_set
...
In CMakList.txt there is make_library_set and macro for it is defined in FindPkgMacros, so FindPkgMacros needs to be imported to avoid Error: Unknown CMake command "make_library_set".
2016-05-25 00:41:36 +02:00
scrawl
fcbcc004a3
Don't use unordered_map
2016-05-11 02:35:17 +02:00
Roman Proskuryakov
da59ef0f67
Rewrites FindFFmpeg using LibFindMacros handling components properly
2016-05-10 12:43:54 +03:00
Roman Proskuryakov
a6b67154bb
Use builtin compiler version in CMake scripts
2016-05-09 23:35:33 +03:00
Marc Zinnschlag
62af1b67cf
increased version number
2016-04-05 09:27:20 +02:00
scrawl
195c3b9967
Merge pull request #904 from sandstranger/disable_opengles_anddroid
...
disable opengl es for Android by default
2016-02-25 21:39:25 +01:00
sandstranger
a7b78b37f5
disable opengles for Android by default
2016-02-25 22:39:18 +03:00
scrawl
52f4c07648
Enable -Wundef
2016-02-25 20:37:00 +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
scrawl
9eb96b9cb6
Parse the bullet version in FindBullet.cmake
2016-02-15 14:34:59 +01:00
scrawl
f94722b271
OSG 3.3.4 is the first release to include the DDS crash fix
2016-02-12 14:55:00 +01:00
scrawl
8b596dfcbe
Remove support for OSG 3.2
...
Since commit e8662bea31
2016-02-12 14:46:45 +01:00
scrawl
41675be970
Merge branch 'openmw-38'
2016-02-02 23:01:21 +01:00
Alexander "Ace" Olofsson
338f0cf53d
Merge branch 'appveyor' of github.com:ace13/openmw into appveyor
2016-01-19 22:11:46 +01:00
sandstranger
48f4fc34eb
build fixes for Android
2016-01-05 15:37:17 +03:00
Marc Zinnschlag
6c676c861c
increased version number
2016-01-04 18:03:47 +01:00
Alexander "Ace" Olofsson
93ee8f1991
Allow for earlier CMake on Qt4
2015-12-24 11:33:59 +01:00
Alexander "Ace" Olofsson
fe241be26c
Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor
2015-12-24 11:27:02 +01:00
Alexander "Ace" Olofsson
1dbc1e67d8
Possible Qt5 link fix for AppVeyor
2015-12-24 02:41:35 +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
cc9cii
226f7b6928
Suppress additional MSVC warnings after Update 1
2015-12-18 19:42:19 +11:00
Marc Zinnschlag
9c7bbd667b
Merge branch 'usersettings'
2015-12-15 14:58:04 +01:00
Marc Zinnschlag
d6bd2cb1f0
changed name of openmw-cs user settings file
2015-12-15 14:51:25 +01:00
Paul Cercueil
46f45773ca
CMake: Add the list of possible values for some config options
...
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
2015-12-06 15:55:23 +01:00
cc9cii
65df15a89d
Suppress MSVC 2015 warnings about hidden/deleted base class move constructors and move assignment operators.
2015-12-06 15:26:20 +11:00
scrawl
d3caeaf898
Remove unused SOUND_INPUT_INCLUDES cmake variable.
...
(cherry picked from commit 0220e82259
2015-12-05 17:32:55 +11:00
sandstranger
7db307e028
delete unused variables
2015-12-03 22:37:42 +03:00
sandstranger
7d374b36fd
change cmake variables
2015-12-03 21:29:50 +03:00
sandstranger
d9b1b7c516
addd forgotten line
2015-12-03 19:56:38 +03:00
sandstranger
238a5824be
add custom new variable fot Qt
2015-12-03 08:54:14 +03:00
sandstranger
bd5057aa3c
enable opengl es1
2015-12-02 22:40:04 +03:00
scrawl
77965501d4
CMakeLists.txt: set the OPENMW_RESOURCE_FILES before configuring openmw.cfg
2015-12-02 17:33:55 +01:00
scrawl
7d6fa1b65a
CMakeLists.txt: Don't use DATADIR before it's defined
2015-12-02 16:14:04 +01:00
Dmitry Marakasov
84305a1297
Reuse DATADIR in data paths
2015-12-02 04:17:54 +03:00
scrawl
dca1674133
Merge remote-tracking branch 'upstream/openmw-37' into HEAD
2015-11-24 03:30:57 +01:00
Nikolay Kasyanov
2108e96c15
OS X: use TGA, PNG & JPEG plugins instead of ImageIO
...
Using ImageIO is troublesome when one needs to read an image from memory,
see for the details: https://forum.openmw.org/viewtopic.php?f=20&t=2949&start=220#p35531
2015-11-22 19:32:13 +01:00
Marc Zinnschlag
020b3add94
Merge branch 'openmw-37'
2015-11-17 09:54:49 +01:00
scrawl
0220e82259
Remove unused SOUND_INPUT_INCLUDES cmake variable.
2015-11-14 17:17:22 +01:00
Nikolay Kasyanov
63c47a78d6
OS X: fixup Qt plugin during packaging
2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
d5aeb35449
OS X: use link path for packaging to allow CMake infer library search dirs for @rpath resolving
2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
fff6b5fde1
OS X: remove custom bundle utilities, ones from CMake versions >= 3.1.0 are good enough
2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
5c4899580f
OS X: use less ambiguous variable names in packaging code
2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
3ba546628d
OS X: always copy Cocoa platform plugin into OpenMW bundle
2015-11-14 13:50:01 +01:00
