David Cernat
76a4abd7c0
Merge pull request #325 from TES3MP/master while resolving conflicts
...
# Conflicts:
# apps/openmw-mp/processors/player/ProcessorPlayerTopic.hpp
7 years ago
David Cernat
3a9e5e3a7b
Merge pull request #319 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwworld/worldimp.hpp
7 years ago
AnyOldName3
9571cd8754
Switch defaultfilters to be handled by a binary-friendly version of the resource macro
7 years ago
David Cernat
17a8e32782
Merge pull request #314 from TES3MP/master
...
Add master commits up to 16 Oct 2017
7 years ago
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
7 years ago
AnyOldName3
f8fe992dc0
Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files
7 years ago
David Cernat
fe9a3088bd
Merge pull request #312 from TES3MP/master
...
Add master commits up to 10 Oct 2017
7 years ago
David Cernat
41ff3fee89
Merge pull request #310 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
7 years ago
Alexander "Ace" Olofsson
dc127fbb93
Add a launch checkbox to the OpenMW installer
7 years ago
David Cernat
98195b5e3c
Merge pull request #289 from TES3MP/master
...
Add master commits up to 15 Sep 2017
7 years ago
Stanislav Zhukov
f703dbd1df
Merge pull request #283 from Johnnynator/tes3mp
7 years ago
Koncord
3124e627cf
[General] Move hack back to the right place
7 years ago
David Cernat
bd541b1e5b
Merge pull request #287 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
7 years ago
AnyOldName3
afbdc27a34
Move calls to cmake_minimum_required as early in the CMake process as possible.
7 years ago
David Cernat
b64f379949
Merge pull request #286 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/actors.hpp
7 years ago
John
0060e457a6
[General] Add .desktop file for Server Browser
7 years ago
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.
7 years ago
John
51c7efa3f3
[CMake] CMake fix install
7 years ago
David Cernat
721b218cc2
Merge pull request #258 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# README.md
8 years ago
scrawl
60c7876c3d
Merge pull request #1364 from OpenMW/openmw-42
...
Merge openmw-42
8 years ago
Nikolay Kasyanov
49b02a1bf4
[macOS] remove use of deprecated CMake policy
8 years ago
Nikolay Kasyanov
fd0be7008d
[macOS] Fixes accidental loading of plugins from system-wide Qt install
...
I was too eager to remove the workaround in 014a2fc0e9
.
Actually, config-based solution seems cleaner.
Respective Qt documentation: http://doc.qt.io/qt-5/qt-conf.html .
Also, moves Qt plugins from Contents/MacOS to Contents/PlugIns
for consistency.
8 years ago
Bret Curtis
cf6f368560
rtd backport fix
8 years ago
Bret Curtis
ac7b1bf97d
appstream to new location: https://lintian.debian.org/tags/appstream-metadata-in-legacy-location.html
8 years ago
David Cernat
bfbf1bbac4
Merge pull request #247 from OpenMW/master
...
Add OpenMW commits up to 26 Jul 2017
8 years ago
PlutonicOverkill
9924e4a35b
Stop VS2017 spamming warnings
...
Disable warning caused by the string and stream-related standard headers.
8 years ago
David Cernat
fa3baac0f3
Merge pull request #228 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
8 years ago
Nikolay Kasyanov
4138723bbf
[OS X] Add libc++ to linker flags
8 years ago
Bret Curtis
5fa2f46499
only set libc++ for APPLE
8 years ago
Bret Curtis
26c023efe2
stdlib to libc++
8 years ago
Bret Curtis
cb26f52032
matching ifs
8 years ago
Bret Curtis
5a65d6e18d
fix std::move
8 years ago
Bret Curtis
433129e728
only bundle with Qt5, for now
8 years ago
Bret Curtis
dbc29854b2
try to fix enums
8 years ago
Bret Curtis
b657517bea
use c++11 and see what happens
8 years ago
Koncord
c35d5a2c6c
[Master] Implement Master server
8 years ago
Marc Zinnschlag
13517e723a
increased version number
8 years ago
David Cernat
e0234dc362
Merge pull request #183 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
8 years ago
Nikolay Kasyanov
7f429f26e1
Allow getting available version information even when clone is shallow
8 years ago
David Cernat
ae23c6d6a5
Merge pull request #145 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
8 years ago
scrawl
cdca9b0488
Accept bullet 283 on appveyor as well
8 years ago
scrawl
dfa43af818
Update bullet dependency to 2.86
8 years ago
David Cernat
0fe2d743a7
Rename tes3mp-netlauncher into tes3mp-browser
8 years ago
David Cernat
b1bcba3055
Use Qt 5 by default
8 years ago
David Cernat
76162fbfde
Fix netlauncher target properties in CMake for Visual Studio
8 years ago
Koncord
90908ed113
rename openmw-netlauncher to tes3mp-netlauncher
8 years ago
Koncord
cb799ee446
Server browser
8 years ago
Koncord
27afb91936
RPI v3 patch #1
8 years ago
David Cernat
59c3dbe6af
Merge pull request #120 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
8 years ago
David Cernat
7bbeed629d
Merge pull request #109 from OpenMW/master
...
Add OpenMW changes up to 25 Nov
8 years ago