David Cernat
d9cfd5bac2
Resolve conflicts with OpenMW
8 years ago
scrawl
a44ba0e461
Merge pull request #966 from kpp/find_mygui
...
Find mygui
8 years ago
Roman Proskuryakov
4cffdb67d8
Uses case-sensitive MyGUI_* variables
8 years ago
David Cernat
8686b9cc12
Merge pull request #29 from OpenMW/master
...
Add OpenMW commits from end of July
9 years ago
Koncord
ed3dc8ca7b
Reduced server dependings
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
Aesylwinn
b4a000913c
Merge remote-tracking branch 'yar/master' into Even
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwdialogue/filter.cpp
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwworld/localscripts.cpp
# components/CMakeLists.txt
# components/compiler/exprparser.cpp
# components/sceneutil/workqueue.cpp
9 years ago
GrimKriegor
ace719507c
Ported OpenMW's "Don't use unordered_map" commit to TES3MP to fix Issue #1
...
https://github.com/TES3MP/TES3MP/issues/1
9 years ago
Koncord
1b259e2d33
Syncing inventory, animations, position, 8 key attributes
...
Created Package system
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
Koncord
4be6b362c5
Add OpenMW-mp target
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
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
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
scrawl
dca1674133
Merge remote-tracking branch 'upstream/openmw-37' into HEAD
9 years ago
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
9 years ago
Marc Zinnschlag
020b3add94
Merge branch 'openmw-37'
9 years ago
scrawl
0220e82259
Remove unused SOUND_INPUT_INCLUDES cmake variable.
9 years ago