6205ff6b04
Add OpenMW commits up to 30 Jan 2019
...
# Conflicts:
# apps/openmw/mwworld/worldimp.cpp
5 years ago
6fdef4fd0a
Add OpenMW commits up to 1 Jan 2019
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwphysics/physicssystem.hpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
68886e7539
Add OpenMW commits up to 2 Dec 2018
...
# Conflicts:
# .travis.yml
# README.md
5 years ago
cbba81df03
Add OpenMW commits up to 14 Nov 2018
...
# Conflicts:
# .travis.yml
# CI/before_install.linux.sh
# CI/before_script.linux.sh
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# apps/openmw/mwworld/containerstore.cpp
# apps/openmw/mwworld/inventorystore.cpp
5 years ago
3efffe92e3
Add OpenMW commits up to 5 Nov 2018
...
# Conflicts:
# CI/before_install.linux.sh
# CMakeLists.txt
# apps/openmw/mwmechanics/aifollow.cpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
# apps/openmw/mwphysics/physicssystem.hpp
# apps/openmw/mwworld/scene.cpp
# apps/openmw/mwworld/worldimp.cpp
# components/CMakeLists.txt
5 years ago
056591b957
Add OpenMW commits up to 14 Sep 2018
...
# Conflicts:
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
1f3740225b
Purge unnecessary recast stuff
5 years ago
28e54c25ee
Add -DMYGUI_DONT_REPLACE_NULLPTR
6 years ago
9059971a69
Increase required MyGUI version to 3.2.2
6 years ago
df9a8cf957
bump from 11 to 14
6 years ago
6363cc8839
Relax CMake version requirements on macOS
6 years ago
bf144fb356
Merge pull request #2238 from Capostrophic/freetype
...
Include osgdb_freetype in builds with statically linked OSG
6 years ago
7a07984e2c
Include osgdb_freetype in builds with statically linked OSG
6 years ago
a979d24bf3
Mark OpenSceneGraph include directories as system
...
To avoid warnings spam when use custom build.
6 years ago
8482236a82
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
6 years ago
c9df63ffd1
Replace BSAOpt hash calculation with a custom function
6 years ago
a3bcd95546
Merge branch 'cc9cii' of https://github.com/cc9cii/openmw into tes4_bsa
6 years ago
b30d2bab57
Zlib only for Win32
6 years ago
25650e65bf
Read any BSA file - detection based on version in BSA header
6 years ago
a0e89208a0
[General] Fix standalone server build
6 years ago
2306d904c7
[macOS] Fail CMake when trying to use CMake 3.13 for macOS packaging
6 years ago
c3a2a2d73f
Do not package Recastnavigation headers and static libs
6 years ago
e2515f6db7
Merge branch 'master' into osgshadow-test-vdsm
6 years ago
066b74eb43
Merge pull request #2078 from AnyOldName3/cmake-13.1-osg-lib-fix
...
Adapt to CMake 3.13's new meaning of OSGDB_LIBRARY
6 years ago
44a408635a
wrap git command in gitfound
6 years ago
76d380e852
if unable to run git at this moment, use empty string
6 years ago
dcbca4b90b
Use if(EXISTS ${OSGDB_LIB} AND NOT IS_DIRECTORY ${OSGDB_LIB})
6 years ago
9067731a96
Adapt to CMake 3.13's new meaning of OSGDB_LIBRARY (i.e. that it can now be a list) while allowing for the possibility that the found libraries may be in different directories when debug and optimised versions exist.
6 years ago
b8b1a52216
add commit date; revert boost as we are not breaking anything yet
6 years ago
6596c400f3
indentation
6 years ago
fc10adb608
makes openmw.appdata.xml a template that accepts @OPENMW_VERSION@ so we do not have to update it all the time; fix deprecated warning for boost header; un-ignore openmw.appdata.xml
6 years ago
642002b302
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
6 years ago
caad388c26
bump our versions to 0.46, keep this commit in mind when trying to automate this into one place
6 years ago
25e4156940
enable niftest by default, coverity branch covers everything but openmw now due to timeouts; we run coverity manually for openmw for now; re-order options to be readable and logical sequence
6 years ago
f88d5e808c
Rewrite media decoder to use FFMpeg 3.2+ API (task #4686 )
6 years ago
b178e1868a
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
6 years ago
719c9f0766
Remove compile definition which inadvertently broke other compile definitons
6 years ago
a5afae71e6
Remove unwanted compile definition.
6 years ago
a6d3210a9c
Include missing Windows header before calling Windows-specific functions
6 years ago
d0c254bc7e
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
6 years ago
4c82470933
Do not build recastnavigation tests
6 years ago
bc59a3c455
Build recastnavigation static libraries
6 years ago
792a0585c0
Add recastnavigation as subdirectory
6 years ago
0124be5713
Merge upstream/master
6 years ago
6ec6b9bc2a
OpenMW Integration.
...
Read the ESM/ESP records but do nothing with them for the moment.
6 years ago
3982573035
BSA enhancements.
...
* Implement hash based lookup for TES3 BSA files.
* Added TES4/TES5 BSA support.
* Implemented a hack (non-portable code) in an attempt to reduce startup time under Windows because Boost::filesystem seems to take forever on GetFileAttributeW. This implementation uses FindFirstFile/FindNextFile/FindClose instead.
6 years ago
d3defd83fc
Disable C4643 MSVC warning, caused by boost
6 years ago
cc23a968d1
Merge upstream/master
7 years ago
6cb5ac6e63
Merge pull request #457 from OpenMW/master while resolving conflicts
...
Conflicts:
CMakeLists.txt
apps/openmw/engine.cpp
apps/openmw/main.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwmechanics/character.cpp
components/CMakeLists.txt
7 years ago
d000f2756e
Update disabled warnings
7 years ago
7fd66c77e6
Update CMake lists for Windows
...
Don't use the debug console on Release-mode builds
Disable spammy 4297 and 5032 warnings that are not specific to OpenMW
7 years ago
3e52857e2b
[General] Fix build for client and construction set
7 years ago
7a032baaa3
[General] Move OSG hack to ELSE branch
7 years ago
553094669b
Merge upstream/master (& fix merge conflicts)
7 years ago
a28b27f5d9
Merge pull request #443 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
c20a0c72c5
Merge pull request #442 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
7 years ago
cae744161b
increased version number
7 years ago
de2513653e
AppVeyor: build with Release configuration
7 years ago
759e6fb804
Merge remote-tracking branch 'refs/remotes/upstream/master'
7 years ago
669d4d3d7e
Merge pull request #440 from OpenMW/master
...
Add OpenMW commits up to 27 May 2018
7 years ago
48e15dabc3
Try to generate PDB for release builds
7 years ago
44b2cf2b7f
Merge upstream.
7 years ago
6c7d73af7f
Bump c++ standard version to 14
7 years ago
9e5ddeac50
Merge pull request #408 from OpenMW/master
...
Add OpenMW commits up to 18 Apr 2018
7 years ago
789f552ad4
Delete old mygui_resource_plugin which is unlikely to be brought back in its current form because resources can't be accessed by MyGUI's editor if not using the Ogre resources system.
7 years ago
365f485e8d
Merge pull request #397 from OpenMW/master while resolving conflicts
...
Conflicts:
components/CMakeLists.txt
7 years ago
4890ecd357
remove native GLESv* support, as it never worked; make things less complicated as result, fixed lighting.glsl to work with gl2es thanks to ptitSeb
7 years ago
b7c6261e16
Merge pull request #392 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
d3b623b5d3
http to https for supported urls ( #1625 )
...
* http to https for supported urls
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http tp https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* some url fixes
* http to https
7 years ago
451d0de463
Remove dependency on osgAnimation that somehow snuck in
7 years ago
6ec893b618
Merge remote-tracking branch 'refs/remotes/upstream/master'
7 years ago
14ef2fa791
Merge pull request #369 from OpenMW/master
...
Add OpenMW commits up to 9 Jan 2018
7 years ago
bd072b131b
Moving controller file out of the controllers subdirectory
7 years ago
3f7143556a
Providing different mappings depending on the version of SDL installed
7 years ago
f56a117bde
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
7 years ago
ecb0ad0d77
Merge pull request #359 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
7 years ago
e4a1b6b5b8
Explicitly setting CMAKE_CXX_STANDARD to C++11
7 years ago
0e481a457e
Merge remote-tracking branch 'refs/remotes/upstream/master'
7 years ago
e7f20e7daf
Merge pull request #351 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# README.md
7 years ago
a4d8aef40d
Merge branch openmw-43 into master
...
Conflicts:
CMakeLists.txt
README.md
files/mygui/openmw_trade_window.layout
7 years ago
f2a6957e16
Merge pull request #331 from OpenMW/master while resolving conflicts
7 years ago
25432146f7
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
7 years ago
3d347730dc
Merge pull request #1524 from psi29a/cmake_31
...
standerdise on 3.1.0
7 years ago
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
d19839a666
standerdise on 3.1.0
7 years ago
2e6cf53fdd
Update CPack configuration for NSIS packages
...
Now grabs generated files from the configuration directory where they're
generated
7 years ago
0153b54c3f
increased version number
7 years ago
3a9e5e3a7b
Merge pull request #319 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwworld/worldimp.hpp
7 years ago
2a90dff388
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
7 years ago
9571cd8754
Switch defaultfilters to be handled by a binary-friendly version of the resource macro
7 years ago
e164e6305e
Merge pull request #313 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
7 years ago
147455626e
Merge OpenMW/master
7 years ago
ef7102899a
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
7 years ago
f8fe992dc0
Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files
7 years ago
41ff3fee89
Merge pull request #310 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
7 years ago
dc127fbb93
Add a launch checkbox to the OpenMW installer
7 years ago
f703dbd1df
Merge pull request #283 from Johnnynator/tes3mp
7 years ago
bd541b1e5b
Merge pull request #287 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
7 years ago
76e8a0b768
Add changes I missed in a merge.
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
93ee8f1991
Allow for earlier CMake on Qt4
9 years ago
fe241be26c
Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor
9 years ago
1dbc1e67d8
Possible Qt5 link fix for AppVeyor
9 years ago
David Cernat
capostrophic
Grigory
Andrei Kortunov
Bret Curtis
Nikolay Kasyanov
elsid
AnyOldName3
Azdul
Koncord
Chris Djali
cc9cii
Capostrophic
Koncord
Marc Zinnschlag
Kyle Cooley
scrawl
Harald H
Thunderforge
Miloslav Číž
Alexander "Ace" Olofsson
John
PlutonicOverkill
Nikolay Kasyanov
scrawl
Phillip Andrews
Roman Proskuryakov
GrimKriegor
Nikolay Kasyanov
makson96
sandstranger