3124e627cf
[General] Move hack back to the right place
7 years ago
bd541b1e5b
Merge pull request #287 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
7 years ago
afbdc27a34
Move calls to cmake_minimum_required as early in the CMake process as possible.
7 years ago
b64f379949
Merge pull request #286 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/actors.hpp
7 years ago
0060e457a6
[General] Add .desktop file for Server Browser
7 years ago
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
51c7efa3f3
[CMake] CMake fix install
7 years ago
721b218cc2
Merge pull request #258 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# README.md
8 years ago
60c7876c3d
Merge pull request #1364 from OpenMW/openmw-42
...
Merge openmw-42
8 years ago
49b02a1bf4
[macOS] remove use of deprecated CMake policy
8 years ago
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.
8 years ago
cf6f368560
rtd backport fix
8 years ago
ac7b1bf97d
appstream to new location: https://lintian.debian.org/tags/appstream-metadata-in-legacy-location.html
8 years ago
bfbf1bbac4
Merge pull request #247 from OpenMW/master
...
Add OpenMW commits up to 26 Jul 2017
8 years ago
9924e4a35b
Stop VS2017 spamming warnings
...
Disable warning caused by the string and stream-related standard headers.
8 years ago
fa3baac0f3
Merge pull request #228 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
8 years ago
4138723bbf
[OS X] Add libc++ to linker flags
8 years ago
5fa2f46499
only set libc++ for APPLE
8 years ago
26c023efe2
stdlib to libc++
8 years ago
cb26f52032
matching ifs
8 years ago
5a65d6e18d
fix std::move
8 years ago
433129e728
only bundle with Qt5, for now
8 years ago
dbc29854b2
try to fix enums
8 years ago
b657517bea
use c++11 and see what happens
8 years ago
c35d5a2c6c
[Master] Implement Master server
8 years ago
13517e723a
increased version number
8 years ago
e0234dc362
Merge pull request #183 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
8 years ago
7f429f26e1
Allow getting available version information even when clone is shallow
8 years ago
ae23c6d6a5
Merge pull request #145 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
8 years ago
cdca9b0488
Accept bullet 283 on appveyor as well
8 years ago
dfa43af818
Update bullet dependency to 2.86
8 years ago
0fe2d743a7
Rename tes3mp-netlauncher into tes3mp-browser
8 years ago
b1bcba3055
Use Qt 5 by default
8 years ago
76162fbfde
Fix netlauncher target properties in CMake for Visual Studio
8 years ago
90908ed113
rename openmw-netlauncher to tes3mp-netlauncher
8 years ago
cb799ee446
Server browser
8 years ago
27afb91936
RPI v3 patch #1
8 years ago
59c3dbe6af
Merge pull request #120 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
8 years ago
7bbeed629d
Merge pull request #109 from OpenMW/master
...
Add OpenMW changes up to 25 Nov
8 years ago
ee7f5d7d85
[macOS] Move all configs & resources into app bundles
...
Fixes #3566 (https://bugs.openmw.org/issues/3566 ).
8 years ago
5297d7b5be
Merge pull request #1137 from nikolaykasyanov/osx-structure
...
[macOS] Move all resources files inside application bundles (fixes #3566 )
8 years ago
0874d69546
increased version number
8 years ago
db69342b5d
[macOS] Move all configs & resources into app bundles
...
Fixes #3566 (https://bugs.openmw.org/issues/3566 ).
8 years ago
b028f0b51f
Merge pull request #104 from OpenMW/master
...
Add OpenMW commits up to 17 Nov
8 years ago
aeaedbc57a
Moved install commands to target-specific cmakelists so that all configurations work.
8 years ago
7383cc9de4
Forgot to undo my test edits because I am a big dum-dum
8 years ago
59eba1dede
Changed tabs to spaces, oops
8 years ago
2efd38b1ab
Fix install procedure so it works with all MSVC build configurations, not just Release
8 years ago
3136a12051
Resolve conflicts in pull request #75
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
8 years ago
105fcc5e20
Move the setting of BOOST_COMPONENTS closer to where it's actually used
8 years ago
50bcb65ee0
Move USED_OSG_PLUGINS to the top of the CMakeLists to be used by all platforms
8 years ago
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
91a6da9041
Merge pull request #67 from OpenMW/master
...
Add OpenMW commits up to 28 Sep
8 years ago
55fb33670c
Make building osgQt dependant on building openmw-cs
8 years ago
3b7693c719
Resolve conflicts in pull request #55
...
# Conflicts:
# README.md
# apps/openmw/mwclass/npc.cpp
# apps/openmw/mwmechanics/combat.cpp
8 years ago
c01d9e9ec5
Only package the Qt 5 platform DLLs on Qt 5
8 years ago
2567c35434
shut up variadic macros warning in GCC
8 years ago
e9dce26f38
Resolve conflicts in pull request #50
...
# Conflicts:
# CMakeLists.txt
8 years ago
c9d4ff35c4
Install Qt5 platform DLLs on Windows
8 years ago
d781846f53
Fix the /bigobj issue and some script cleanup
...
Surprisingly specific problem I must say, 32-bit vs2015 unity builds
8 years ago
dd5b6a46f5
Visual Studio 2015 support
8 years ago
4d2ca20445
Resolve conflicts in pull request #43
...
# Conflicts:
# README.md
8 years ago
cc7b1f8543
Merge branch 'openmw-40'
8 years ago
d31046204f
Use tes3mp icon for executable
8 years ago
2ac0c4e689
Rename openmw to tes3mp for Windows too...
8 years ago
436548413e
Resolve conflicts in pull request #39
...
# Conflicts:
# CMakeLists.txt
8 years ago
95dc1258d6
Rewrites find_package for OpenSceneGraph plugins using LibFindMacros and osg_find_library
8 years ago
d9cfd5bac2
Resolve conflicts with OpenMW
8 years ago
a44ba0e461
Merge pull request #966 from kpp/find_mygui
...
Find mygui
8 years ago
4cffdb67d8
Uses case-sensitive MyGUI_* variables
8 years ago
8686b9cc12
Merge pull request #29 from OpenMW/master
...
Add OpenMW commits from end of July
9 years ago
ed3dc8ca7b
Reduced server dependings
9 years ago
d170a50e8a
increased version number
9 years ago
2db5cec98b
Merge remote-tracking branch 'psi29a/sphinx'
9 years ago
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
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
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
1b259e2d33
Syncing inventory, animations, position, 8 key attributes
...
Created Package system
9 years ago
bf0ec550da
OS X: specify minimum CMake version & remove redundant argument from CI script
9 years ago
ac8d347e9e
we have html output and autodoc functionality
9 years ago
28c63aea72
Uses FindTinyXML to find package
9 years ago
edb41b5b08
Rewrites FindLIBUNSHIELD using LibFindMacros
...
Renames LIBUNSHIELD_INCLUDE_DIR -> LIBUNSHIELD_INCLUDE_DIRS, LIBUNSHIELD_LIBRARY -> LIBUNSHIELD_LIBRARIES
9 years ago
3bcd23022a
Rewrites FindBullet using LibFindMacros handling version properly
9 years ago
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
fcbcc004a3
Don't use unordered_map
9 years ago
da59ef0f67
Rewrites FindFFmpeg using LibFindMacros handling components properly
9 years ago
a6b67154bb
Use builtin compiler version in CMake scripts
9 years ago
62af1b67cf
increased version number
9 years ago
195c3b9967
Merge pull request #904 from sandstranger/disable_opengles_anddroid
...
disable opengl es for Android by default
9 years ago
a7b78b37f5
disable opengles for Android by default
9 years ago
52f4c07648
Enable -Wundef
9 years ago
647a5e091f
Add osgQt to the repository
...
Ensures that it will be built against the correct Qt version.
9 years ago
9eb96b9cb6
Parse the bullet version in FindBullet.cmake
9 years ago
f94722b271
OSG 3.3.4 is the first release to include the DDS crash fix
9 years ago
8b596dfcbe
Remove support for OSG 3.2
...
Since commit e8662bea31
9 years ago
41675be970
Merge branch 'openmw-38'
9 years ago
338f0cf53d
Merge branch 'appveyor' of github.com:ace13/openmw into appveyor
9 years ago
48f4fc34eb
build fixes for Android
9 years ago
6c676c861c
increased version number
9 years ago
4be6b362c5
Add OpenMW-mp target
9 years ago
Koncord
David Cernat
AnyOldName3
John
scrawl
Nikolay Kasyanov
Bret Curtis
PlutonicOverkill
Nikolay Kasyanov
Marc Zinnschlag
scrawl
Phillip Andrews
Alexander "Ace" Olofsson
Koncord
Roman Proskuryakov
Aesylwinn
GrimKriegor
Nikolay Kasyanov
makson96
sandstranger