David Cernat
4dbada69bf
Merge pull request #332 from TES3MP/master while resolving conflicts
2017-11-10 08:50:28 +02:00
David Cernat
f2a6957e16
Merge pull request #331 from OpenMW/master while resolving conflicts
2017-11-10 08:43:50 +02:00
scrawl
3d347730dc
Merge pull request #1524 from psi29a/cmake_31
...
standerdise on 3.1.0
2017-11-05 16:18:34 +00:00
Miloslav Číž
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
2017-11-05 15:37:38 +00:00
Bret Curtis
d19839a666
standerdise on 3.1.0
2017-10-25 21:55:58 +02:00
David Cernat
76a4abd7c0
Merge pull request #325 from TES3MP/master while resolving conflicts
...
# Conflicts:
# apps/openmw-mp/processors/player/ProcessorPlayerTopic.hpp
2017-10-24 19:45:11 +03:00
David Cernat
3a9e5e3a7b
Merge pull request #319 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwworld/worldimp.hpp
2017-10-22 20:27:44 +03:00
AnyOldName3
9571cd8754
Switch defaultfilters to be handled by a binary-friendly version of the resource macro
2017-10-19 00:50:57 +01:00
David Cernat
17a8e32782
Merge pull request #314 from TES3MP/master
...
Add master commits up to 16 Oct 2017
2017-10-16 07:47:37 +03:00
David Cernat
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
2017-10-16 07:37:29 +03:00
AnyOldName3
f8fe992dc0
Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files
2017-10-11 21:58:55 +01:00
David Cernat
fe9a3088bd
Merge pull request #312 from TES3MP/master
...
Add master commits up to 10 Oct 2017
2017-10-10 06:27:35 +03:00
David Cernat
41ff3fee89
Merge pull request #310 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
2017-10-09 14:41:55 +03:00
Alexander "Ace" Olofsson
dc127fbb93
Add a launch checkbox to the OpenMW installer
2017-10-08 11:58:38 +02:00
David Cernat
98195b5e3c
Merge pull request #289 from TES3MP/master
...
Add master commits up to 15 Sep 2017
2017-09-15 03:32:20 +03:00
Stanislav Zhukov
f703dbd1df
Merge pull request #283 from Johnnynator/tes3mp
2017-09-14 02:38:27 +08:00
Koncord
3124e627cf
[General] Move hack back to the right place
2017-09-13 21:30:16 +08:00
David Cernat
bd541b1e5b
Merge pull request #287 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
2017-09-12 07:38:49 +03:00
AnyOldName3
afbdc27a34
Move calls to cmake_minimum_required as early in the CMake process as possible.
2017-09-10 18:30:10 +01:00
David Cernat
b64f379949
Merge pull request #286 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/actors.hpp
2017-09-04 18:05:24 +03:00
John
0060e457a6
[General] Add .desktop file for Server Browser
2017-09-02 16:30:52 +02:00
scrawl
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.
2017-09-01 21:42:36 +00:00
John
51c7efa3f3
[CMake] CMake fix install
2017-09-01 19:57:11 +02:00
David Cernat
721b218cc2
Merge pull request #258 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# README.md
2017-08-05 00:09:34 +03:00
scrawl
60c7876c3d
Merge pull request #1364 from OpenMW/openmw-42
...
Merge openmw-42
2017-08-01 22:16:45 +00:00
Nikolay Kasyanov
49b02a1bf4
[macOS] remove use of deprecated CMake policy
2017-07-30 15:48:00 +02:00
Nikolay Kasyanov
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.
2017-07-30 15:43:45 +02:00
Bret Curtis
cf6f368560
rtd backport fix
2017-07-29 11:52:13 +02:00
Bret Curtis
ac7b1bf97d
appstream to new location: https://lintian.debian.org/tags/appstream-metadata-in-legacy-location.html
2017-07-28 19:16:32 +02:00
David Cernat
bfbf1bbac4
Merge pull request #247 from OpenMW/master
...
Add OpenMW commits up to 26 Jul 2017
2017-07-26 14:01:01 +03:00
PlutonicOverkill
9924e4a35b
Stop VS2017 spamming warnings
...
Disable warning caused by the string and stream-related standard headers.
2017-07-24 17:49:39 +12:00
David Cernat
fa3baac0f3
Merge pull request #228 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
2017-06-18 18:16:10 +03:00
Nikolay Kasyanov
4138723bbf
[OS X] Add libc++ to linker flags
2017-06-09 16:49:25 +02:00
Bret Curtis
5fa2f46499
only set libc++ for APPLE
2017-06-09 16:49:25 +02:00
Bret Curtis
26c023efe2
stdlib to libc++
2017-06-09 16:49:25 +02:00
Bret Curtis
cb26f52032
matching ifs
2017-06-09 16:49:25 +02:00
Bret Curtis
5a65d6e18d
fix std::move
2017-06-09 16:49:25 +02:00
Bret Curtis
433129e728
only bundle with Qt5, for now
2017-06-09 16:49:25 +02:00
Bret Curtis
dbc29854b2
try to fix enums
2017-06-09 16:48:40 +02:00
Bret Curtis
b657517bea
use c++11 and see what happens
2017-06-09 16:48:40 +02:00
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
