mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 15:19:55 +00:00
Code Issues Releases Wiki Activity
20888 commits 38 branches 54 tags 122 MiB
Commit graph

834 commits

Author SHA1 Message Date
Kyle Cooley
6c7d73af7f Bump c++ standard version to 14 2018-05-10 19:01:22 -04:00
David Cernat
9e5ddeac50
Merge pull request #408 from OpenMW/master 
Add OpenMW commits up to 18 Apr 2018
 2018-04-18 18:05:09 +03:00
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. 2018-04-18 12:36:09 +00:00
David Cernat
365f485e8d Merge pull request #397 from OpenMW/master while resolving conflicts 
Conflicts:
	components/CMakeLists.txt
 2018-03-30 10:28:52 +03:00
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 2018-03-27 20:20:40 +02:00
David Cernat
b7c6261e16 Merge pull request #392 from OpenMW/master while resolving conflicts 
# Conflicts:
#	README.md
 2018-03-09 21:07:46 +02:00
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
 2018-03-08 21:23:24 +01:00
David Cernat
14ef2fa791
Merge pull request #369 from OpenMW/master 
Add OpenMW commits up to 9 Jan 2018
 2018-01-10 03:49:53 +02:00
Thunderforge
bd072b131b Moving controller file out of the controllers subdirectory 2018-01-02 20:58:43 -06:00
Thunderforge
3f7143556a Providing different mappings depending on the version of SDL installed 2018-01-01 22:16:54 -06:00
David Cernat
ecb0ad0d77 Merge pull request #359 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
 2017-12-25 02:03:02 +02:00
Thunderforge
e4a1b6b5b8 Explicitly setting CMAKE_CXX_STANDARD to C++11 2017-12-16 14:36:27 -06:00
David Cernat
e7f20e7daf Merge pull request #351 from OpenMW/master while resolving conflicts 
# Conflicts:
#	CMakeLists.txt
#	README.md
 2017-11-30 10:06:38 +02:00
scrawl
a4d8aef40d
Merge branch openmw-43 into master 
Conflicts:
	CMakeLists.txt
	README.md
	files/mygui/openmw_trade_window.layout
 2017-11-29 22:37:50 +00: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
Alexander "Ace" Olofsson
2e6cf53fdd Update CPack configuration for NSIS packages 
Now grabs generated files from the configuration directory where they're
generated
 2017-10-24 23:05:56 +02:00
Marc Zinnschlag
0153b54c3f increased version number 2017-10-23 14:08:08 +02: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
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
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
Stanislav Zhukov
f703dbd1df Merge pull request #283 from Johnnynator/tes3mp 2017-09-14 02:38:27 +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 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.
 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