1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-25 23:09:40 +00:00
openmw-tes3mp/components
David Cernat 3f7e163c92 Merge pull request 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/Worldstate.cpp
	apps/openmw-mp/Script/Functions/Worldstate.hpp
	apps/openmw-mp/processors/worldstate/ProcessorRecordDynamic.hpp
	apps/openmw/mwmp/processors/worldstate/ProcessorRecordDynamic.hpp
	components/CMakeLists.txt
	components/openmw-mp/Packets/Player/PacketGUIBoxes.cpp
2018-05-25 06:34:07 +03:00
..
bsa http to https for supported urls () 2018-03-08 21:23:24 +01:00
compiler allow . and - in the name part of a begin script statement, but not at the beginning of a name. Fixes 2018-01-12 16:37:06 +01:00
config Make hasMaster() behavior consistent with isGameFile() (fixes ) 2018-03-28 15:43:51 +03:00
contentselector Assume Morrowind.esm dependency for dependency-less content addons (fixes ) 2018-04-29 14:56:38 +03:00
esm Merge pull request from TES3MP/0.6.3 while resolving conflicts 2018-05-25 06:34:07 +03:00
esmterrain Some PVS-Studio and cppcheck fixes 2018-04-18 12:36:10 +00:00
fallback Revert log spam 2018-04-22 15:41:25 +00:00
files Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all 2017-11-11 22:58:02 +00:00
fontloader [Fix] Some PVS-Studio and cppcheck fixes 2018-04-18 12:36:10 +00:00
interpreter
loadinglistener
misc Fix crash when rollDice is called with 0. 2018-04-21 16:46:36 +03:00
myguiplatform
nif Handle NiLookAtController (feature ) 2018-04-29 09:24:13 +04:00
nifbullet removed the unnecessary comment 2018-02-09 16:34:55 +01:00
nifosg Some PVS-Studio and cppcheck fixes 2018-04-18 12:36:10 +00:00
openmw-mp Merge pull request from TES3MP/0.6.3 while resolving conflicts 2018-05-25 06:34:07 +03:00
process
resource Add NPC base skeleton files to the optimizer blacklist (Fixes ) 2017-11-10 22:51:32 +00:00
sceneutil Add an empty compileGLObjects implementation to Rig/MorphGeometry to avoid unnecessary creation of display list done by osg 2018-04-18 12:36:08 +00:00
sdlutil 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
settings http to https for supported urls () 2018-03-08 21:23:24 +01:00
shader Reduce error spam 2017-11-08 00:24:03 +00:00
terrain Merged pull request 2018-05-23 16:56:36 +02:00
to_utf8
translation
version
vfs Ignore duplicate data directories to work around the fallout of (Fixes ) 2018-01-14 00:25:20 +00:00
widgets Add an option to disable GUI keyboard navigation (Bug ) 2018-03-08 23:39:35 +00:00
CMakeLists.txt Merge pull request from TES3MP/0.6.3 while resolving conflicts 2018-05-25 06:34:07 +03:00
doc.hpp