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
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
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
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
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
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
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
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
David Cernat
scrawl
bret curtis
Harald H
Thunderforge
Miloslav Číž
Alexander "Ace" Olofsson
Marc Zinnschlag
AnyOldName3
Stanislav Zhukov
John
Nikolay Kasyanov
PlutonicOverkill
Nikolay Kasyanov