Commit Graph

846 Commits (828c52138fa8fd6a8c91fdb0205013dfb5b51511)

Author SHA1 Message Date
Koncord a0e89208a0 [General] Fix standalone server build 6 years ago
David Cernat 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
Capostrophic d000f2756e Update disabled warnings 7 years ago
Capostrophic 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
David Cernat 3e52857e2b [General] Fix build for client and construction set 7 years ago
Koncord 7a032baaa3 [General] Move OSG hack to ELSE branch 7 years ago
David Cernat a28b27f5d9 Merge pull request #443 from OpenMW/master while resolving conflicts
# Conflicts:
#	README.md
7 years ago
David Cernat c20a0c72c5 Merge pull request #442 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
7 years ago
Marc Zinnschlag cae744161b increased version number 7 years ago
Andrei Kortunov de2513653e AppVeyor: build with Release configuration 7 years ago
David Cernat 669d4d3d7e
Merge pull request #440 from OpenMW/master
Add OpenMW commits up to 27 May 2018
7 years ago
Andrei Kortunov 48e15dabc3 Try to generate PDB for release builds 7 years ago
Kyle Cooley 6c7d73af7f Bump c++ standard version to 14 7 years ago
David Cernat 9e5ddeac50
Merge pull request #408 from OpenMW/master
Add OpenMW commits up to 18 Apr 2018
7 years ago
scrawl 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
David Cernat 365f485e8d Merge pull request #397 from OpenMW/master while resolving conflicts
Conflicts:
	components/CMakeLists.txt
7 years ago
bret curtis 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
David Cernat b7c6261e16 Merge pull request #392 from OpenMW/master while resolving conflicts
# Conflicts:
#	README.md
7 years ago
Harald H 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
David Cernat 14ef2fa791
Merge pull request #369 from OpenMW/master
Add OpenMW commits up to 9 Jan 2018
7 years ago
Thunderforge bd072b131b Moving controller file out of the controllers subdirectory 7 years ago
Thunderforge 3f7143556a Providing different mappings depending on the version of SDL installed 7 years ago
David Cernat ecb0ad0d77 Merge pull request #359 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
7 years ago
Thunderforge e4a1b6b5b8 Explicitly setting CMAKE_CXX_STANDARD to C++11 7 years ago
David Cernat e7f20e7daf Merge pull request #351 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
#	README.md
7 years ago
scrawl a4d8aef40d
Merge branch openmw-43 into master
Conflicts:
	CMakeLists.txt
	README.md
	files/mygui/openmw_trade_window.layout
7 years ago
David Cernat f2a6957e16 Merge pull request #331 from OpenMW/master while resolving conflicts 7 years ago
scrawl 3d347730dc
Merge pull request #1524 from psi29a/cmake_31
standerdise on 3.1.0
7 years ago
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
7 years ago
Bret Curtis d19839a666 standerdise on 3.1.0 7 years ago
Alexander "Ace" Olofsson 2e6cf53fdd Update CPack configuration for NSIS packages
Now grabs generated files from the configuration directory where they're
generated
7 years ago
Marc Zinnschlag 0153b54c3f increased version number 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 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 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
Stanislav Zhukov f703dbd1df Merge pull request #283 from Johnnynator/tes3mp 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