Commit Graph

846 Commits (0.7.0)

Author SHA1 Message Date
Bret Curtis ac7b1bf97d appstream to new location: https://lintian.debian.org/tags/appstream-metadata-in-legacy-location.html 7 years ago
David Cernat bfbf1bbac4 Merge pull request #247 from OpenMW/master
Add OpenMW commits up to 26 Jul 2017
7 years ago
PlutonicOverkill 9924e4a35b Stop VS2017 spamming warnings
Disable warning caused by the string and stream-related standard headers.
7 years ago
David Cernat fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/main.cpp
7 years ago
Nikolay Kasyanov 4138723bbf [OS X] Add libc++ to linker flags 7 years ago
Bret Curtis 5fa2f46499 only set libc++ for APPLE 7 years ago
Bret Curtis 26c023efe2 stdlib to libc++ 7 years ago
Bret Curtis cb26f52032 matching ifs 7 years ago
Bret Curtis 5a65d6e18d fix std::move 7 years ago
Bret Curtis 433129e728 only bundle with Qt5, for now 7 years ago
Bret Curtis dbc29854b2 try to fix enums 7 years ago
Bret Curtis b657517bea use c++11 and see what happens 7 years ago
Koncord c35d5a2c6c [Master] Implement Master server 7 years ago
Marc Zinnschlag 13517e723a increased version number 7 years ago
David Cernat e0234dc362 Merge pull request #183 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
7 years ago
Nikolay Kasyanov 7f429f26e1 Allow getting available version information even when clone is shallow 7 years ago
David Cernat ae23c6d6a5 Merge pull request #145 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
7 years ago
scrawl cdca9b0488 Accept bullet 283 on appveyor as well 7 years ago
scrawl dfa43af818 Update bullet dependency to 2.86 7 years ago
David Cernat 0fe2d743a7 Rename tes3mp-netlauncher into tes3mp-browser 7 years ago
David Cernat b1bcba3055 Use Qt 5 by default 7 years ago
David Cernat 76162fbfde Fix netlauncher target properties in CMake for Visual Studio 7 years ago
Koncord 90908ed113 rename openmw-netlauncher to tes3mp-netlauncher 7 years ago
Koncord cb799ee446 Server browser 7 years ago
Koncord 27afb91936 RPI v3 patch #1 7 years ago
David Cernat 59c3dbe6af Merge pull request #120 from OpenMW/master while resolving conflicts
# Conflicts:
#	README.md
7 years ago
David Cernat 7bbeed629d Merge pull request #109 from OpenMW/master
Add OpenMW changes up to 25 Nov
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
scrawl 5297d7b5be Merge pull request #1137 from nikolaykasyanov/osx-structure
[macOS] Move all resources files inside application bundles (fixes #3566)
8 years ago
Marc Zinnschlag 0874d69546 increased version number 8 years ago
Nikolay Kasyanov db69342b5d [macOS] Move all configs & resources into app bundles
Fixes #3566 (https://bugs.openmw.org/issues/3566).
8 years ago
David Cernat b028f0b51f Merge pull request #104 from OpenMW/master
Add OpenMW commits up to 17 Nov
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
David Cernat 3136a12051 Resolve conflicts in pull request #75
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
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
David Cernat 91a6da9041 Merge pull request #67 from OpenMW/master
Add OpenMW commits up to 28 Sep
8 years ago
Bret Curtis 55fb33670c Make building osgQt dependant on building openmw-cs 8 years ago
David Cernat 3b7693c719 Resolve conflicts in pull request #55
# Conflicts:
#	README.md
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwmechanics/combat.cpp
8 years ago
Alexander "Ace" Olofsson c01d9e9ec5 Only package the Qt 5 platform DLLs on Qt 5 8 years ago
Koncord 2567c35434 shut up variadic macros warning in GCC 8 years ago
David Cernat e9dce26f38 Resolve conflicts in pull request #50
# Conflicts:
#	CMakeLists.txt
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
David Cernat 4d2ca20445 Resolve conflicts in pull request #43
# Conflicts:
#	README.md
8 years ago
Marc Zinnschlag cc7b1f8543 Merge branch 'openmw-40' 8 years ago
David Cernat d31046204f Use tes3mp icon for executable 8 years ago
David Cernat 2ac0c4e689 Rename openmw to tes3mp for Windows too... 8 years ago
David Cernat 436548413e Resolve conflicts in pull request #39
# Conflicts:
#	CMakeLists.txt
8 years ago
Roman Proskuryakov 95dc1258d6 Rewrites find_package for OpenSceneGraph plugins using LibFindMacros and osg_find_library 8 years ago
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
8 years ago
Koncord ed3dc8ca7b Reduced server dependings 8 years ago
Marc Zinnschlag d170a50e8a increased version number 8 years ago
Marc Zinnschlag 2db5cec98b Merge remote-tracking branch 'psi29a/sphinx' 8 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
8 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
8 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
8 years ago
Koncord 1b259e2d33 Syncing inventory, animations, position, 8 key attributes
Created Package system
8 years ago
Nikolay Kasyanov bf0ec550da OS X: specify minimum CMake version & remove redundant argument from CI script 8 years ago
Bret Curtis ac8d347e9e we have html output and autodoc functionality 8 years ago
Roman Proskuryakov 28c63aea72 Uses FindTinyXML to find package 8 years ago
Roman Proskuryakov edb41b5b08 Rewrites FindLIBUNSHIELD using LibFindMacros
Renames LIBUNSHIELD_INCLUDE_DIR -> LIBUNSHIELD_INCLUDE_DIRS, LIBUNSHIELD_LIBRARY -> LIBUNSHIELD_LIBRARIES
8 years ago
Roman Proskuryakov 3bcd23022a Rewrites FindBullet using LibFindMacros handling version properly 8 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".
8 years ago
scrawl fcbcc004a3 Don't use unordered_map 8 years ago
Roman Proskuryakov da59ef0f67 Rewrites FindFFmpeg using LibFindMacros handling components properly 8 years ago
Roman Proskuryakov a6b67154bb Use builtin compiler version in CMake scripts 8 years ago
Marc Zinnschlag 62af1b67cf increased version number 8 years ago
scrawl 195c3b9967 Merge pull request #904 from sandstranger/disable_opengles_anddroid
disable opengl es for Android by default
8 years ago
sandstranger a7b78b37f5 disable opengles for Android by default 8 years ago
scrawl 52f4c07648 Enable -Wundef 8 years ago
scrawl 647a5e091f Add osgQt to the repository
Ensures that it will be built against the correct Qt version.
8 years ago
scrawl 9eb96b9cb6 Parse the bullet version in FindBullet.cmake 8 years ago
scrawl f94722b271 OSG 3.3.4 is the first release to include the DDS crash fix 8 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)
8 years ago
scrawl 41675be970 Merge branch 'openmw-38' 8 years ago
Alexander "Ace" Olofsson 338f0cf53d Merge branch 'appveyor' of github.com:ace13/openmw into appveyor 8 years ago
sandstranger 48f4fc34eb build fixes for Android 8 years ago
Marc Zinnschlag 6c676c861c increased version number 8 years ago
Koncord 4be6b362c5 Add OpenMW-mp target 8 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