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

808 commits

Author SHA1 Message Date
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, we're using OSG functionality that contains an unfixed crash bug in version 3.2. The bug is fixed in version 3.4 (OSG commit 6351e5020371b0b72b300088a5c6772f58379b84)
 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
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
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
Bret Curtis
3ea3d07d44 really purge libav 2015-11-12 16:39:29 +01:00
Marc Zinnschlag
cdf17f415e updated version number 2015-11-09 12:03:27 +01:00
Nikolay Kasyanov
dbcce482a6 OS X: enable high resolution mode for OpenMW & OpenCS 
We don't support retina completely yet, but it's still better than
blurry mess, and Qt does pretty good job for OpenCS already.
 2015-08-15 22:37:09 +02:00
Marc Zinnschlag
7f398f8790 Merge remote-tracking branch 'corristo/osx-packaging-nextgen' 2015-08-11 11:49:20 +02:00
Nikolay Kasyanov
34d601360f OS X: setup OSG plugins packaging 2015-08-10 23:15:32 +02:00
Nikolay Kasyanov
2ded28f6aa OS X: reintroduce packaging code 
It's much simpler now thanks to bundle utilities with @rpath support.
 2015-08-10 23:15:32 +02:00
Alexander "Ace" Olofsson
46ce04a65b Don't package duplicate version for Windows 
The real version file is in the resources folder, and that's where it's read from. So the extra file is unused, and redundant.
 2015-08-05 17:10:35 +02:00
Alexandre Moine
581ea26605 Add appdata file for openmw and install it 2015-08-04 13:06:43 +02:00
Arthur Moore
2a653e45fd (Re) Wrote a tool to test NIF files in BSAs and on the filesystem. 
Just give it a set of files, one file per argument, and it will make sure openmw can read them.
 2015-07-28 06:51:47 -04:00
Marc Zinnschlag
4fa2cd288d Merge branch 'openmw-36' 
Conflicts:
	apps/openmw/mwworld/store.hpp
 2015-07-18 12:47:05 +02:00
Marc Zinnschlag
b3ad983f1f Merge remote-tracking branch 'scrawl/version' 
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
 2015-07-18 12:22:37 +02:00
scrawl
f09e4620b6 Move OpenMW version information to a textfile instead of compiling it in 
Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.
 2015-07-18 03:09:04 +02:00
slothlife
83ef1f7eea Add support for linking OpenSceneGraph statically 
Added some basic support for linking to OpenSceneGraph and its plugins
statically. Also added a library necessary to statically link MyGUI
(previously Ogre pulled it in).
 2015-07-17 00:56:15 -05:00
scrawl
cd2e6d4436 Move the __STDC_CONSTANT_MACROS define to cmakelists 2015-06-28 05:53:03 +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
e13a938896 Add support to build with Qt5 (Task #2665) 
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
 2015-06-12 15:13:42 +02:00
scrawl
45fcea929a Refactor cmake scripts, reducing the amount of find_package(FFmpeg) 2015-06-12 01:45:48 +02:00
scrawl
cf95d3fc35 Refactor cmake scripts, reducing the amount of find_package(Boost) 2015-06-12 01:45:19 +02:00
scrawl
fc5176dc38 Refactor cmake scripts, reducing the amount of find_package(Qt4) 2015-06-11 23:38:08 +02:00
Alexander "Ace" Olofsson
cd42448cd6 Windows build fixes and CMakeLists cleanup 
Adds some flags necessary to build and link with OSG.
This also moves LTO and MP switches to user-accessible options, and actually
applies the generated CXXFLAGS to the project. Since the generation
happens after the subdirectories are added.
 2015-06-08 15:41:39 +02:00
scrawl
d9a00288f8 Make install fix 2015-06-08 01:58:12 +02:00
scrawl
58917bcca6 Minor cleanup 2015-06-04 01:24:29 +02:00
scrawl
4bb3cbf0fb Remove last remains of Ogre 2015-06-03 23:04:35 +02:00
scrawl
974fda5bde Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp
 2015-06-03 03:18:29 +02:00
scrawl
cdd0623009 Terrain rendering 2015-06-03 01:35:41 +02:00
scrawl
b0b55e2037 Delete niftest as it's currently broken 2015-06-01 02:48:15 +02:00
Marc Zinnschlag
d05d7f51d9 increased version number 2015-05-31 14:20:13 +02:00