AnyOldName3
6ec893b618
Merge remote-tracking branch 'refs/remotes/upstream/master'
7 years ago
Thunderforge
bd072b131b
Moving controller file out of the controllers subdirectory
7 years ago
Thunderforge
3f7143556a
Providing different mappings depending on the version of SDL installed
7 years ago
AnyOldName3
f56a117bde
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
7 years ago
Thunderforge
e4a1b6b5b8
Explicitly setting CMAKE_CXX_STANDARD to C++11
7 years ago
AnyOldName3
0e481a457e
Merge remote-tracking branch 'refs/remotes/upstream/master'
7 years ago
scrawl
a4d8aef40d
Merge branch openmw-43 into master
...
Conflicts:
CMakeLists.txt
README.md
files/mygui/openmw_trade_window.layout
7 years ago
AnyOldName3
25432146f7
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
7 years ago
scrawl
3d347730dc
Merge pull request #1524 from psi29a/cmake_31
...
standerdise on 3.1.0
7 years ago
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
7 years ago
Bret Curtis
d19839a666
standerdise on 3.1.0
7 years ago
Alexander "Ace" Olofsson
2e6cf53fdd
Update CPack configuration for NSIS packages
...
Now grabs generated files from the configuration directory where they're
generated
7 years ago
Marc Zinnschlag
0153b54c3f
increased version number
7 years ago
AnyOldName3
2a90dff388
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
7 years ago
AnyOldName3
9571cd8754
Switch defaultfilters to be handled by a binary-friendly version of the resource macro
7 years ago
AnyOldName3
147455626e
Merge OpenMW/master
7 years ago
AnyOldName3
ef7102899a
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
7 years ago
AnyOldName3
f8fe992dc0
Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files
7 years ago
Alexander "Ace" Olofsson
dc127fbb93
Add a launch checkbox to the OpenMW installer
7 years ago
AnyOldName3
76e8a0b768
Add changes I missed in a merge.
7 years ago
AnyOldName3
afbdc27a34
Move calls to cmake_minimum_required as early in the CMake process as possible.
7 years ago
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.
7 years ago
scrawl
60c7876c3d
Merge pull request #1364 from OpenMW/openmw-42
...
Merge openmw-42
8 years ago
Nikolay Kasyanov
49b02a1bf4
[macOS] remove use of deprecated CMake policy
8 years ago
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.
8 years ago
Bret Curtis
cf6f368560
rtd backport fix
8 years ago
Bret Curtis
ac7b1bf97d
appstream to new location: https://lintian.debian.org/tags/appstream-metadata-in-legacy-location.html
8 years ago
PlutonicOverkill
9924e4a35b
Stop VS2017 spamming warnings
...
Disable warning caused by the string and stream-related standard headers.
8 years ago
Nikolay Kasyanov
4138723bbf
[OS X] Add libc++ to linker flags
8 years ago
Bret Curtis
5fa2f46499
only set libc++ for APPLE
8 years ago
Bret Curtis
26c023efe2
stdlib to libc++
8 years ago
Bret Curtis
cb26f52032
matching ifs
8 years ago
Bret Curtis
5a65d6e18d
fix std::move
8 years ago
Bret Curtis
433129e728
only bundle with Qt5, for now
8 years ago
Bret Curtis
dbc29854b2
try to fix enums
8 years ago
Bret Curtis
b657517bea
use c++11 and see what happens
8 years ago
Marc Zinnschlag
13517e723a
increased version number
8 years ago
Nikolay Kasyanov
7f429f26e1
Allow getting available version information even when clone is shallow
8 years ago
scrawl
cdca9b0488
Accept bullet 283 on appveyor as well
8 years ago
scrawl
dfa43af818
Update bullet dependency to 2.86
8 years ago
Nikolay Kasyanov
ee7f5d7d85
[macOS] Move all configs & resources into app bundles
...
Fixes #3566 (https://bugs.openmw.org/issues/3566 ).
8 years ago
Marc Zinnschlag
0874d69546
increased version number
8 years ago
Phillip Andrews
aeaedbc57a
Moved install commands to target-specific cmakelists so that all configurations work.
8 years ago
Phillip Andrews
7383cc9de4
Forgot to undo my test edits because I am a big dum-dum
8 years ago
Phillip Andrews
59eba1dede
Changed tabs to spaces, oops
8 years ago
Phillip Andrews
2efd38b1ab
Fix install procedure so it works with all MSVC build configurations, not just Release
8 years ago
scrawl
105fcc5e20
Move the setting of BOOST_COMPONENTS closer to where it's actually used
8 years ago
scrawl
50bcb65ee0
Move USED_OSG_PLUGINS to the top of the CMakeLists to be used by all platforms
8 years ago
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
8 years ago
Bret Curtis
55fb33670c
Make building osgQt dependant on building openmw-cs
8 years ago
Alexander "Ace" Olofsson
c01d9e9ec5
Only package the Qt 5 platform DLLs on Qt 5
8 years ago
Alexander "Ace" Olofsson
c9d4ff35c4
Install Qt5 platform DLLs on Windows
8 years ago
Alexander "Ace" Olofsson
d781846f53
Fix the /bigobj issue and some script cleanup
...
Surprisingly specific problem I must say, 32-bit vs2015 unity builds
8 years ago
Alexander "Ace" Olofsson
dd5b6a46f5
Visual Studio 2015 support
8 years ago
Marc Zinnschlag
cc7b1f8543
Merge branch 'openmw-40'
8 years ago
Roman Proskuryakov
95dc1258d6
Rewrites find_package for OpenSceneGraph plugins using LibFindMacros and osg_find_library
9 years ago
scrawl
a44ba0e461
Merge pull request #966 from kpp/find_mygui
...
Find mygui
9 years ago
Roman Proskuryakov
4cffdb67d8
Uses case-sensitive MyGUI_* variables
9 years ago
Marc Zinnschlag
d170a50e8a
increased version number
9 years ago
Marc Zinnschlag
2db5cec98b
Merge remote-tracking branch 'psi29a/sphinx'
9 years ago
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
9 years ago
Nikolay Kasyanov
bf0ec550da
OS X: specify minimum CMake version & remove redundant argument from CI script
9 years ago
Bret Curtis
ac8d347e9e
we have html output and autodoc functionality
9 years ago
Roman Proskuryakov
28c63aea72
Uses FindTinyXML to find package
9 years ago
Roman Proskuryakov
edb41b5b08
Rewrites FindLIBUNSHIELD using LibFindMacros
...
Renames LIBUNSHIELD_INCLUDE_DIR -> LIBUNSHIELD_INCLUDE_DIRS, LIBUNSHIELD_LIBRARY -> LIBUNSHIELD_LIBRARIES
9 years ago
Roman Proskuryakov
3bcd23022a
Rewrites FindBullet using LibFindMacros handling version properly
9 years ago
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".
9 years ago
scrawl
fcbcc004a3
Don't use unordered_map
9 years ago
Roman Proskuryakov
da59ef0f67
Rewrites FindFFmpeg using LibFindMacros handling components properly
9 years ago
Roman Proskuryakov
a6b67154bb
Use builtin compiler version in CMake scripts
9 years ago
Marc Zinnschlag
62af1b67cf
increased version number
9 years ago
scrawl
195c3b9967
Merge pull request #904 from sandstranger/disable_opengles_anddroid
...
disable opengl es for Android by default
9 years ago
sandstranger
a7b78b37f5
disable opengles for Android by default
9 years ago
scrawl
52f4c07648
Enable -Wundef
9 years ago
scrawl
647a5e091f
Add osgQt to the repository
...
Ensures that it will be built against the correct Qt version.
9 years ago
scrawl
9eb96b9cb6
Parse the bullet version in FindBullet.cmake
9 years ago
scrawl
f94722b271
OSG 3.3.4 is the first release to include the DDS crash fix
9 years ago
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)
9 years ago
scrawl
41675be970
Merge branch 'openmw-38'
9 years ago
Alexander "Ace" Olofsson
338f0cf53d
Merge branch 'appveyor' of github.com:ace13/openmw into appveyor
9 years ago
sandstranger
48f4fc34eb
build fixes for Android
9 years ago
Marc Zinnschlag
6c676c861c
increased version number
9 years ago
Alexander "Ace" Olofsson
93ee8f1991
Allow for earlier CMake on Qt4
9 years ago
Alexander "Ace" Olofsson
fe241be26c
Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor
9 years ago
Alexander "Ace" Olofsson
1dbc1e67d8
Possible Qt5 link fix for AppVeyor
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
cc9cii
226f7b6928
Suppress additional MSVC warnings after Update 1
9 years ago
Marc Zinnschlag
9c7bbd667b
Merge branch 'usersettings'
9 years ago
Marc Zinnschlag
d6bd2cb1f0
changed name of openmw-cs user settings file
9 years ago
Paul Cercueil
46f45773ca
CMake: Add the list of possible values for some config options
...
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
9 years ago
cc9cii
65df15a89d
Suppress MSVC 2015 warnings about hidden/deleted base class move constructors and move assignment operators.
9 years ago
scrawl
d3caeaf898
Remove unused SOUND_INPUT_INCLUDES cmake variable.
...
(cherry picked from commit 0220e82259
)
Conflicts:
apps/openmw/CMakeLists.txt
9 years ago
sandstranger
7db307e028
delete unused variables
9 years ago
sandstranger
7d374b36fd
change cmake variables
9 years ago
sandstranger
d9b1b7c516
addd forgotten line
9 years ago
sandstranger
238a5824be
add custom new variable fot Qt
9 years ago
sandstranger
bd5057aa3c
enable opengl es1
9 years ago
scrawl
77965501d4
CMakeLists.txt: set the OPENMW_RESOURCE_FILES before configuring openmw.cfg
9 years ago
scrawl
7d6fa1b65a
CMakeLists.txt: Don't use DATADIR before it's defined
9 years ago
Dmitry Marakasov
84305a1297
Reuse DATADIR in data paths
9 years ago