858 Commits (cf3369544756eed1ce590218c1a2de3c74917564)

Author	SHA1	Message	Date
David Cernat	6bb2a7e24a	Merge pull request #444 from TES3MP/0.6.3 while resolving conflicts	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	fc4d3fe3fa	Merge pull request #441 from TES3MP/0.6.3 while resolving conflicts ... Conflicts: apps/openmw-mp/Script/Functions/Worldstate.cpp apps/openmw-mp/Script/Functions/Worldstate.hpp	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
David Cernat	8a393d2984	Merge pull request #430 from TES3MP/0.6.3 while resolving conflicts ... # Conflicts: # apps/openmw-mp/Networking.cpp # apps/openmw-mp/Networking.hpp # components/CMakeLists.txt	7 years ago
Kyle Cooley	6c7d73af7f	Bump c++ standard version to 14	7 years ago
David Cernat	e355dca4dd	Merge pull request #409 from TES3MP/0.6.3 while resolving conflicts ... Conflicts: apps/openmw-mp/CMakeLists.txt apps/openmw-mp/Script/Functions/GUI.cpp apps/openmw-mp/Script/Functions/GUI.hpp apps/openmw-mp/Script/Functions/Items.hpp apps/openmw-mp/Script/Functions/Mechanics.cpp apps/openmw-mp/Script/Functions/Mechanics.hpp apps/openmw-mp/Script/Functions/Stats.cpp apps/openmw-mp/Script/Functions/Stats.hpp apps/openmw-mp/Script/ScriptFunctions.cpp apps/openmw-mp/Script/ScriptFunctions.hpp	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	5bb09d3bed	Merge pull request #399 from TES3MP/0.6.3 while resolving conflicts ... Conflicts: apps/openmw/mwmp/WorldEvent.cpp apps/openmw/mwmp/WorldEvent.hpp apps/openmw/mwmp/processors/world/ProcessorContainer.hpp	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	7ec08e125b	Merge pull request #394 from TES3MP/0.6.3 while resolving conflicts ... Conflicts: apps/openmw-mp/Script/Functions/Settings.cpp apps/openmw-mp/Script/Functions/Settings.hpp	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
Koncord	4e869a2974	[General] Use correct versions of C++ per target ... C++11 for client, components and launcher C++14 for server, browser and masterserver	7 years ago
David Cernat	92060bd6b6	Merge pull request #370 from TES3MP/0.6.2 ... Add 0.6.2 commits up to 10 Jan 2018	7 years ago
David Cernat	14ef2fa791	Merge pull request #369 from OpenMW/master ... Add OpenMW commits up to 9 Jan 2018	7 years ago
Kyle Cooley	7248a5d037	Remove some duplication, standardize sol2 header inclusion	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	8bb764c6d6	[Build] Use C++14 instead of C++11, as the server requires the former	7 years ago
David Cernat	dddd2f1cc7	Merge pull request #361 from OpenMW/master while resolving conflicts ... # Conflicts: # .travis.yml	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	7e322f1f8b	Merge pull request #352 from TES3MP/master while resolving conflicts ... # Conflicts: # README.md	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	4dbada69bf	Merge pull request #332 from TES3MP/master while resolving conflicts	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
David Cernat	76a4abd7c0	Merge pull request #325 from TES3MP/master while resolving conflicts ... # Conflicts: # apps/openmw-mp/processors/player/ProcessorPlayerTopic.hpp	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	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