mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 17:29:55 +00:00
Code Issues Releases Wiki Activity
35163 commits 107 branches 66 tags 133 MiB
Commit graph

1087 commits

Author SHA1 Message Date
psi29a
e9fbd76e9b Merge branch 'windows_tests' into 'master' 
Support running tests and benchmarks for windows

See merge request OpenMW/openmw!839
 2021-05-18 08:12:22 +00:00
psi29a
4bc7012104 Merge branch 'pack-default-settings' into 'master' 
Pack default settings

Closes #5925

See merge request OpenMW/openmw!822
 2021-05-18 08:11:13 +00:00
AnyOldName3
081650a2e5 Integrate Base64 library with build 2021-05-17 23:00:23 +01:00
psi29a
b583c2300c Merge branch 'maybe-fix#5551' into 'master' 
Fix #5551

Closes #5551

See merge request OpenMW/openmw!802
 2021-05-17 08:16:02 +00:00
Andrei Kortunov
963e1b8b3f Fix MSVC's C4244 warnings 2021-05-12 10:34:40 +04:00
Andrei Kortunov
f9d42ed396 Fix MSVC's C4267 warnings 2021-05-12 10:34:39 +04:00
elsid
4d7e5245a3
Support benchmarks for windows 
Don't run the binary because gitlab can't execute it successfully due to
unknown reason.
 2021-05-11 13:16:59 +02:00
AnyOldName3
0d737a3501 Create defaults.bin at configure time 2021-05-09 21:00:49 +01:00
Bret Curtis
4f5d697e2b Do not fail when unable to detect the FFMPEG version, like windows. 2021-05-05 10:36:34 +02:00
Gleb Mazovetskiy
e3a6cb1695 Remove OsIdentity.cmake 
Removes the OsIdentity.cmake file and uses a cross-compilation friendly
and OS-independent method of detecting system double-precision bullet
instead.
 2021-05-03 00:08:47 +01:00
