krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
openmw-tes3coop/components
History
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
2018-04-18 18:29:00 +03:00
..
bsa http to https for supported urls (#1625) 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 #4061 2018-01-12 16:37:06 +01:00
config Make hasMaster() behavior consistent with isGameFile() (fixes #3618) 2018-03-28 15:43:51 +03:00
contentselector purge the rest of boost::shared and any other boost related things that no longer are required 2017-06-09 19:08:53 +02:00
esm Merge pull request #409 from TES3MP/0.6.3 while resolving conflicts 2018-04-18 18:29:00 +03:00
esmterrain Some PVS-Studio and cppcheck fixes 2018-04-18 12:36:10 +00:00
fallback Print a warning in case a fallback value wasn't found 2018-03-14 00:25:56 +03: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 More consistent wording of errors/warnings 2017-03-04 21:48:31 +01:00
loadinglistener
misc Move toUpper() from StringUtils to the JournalViewModel 2017-11-23 19:37:45 +04:00
myguiplatform purge unnecessary imports 2017-06-09 19:08:53 +02:00
nif http to https for supported urls (#1625) 2018-03-08 21:23:24 +01: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 #406 from TES3MP/0.6.3 while resolving conflicts 2018-04-13 18:05:38 +03:00
process
resource Add NPC base skeleton files to the optimizer blacklist (Fixes #4159) 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 (#1625) 2018-03-08 21:23:24 +01:00
shader Reduce error spam 2017-11-08 00:24:03 +00:00
terrain Fix timing error 2018-02-13 18:25:28 +00:00
to_utf8
translation Merge pull request #228 from OpenMW/master while resolving conflicts 2017-06-18 18:16:10 +03:00
version Allow getting available version information even when clone is shallow 2017-03-07 21:53:49 +01:00
vfs Ignore duplicate data directories to work around the fallout of (Fixes #3557) 2018-01-14 00:25:20 +00:00
widgets Add an option to disable GUI keyboard navigation (Bug #4333) 2018-03-08 23:39:35 +00:00
CMakeLists.txt Merge pull request #409 from TES3MP/0.6.3 while resolving conflicts 2018-04-18 18:29:00 +03:00
doc.hpp