Koncord
c35d5a2c6c
[Master] Implement Master server
2017-04-23 13:39:43 +08:00
Marc Zinnschlag
13517e723a
increased version number
2017-04-11 10:05:57 +02:00
David Cernat
e0234dc362
Merge pull request #183 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
2017-03-13 18:20:07 +02:00
Nikolay Kasyanov
7f429f26e1
Allow getting available version information even when clone is shallow
2017-03-07 21:53:49 +01:00
David Cernat
ae23c6d6a5
Merge pull request #145 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
2017-02-09 12:17:27 +02:00
scrawl
cdca9b0488
Accept bullet 283 on appveyor as well
2017-02-07 20:40:07 +01:00
scrawl
dfa43af818
Update bullet dependency to 2.86
2017-02-07 18:05:24 +01:00
David Cernat
0fe2d743a7
Rename tes3mp-netlauncher into tes3mp-browser
2017-01-19 12:14:25 +02:00
David Cernat
b1bcba3055
Use Qt 5 by default
2017-01-14 17:31:13 +02:00
David Cernat
76162fbfde
Fix netlauncher target properties in CMake for Visual Studio
2017-01-14 17:14:04 +02:00
Koncord
90908ed113
rename openmw-netlauncher to tes3mp-netlauncher
2017-01-12 08:54:11 +08:00
Koncord
cb799ee446
Server browser
2017-01-11 22:05:40 +08:00
Koncord
27afb91936
RPI v3 patch #1
2017-01-03 19:03:51 +08:00
David Cernat
59c3dbe6af
Merge pull request #120 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
2016-12-30 23:59:30 +02:00
David Cernat
7bbeed629d
Merge pull request #109 from OpenMW/master
...
Add OpenMW changes up to 25 Nov
2016-11-26 01:58:43 +02:00
Nikolay Kasyanov
ee7f5d7d85
[macOS] Move all configs & resources into app bundles
...
Fixes #3566 (https://bugs.openmw.org/issues/3566 ).
2016-11-25 02:54:02 +01:00
scrawl
5297d7b5be
Merge pull request #1137 from nikolaykasyanov/osx-structure
...
[macOS] Move all resources files inside application bundles (fixes #3566 )
2016-11-25 02:51:32 +01:00
Marc Zinnschlag
0874d69546
increased version number
2016-11-24 17:07:52 +01:00
Nikolay Kasyanov
db69342b5d
[macOS] Move all configs & resources into app bundles
...
Fixes #3566 (https://bugs.openmw.org/issues/3566 ).
2016-11-23 22:32:54 +01:00
David Cernat
b028f0b51f
Merge pull request #104 from OpenMW/master
...
Add OpenMW commits up to 17 Nov
2016-11-17 21:13:58 +02:00
Phillip Andrews
aeaedbc57a
Moved install commands to target-specific cmakelists so that all configurations work.
2016-11-13 22:49:01 -06:00
Phillip Andrews
7383cc9de4
Forgot to undo my test edits because I am a big dum-dum
2016-11-13 17:06:00 -06:00
Phillip Andrews
59eba1dede
Changed tabs to spaces, oops
2016-11-13 16:59:36 -06:00
Phillip Andrews
2efd38b1ab
Fix install procedure so it works with all MSVC build configurations, not just Release
2016-11-13 13:32:42 -06:00
David Cernat
3136a12051
Resolve conflicts in pull request #75
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
2016-10-14 18:34:17 +03:00
scrawl
105fcc5e20
Move the setting of BOOST_COMPONENTS closer to where it's actually used
2016-10-10 18:23:06 +02:00
scrawl
50bcb65ee0
Move USED_OSG_PLUGINS to the top of the CMakeLists to be used by all platforms
2016-10-08 19:20:24 +02:00
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
2016-10-08 17:07:06 +02:00
David Cernat
91a6da9041
Merge pull request #67 from OpenMW/master
...
Add OpenMW commits up to 28 Sep
2016-09-28 18:53:54 +03:00
Bret Curtis
55fb33670c
Make building osgQt dependant on building openmw-cs
2016-09-28 14:36:51 +02:00
David Cernat
3b7693c719
Resolve conflicts in pull request #55
...
# Conflicts:
# README.md
# apps/openmw/mwclass/npc.cpp
# apps/openmw/mwmechanics/combat.cpp
2016-09-15 08:49:57 +03:00
Alexander "Ace" Olofsson
c01d9e9ec5
Only package the Qt 5 platform DLLs on Qt 5
2016-09-08 02:19:12 +02:00
Koncord
2567c35434
shut up variadic macros warning in GCC
2016-09-04 16:41:16 +08:00
David Cernat
e9dce26f38
Resolve conflicts in pull request #50
...
# Conflicts:
# CMakeLists.txt
2016-08-31 07:28:32 +03:00
Alexander "Ace" Olofsson
c9d4ff35c4
Install Qt5 platform DLLs on Windows
2016-08-29 18:40:40 +02:00
Alexander "Ace" Olofsson
d781846f53
Fix the /bigobj issue and some script cleanup
...
Surprisingly specific problem I must say, 32-bit vs2015 unity builds
2016-08-28 23:23:44 +02:00
Alexander "Ace" Olofsson
dd5b6a46f5
Visual Studio 2015 support
2016-08-28 21:42:48 +02:00
David Cernat
4d2ca20445
Resolve conflicts in pull request #43
...
# Conflicts:
# README.md
2016-08-24 22:03:35 +03:00
Marc Zinnschlag
cc7b1f8543
Merge branch 'openmw-40'
2016-08-24 09:59:50 +02:00
David Cernat
d31046204f
Use tes3mp icon for executable
2016-08-23 23:50:20 +03:00
David Cernat
2ac0c4e689
Rename openmw to tes3mp for Windows too...
2016-08-19 05:36:24 +03:00
David Cernat
436548413e
Resolve conflicts in pull request #39
...
# Conflicts:
# CMakeLists.txt
2016-08-18 15:10:52 +03:00
Roman Proskuryakov
95dc1258d6
Rewrites find_package for OpenSceneGraph plugins using LibFindMacros and osg_find_library
2016-08-16 06:06:30 +03:00
David Cernat
d9cfd5bac2
Resolve conflicts with OpenMW
2016-08-15 19:14:13 +03:00
scrawl
a44ba0e461
Merge pull request #966 from kpp/find_mygui
...
Find mygui
2016-08-15 16:36:48 +02:00
Roman Proskuryakov
4cffdb67d8
Uses case-sensitive MyGUI_* variables
2016-08-15 15:59:02 +03:00
David Cernat
8686b9cc12
Merge pull request #29 from OpenMW/master
...
Add OpenMW commits from end of July
2016-08-04 00:56:36 +03:00
Koncord
ed3dc8ca7b
Reduced server dependings
2016-08-02 18:52:58 +08:00
Marc Zinnschlag
d170a50e8a
increased version number
2016-08-01 11:18:35 +02:00
Marc Zinnschlag
2db5cec98b
Merge remote-tracking branch 'psi29a/sphinx'
2016-07-30 08:22:27 +02:00
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
2016-07-29 18:14:54 +02:00
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
2016-07-17 23:50:52 -04:00
GrimKriegor
ace719507c
Ported OpenMW's "Don't use unordered_map" commit to TES3MP to fix Issue #1
...
https://github.com/TES3MP/TES3MP/issues/1
2016-07-12 01:42:05 +01:00
Koncord
1b259e2d33
Syncing inventory, animations, position, 8 key attributes
...
Created Package system
2016-07-07 23:50:48 +08:00
Nikolay Kasyanov
bf0ec550da
OS X: specify minimum CMake version & remove redundant argument from CI script
2016-07-07 01:09:59 +02:00
Bret Curtis
ac8d347e9e
we have html output and autodoc functionality
2016-07-05 12:07:31 +02:00
Roman Proskuryakov
28c63aea72
Uses FindTinyXML to find package
2016-06-12 21:40:02 +03:00
Roman Proskuryakov
edb41b5b08
Rewrites FindLIBUNSHIELD using LibFindMacros
...
Renames LIBUNSHIELD_INCLUDE_DIR -> LIBUNSHIELD_INCLUDE_DIRS, LIBUNSHIELD_LIBRARY -> LIBUNSHIELD_LIBRARIES
2016-06-12 14:44:04 +03:00
Roman Proskuryakov
3bcd23022a
Rewrites FindBullet using LibFindMacros handling version properly
2016-05-31 07:18:37 +03:00
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".
2016-05-25 00:41:36 +02:00
scrawl
fcbcc004a3
Don't use unordered_map
2016-05-11 02:35:17 +02:00
Roman Proskuryakov
da59ef0f67
Rewrites FindFFmpeg using LibFindMacros handling components properly
2016-05-10 12:43:54 +03:00
Roman Proskuryakov
a6b67154bb
Use builtin compiler version in CMake scripts
2016-05-09 23:35:33 +03:00
Marc Zinnschlag
62af1b67cf
increased version number
2016-04-05 09:27:20 +02:00
scrawl
195c3b9967
Merge pull request #904 from sandstranger/disable_opengles_anddroid
...
disable opengl es for Android by default
2016-02-25 21:39:25 +01:00
sandstranger
a7b78b37f5
disable opengles for Android by default
2016-02-25 22:39:18 +03:00
scrawl
52f4c07648
Enable -Wundef
2016-02-25 20:37:00 +01:00
scrawl
647a5e091f
Add osgQt to the repository
...
Ensures that it will be built against the correct Qt version.
2016-02-15 15:16:48 +01:00
scrawl
9eb96b9cb6
Parse the bullet version in FindBullet.cmake
2016-02-15 14:34:59 +01:00
scrawl
f94722b271
OSG 3.3.4 is the first release to include the DDS crash fix
2016-02-12 14:55:00 +01:00
scrawl
8b596dfcbe
Remove support for OSG 3.2
...
Since commit e8662bea31
2016-02-12 14:46:45 +01:00
scrawl
41675be970
Merge branch 'openmw-38'
2016-02-02 23:01:21 +01:00
Alexander "Ace" Olofsson
338f0cf53d
Merge branch 'appveyor' of github.com:ace13/openmw into appveyor
2016-01-19 22:11:46 +01:00
sandstranger
48f4fc34eb
build fixes for Android
2016-01-05 15:37:17 +03:00
Marc Zinnschlag
6c676c861c
increased version number
2016-01-04 18:03:47 +01:00
Koncord
4be6b362c5
Add OpenMW-mp target
2016-01-04 20:15:55 +08:00
Alexander "Ace" Olofsson
93ee8f1991
Allow for earlier CMake on Qt4
2015-12-24 11:33:59 +01:00
Alexander "Ace" Olofsson
fe241be26c
Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor
2015-12-24 11:27:02 +01:00
Alexander "Ace" Olofsson
1dbc1e67d8
Possible Qt5 link fix for AppVeyor
2015-12-24 02:41:35 +01:00
Marc Zinnschlag
9c7bbd667b
Merge branch 'usersettings'
2015-12-15 14:58:04 +01:00
Marc Zinnschlag
d6bd2cb1f0
changed name of openmw-cs user settings file
2015-12-15 14:51:25 +01:00
Paul Cercueil
46f45773ca
CMake: Add the list of possible values for some config options
...
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
2015-12-06 15:55:23 +01:00
sandstranger
7db307e028
delete unused variables
2015-12-03 22:37:42 +03:00
sandstranger
7d374b36fd
change cmake variables
2015-12-03 21:29:50 +03:00
sandstranger
d9b1b7c516
addd forgotten line
2015-12-03 19:56:38 +03:00
sandstranger
238a5824be
add custom new variable fot Qt
2015-12-03 08:54:14 +03:00
sandstranger
bd5057aa3c
enable opengl es1
2015-12-02 22:40:04 +03:00
scrawl
77965501d4
CMakeLists.txt: set the OPENMW_RESOURCE_FILES before configuring openmw.cfg
2015-12-02 17:33:55 +01:00
scrawl
7d6fa1b65a
CMakeLists.txt: Don't use DATADIR before it's defined
2015-12-02 16:14:04 +01:00
Dmitry Marakasov
84305a1297
Reuse DATADIR in data paths
2015-12-02 04:17:54 +03:00
scrawl
dca1674133
Merge remote-tracking branch 'upstream/openmw-37' into HEAD
2015-11-24 03:30:57 +01:00
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
2015-11-22 19:32:13 +01:00
Marc Zinnschlag
020b3add94
Merge branch 'openmw-37'
2015-11-17 09:54:49 +01:00
scrawl
0220e82259
Remove unused SOUND_INPUT_INCLUDES cmake variable.
2015-11-14 17:17:22 +01:00
Nikolay Kasyanov
63c47a78d6
OS X: fixup Qt plugin during packaging
2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
d5aeb35449
OS X: use link path for packaging to allow CMake infer library search dirs for @rpath resolving
2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
fff6b5fde1
OS X: remove custom bundle utilities, ones from CMake versions >= 3.1.0 are good enough
2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
5c4899580f
OS X: use less ambiguous variable names in packaging code
2015-11-14 13:50:01 +01:00
Nikolay Kasyanov
3ba546628d
OS X: always copy Cocoa platform plugin into OpenMW bundle
2015-11-14 13:50:01 +01:00
Bret Curtis
3ea3d07d44
really purge libav
2015-11-12 16:39:29 +01:00