psi29a
7f7041656d Merge branch 'enforce_double_bullet' into 'master' 
Remove support for single-precision Bullet, fail during configuration instead of during linking (#5980)

See merge request OpenMW/openmw!806
 2021-05-02 20:52:57 +00:00
fredzio
6fd04cb8f6 Remove support for single-precision Bullet, fail during configuration instead of during linking. 2021-05-02 17:48:50 +02:00
AnyOldName3
1626762d5c Maybe fix #5551 
If we were doing this properly, we'd migrate to
https://cmake.org/cmake/help/latest/module/InstallRequiredSystemLibraries.html
but this should hopefully remove a blocker for 0.47
 2021-05-01 22:20:51 +00:00
Chris Djali
f0cef87cd8
Merge pull request #3069 from akortunov/msvc_warnings 
Rework warnings settings
 2021-05-01 19:03:43 +01:00
psi29a
16bb3919d1 Merge branch 'navmesh_cache_simplification' into 'master' 
Simplify navmesh cache

See merge request OpenMW/openmw!691
 2021-04-28 08:01:06 +00:00
Andrei Kortunov
8aa76ff540 Use W4 instead of Wall for MSVC 2021-04-23 22:54:02 +04:00
Andrei Kortunov
f2f2c3d873 Disable -Wsuggest-override again since we have no control over code from FetchContent 2021-04-21 09:28:51 +04:00
Andrei Kortunov
1b1c786d0c Do not suppress fixed MyGUI warnings 2021-04-19 15:34:22 +04:00
Andrei Kortunov
f308dde254 Clean up MSVC warnings 2021-04-17 12:14:50 +04:00
elsid
b9a40bc5fc
Add NavMeshTilesCache benchmarks 2021-03-25 19:28:41 +01:00
Gleb Mazovetskiy
493659d4f9 MSVC: extern/ tweaks to make it build 
Not everything is supported but it does build with the following CMakeSettings.json
variables and dependencies from vcpkg:

      "variables": [
        { "name": "OPENMW_USE_SYSTEM_BULLET", "value": "False", "type": "BOOL" },
        { "name": "OPENMW_USE_SYSTEM_MYGUI", "value": "False", "type": "BOOL" },
        { "name": "OPENMW_USE_SYSTEM_OSG", "value": "False", "type": "BOOL" },
        { "name": "BULLET_STATIC", "value": "True", "type": "BOOL" },
        { "name": "OSG_STATIC", "value": "False", "type": "BOOL" },
        { "name": "MYGUI_STATIC", "value": "False", "type": "BOOL" }
      ],

What works: it builds

What does not work: Not all DLLs are copied into the output directory with this set up
(SDL2, MyGUI, Bullet, OSG, are not copied).
 2021-03-16 19:52:10 +00:00
Gleb Mazovetskiy
f460ab2152 MSVC: Fix build with vcpkg's boost 
boost-zlib is not present (nor needed) in vcpkg version of boost
There, it is part of boost-iostreams instead.

This was previously reported in:
https://gitlab.com/OpenMW/openmw/-/merge_requests/213#note_348625016
 2021-03-16 01:36:07 +00:00
AnyOldName3
450b971bb0 Merge branch 'gl4es-patch' into 'master' 
gl4es: Delay feature detection until a context exists

See merge request OpenMW/openmw!626
 2021-03-10 19:01:39 +00:00
Bret Curtis
c4064fca0c include feedback and add DebugUtils and Detour 2021-03-02 23:11:06 +01:00
Bret Curtis
28cb14289a initial attempt at FindRecastNavigation.cmake 2021-03-02 22:48:17 +01:00
Gleb Mazovetskiy
044e784072 gl4es: Delay feature detection until a context exists 
gl4es feature detection does not work reliably with EGL.

If a context already exists, gl4es can instead reliably detect
the underlying GLES features from the context itself.

This requires gl4es to be configured with:

    -DNOEGL=ON -DNO_LOADER=ON -DNO_INIT_CONSTRUCTOR=ON

This also requires gl4es to have this fix: https://github.com/ptitSeb/gl4es/pull/271
 2021-02-28 07:59:48 +00:00
psi29a
96b5581930 Merge branch 'fetchcontent-recast-navigation' into 'master' 
Move recastnavigation to FetchContent

Closes #5793

See merge request OpenMW/openmw!614
 2021-02-20 00:36:42 +00:00
Gleb Mazovetskiy
e265d0bc2b Fix OSGPlugins_LIB_DIR on the MacOS build 
Moves auto-detection of OSGPlugins_LIB_DIR into FindOSGPlugins.cmake.

This should hopefully fix the error in the MacOS build.
 2021-02-19 19:00:24 +00:00
Gleb Mazovetskiy
1c9245bd58 Move recastnavigation to FetchContent 2021-02-19 18:35:34 +00:00
psi29a
5c0214142b Merge branch 'static-build' into 'master' 
Optional local source builds of OSG, MyGUI, Bullet

See merge request OpenMW/openmw!547
 2021-02-19 16:58:05 +00:00
AnyOldName3
c97980a0f6 Don't force linker to work with doubly-defined symbols 2021-02-11 01:35:32 +00:00
Gleb Mazovetskiy
3d334dae75 Fix MYGUI/OSG_STATIC and BUILD_SHARED_LIBS 2021-01-26 19:00:55 +00:00
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.
 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
26814b2386 CMakeLists.txt: Restore policies as we unbumped cmake version 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
98564b0aae cmake: move cmake_minimum_required bump to extern/CMakeLists.txt 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
a06f598442 cmake: Move USED_OSG_(COMPONENTS|PLUGINS) before add_subdirectory(extern) 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
8737453498 cmake: Compiler-specific whole-archive macro 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
93fe84aea8 cmake: Move USED_OSG_(COMPONENTS|PLUGINS) from extern to top-level 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
99ba45a308 Optional static builds of OSG, MyGUI, Bullet 2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
24d8412c0c cmake: Fix missing OPENGL_INCLUDE_DIR 
OPENGL_INCLUDE_DIR wasn't being included.
It is usually just /usr/include but if it was custom the build failed.
 2021-01-14 02:52:59 +00:00
wareya
18ef32ca82 values for this higher than sGroundOffset cause jittering on some surface; use safe-seeming value slightly less than sGroundOffset 2020-12-27 22:16:11 +00:00
Mads Buvik Sandvei
637c76f438 Update CMakeLists.txt 2020-12-19 08:34:36 +00:00
Mads Buvik Sandvei
a2a462f416 Update CMakeLists.txt to disable MSVC warning 4866 2020-12-18 20:04:24 +00:00
Nelsson Huotari
6e77ad1f6a OSG-Collada animation support 2020-11-19 01:11:56 +02:00
Bret Curtis
4032b754e4 set minimal boost version; remove #ifdef boost version checks 2020-10-25 22:43:10 +01:00
Bret Curtis
449e7ce86f C++17; make it count 2020-10-21 22:12:24 +02:00
Bret Curtis
82431b752d removed unnessary bits that cmake should be doing for us; replace Misc::gcd with std::gcd 2020-10-20 23:38:05 +02:00
psi29a
c62546fb12 make it count 2020-10-20 23:38:05 +02:00
psi29a
c86094e4db Bump to C++17 2020-10-20 23:38:05 +02:00
Bret Curtis
7954dccb44 lz4 prep work; get linux and windows ready 2020-10-19 22:31:42 +03:00
psi29a
b222872446 Android build on gitlab 2020-10-19 08:27:38 +00:00
Bret Curtis
8050882baf
Merge pull request #3015 from akortunov/overrides 
Mark overrided methods as overrides
 2020-10-17 13:32:08 +02:00
Andrei Kortunov
8ca3c3b123 Mark overrided methods by override keyword 2020-10-16 22:18:54 +04:00
Chris Djali
590635906b
Fix MSVC 2017 
Resolves the regression introduced with Async Physics
 2020-10-15 21:02:57 +01:00
tess
38e567a7e4 match opening and closing if args 2020-10-08 19:34:03 +00:00
tessa
02861fa8e3 fix cmake warning 2020-10-08 13:06:04 -05:00
AnyOldName3
683cf8cad5 Remove incorrect spaces from filename 2020-10-06 16:56:55 +00:00
fredzio
e2a603f6e8 Remove blank space 2020-10-06 09:08:49 +02:00
fredzio
ae38b3d9b2 Put the install logic in one place for all platforms 2020-09-23 20:00:32 +02:00
AnyOldName3
be5fd6fd03 Exclude directories correctly 
We don't need `/*` as we don't want the directory itself, not just its
contents. We also need to list possible other directories explicitly as
there's currently no way to skip directories without matches.

It would be much nicer if CMake was tracking the DLLs we needed for us.
 2020-09-23 20:00:32 +02:00
AnyOldName3
8dd820ba48 Exclude deps 2020-09-23 20:00:32 +02:00
AnyOldName3
d0ddf488db Install PDBs when appropriate 2020-09-23 20:00:32 +02:00
AnyOldName3
db0f7c607f Make Windows install target slightly less breakable 2020-09-23 20:00:32 +02:00
fredzio
87290cf6d1 Add support for multi configurations generators on unix 
Since version 3.17 cmake supports the Ninja Multi-Config
No change for Xcode, VS and Ninja "single config"
 2020-09-23 20:00:32 +02:00
AnyOldName3
643db61dfb Make warnings more informative. 2020-09-03 20:38:02 +01:00
AnyOldName3
1dcea961c6 Only enable LTO for release 
This is how it was for the original implementation
 2020-09-03 20:15:53 +01:00
Eli2
257a6b4629 Use cmake method to enable interprocedural optimizations 2020-09-03 20:01:20 +01:00
AnyOldName3
9d083ae8de Merge branch 'small_fixes' into 'master' 
move project/cmake to top; set OpenGL_GL_PREFERENCE to LEGACY since we use GL2...

See merge request OpenMW/openmw!266
 2020-08-21 17:24:08 +00:00
Bret Curtis
b0c4336577 update DejaVuFontLicense entry 2020-07-26 22:53:46 +02:00
Bret Curtis
e40b309d83 move project/cmake to top; set OpenGL_GL_PREFERENCE to LEGACY since we use GL2 and GLNVD is for GL3 and up (https://github.com/openscenegraph/OpenSceneGraph/issues/639); set our RTD to point to stable and not master, stable follows our latest stable release 2020-07-17 16:23:12 +02:00
Bret Curtis
f47d2bb8af make sure we use case-sensative BULLET_ prefix 2020-07-10 15:01:44 +02:00
Bret Curtis
16ca9e2fbd put back INSTALL platforms 2020-06-22 21:16:23 +02:00
Bret Curtis
61a5c6125d #5480: Drop Qt4 support and require Qt 5.12 or later. 2020-06-22 12:17:06 +02:00
laikh
d6e4fbe085 Fix mingw Windows build 2020-05-24 08:53:43 +08:00
Andrei Kortunov
add42830d9 Add a flag to use double-precision functions from Bullet 2020-05-15 12:48:47 +04:00
elsid
fa861f5d8e
Revert remove of platforms install 2020-05-13 18:20:37 +02:00
elsid
e095f6b306
Remove install for not existing file 2020-05-09 19:43:48 +02:00
elsid
99cd99bc3b
Remove unused BUILD_MYGUI_PLUGIN option 2020-05-09 19:42:36 +02:00
Frederic Chardon
513ac8986d Add link to opencs documentation on readthedocs, available through 
context menu.
The documentation opens in default browser.

There are 3 contexts:
- global: opens the OpenMW CS User Manual main page
- when a record is selected: opens the "Tables" page
- when the filter field is selected: opens the "Record Filters" page

There is also a link to the OpenCS tutorial in the help menu.
 2020-04-18 20:54:21 +00:00
Bret Curtis
613189d7d9 bump to 0.47 for new dev cycle 2020-04-07 12:55:17 +02:00
Bret Curtis
b243ee6f74
Merge pull request #2744 from OpenMW/debian_appstream 
add launchable type
 2020-04-05 10:05:20 +02:00
Roman Siromakha
3bd2c114a7
Merge pull request #2741 from akortunov/warnfix 
Fix C5204 warnings by adding default virtual destructors
 2020-04-04 00:12:07 +02:00
Hristos N. Triantafillou
da7032caff
Two more that I missed 2020-04-02 13:45:11 -05:00
Hristos N. Triantafillou
e6a6411b95
These files aren't in the repo anymore 2020-04-02 13:32:49 -05:00
Andrei Kortunov
e63325ebff Support for camera rotation via gyroscope on Android (feature #5311) 2020-04-01 19:57:04 +04:00
Bret Curtis
deac2abc0f add launchable type; rename files to be conform to freedesktop.org and debian standards 2020-03-27 08:12:06 +01:00
Andrei Kortunov
fe75308fdb Disable warning C5204 which come from Boost library 2020-03-26 14:51:14 +04:00
Andrei Kortunov
05a8702b6e Fix Boost 1.70+ detection 2019-11-28 16:46:18 +04:00
capostrophic
1f3740225b Purge unnecessary recast stuff 2019-08-05 01:40:35 +03:00
Grigory
28e54c25ee Add -DMYGUI_DONT_REPLACE_NULLPTR 2019-07-28 21:04:37 +03:00
Andrei Kortunov
9059971a69 Increase required MyGUI version to 3.2.2 2019-04-22 20:52:18 +04:00
Bret Curtis
df9a8cf957 bump from 11 to 14 2019-04-09 22:34:26 +02:00
Nikolay Kasyanov
6363cc8839 Relax CMake version requirements on macOS 2019-03-28 20:48:54 +01:00
Bret Curtis
bf144fb356
Merge pull request #2238 from Capostrophic/freetype 
Include osgdb_freetype in builds with statically linked OSG
 2019-03-10 11:48:25 +01:00
Capostrophic
7a07984e2c Include osgdb_freetype in builds with statically linked OSG 2019-03-10 01:11:23 +03:00
elsid
a979d24bf3
Mark OpenSceneGraph include directories as system 
To avoid warnings spam when use custom build.
 2019-03-09 17:33:31 +03:00
AnyOldName3
8482236a82 Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 2019-01-24 23:09:23 +00:00
Capostrophic
c9df63ffd1 Replace BSAOpt hash calculation with a custom function 2019-01-22 02:22:57 +03:00
Azdul
a3bcd95546 Merge branch 'cc9cii' of https://github.com/cc9cii/openmw into tes4_bsa 2019-01-18 09:11:41 +01:00
Azdul
b30d2bab57 Zlib only for Win32 2019-01-16 20:47:59 +01:00
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 014a2fc0e9.
Actually, config-based solution seems cleaner.
Respective Qt documentation: http://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