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 ac374a8ef9 Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts 
Conflicts:
 	apps/openmw-mp/Player.cpp
	apps/openmw-mp/Script/Functions/Mechanics.cpp
	apps/openmw-mp/Script/Functions/Mechanics.hpp
	apps/openmw-mp/Script/Functions/Quests.cpp
	apps/openmw-mp/Script/Functions/Quests.hpp
	apps/openmw-mp/Script/ScriptFunctions.hpp
	apps/openmw-mp/processors/player/ProcessorRecordDynamic.hpp
	apps/openmw/mwmp/LocalPlayer.hpp
	apps/openmw/mwmp/WorldEvent.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/openmw-mp/Base/BasePlayer.hpp
2018-02-12 06:50:52 +02:00
..
bsa purge unnecessary imports 2017-06-09 19:08:53 +02: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 Fix assert with empty setting value 2017-10-22 10:10:04 +02: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 #376 from TES3MP/0.6.3 while resolving conflicts 2018-01-29 02:57:48 +02:00
esmterrain Cast LAND_SIZE to integer to avoid linking error 2017-03-28 01:57:31 +09:00
fallback be explicit about what we are trying to catch instead of catching everything and fixed up formatting 2017-06-12 00:32:29 +02:00
files Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all 2017-11-11 22:58:02 +00:00
fontloader
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 camelCase 2018-01-01 16:32:20 +01:00
nifbullet Fix some style issues flagged by cppcheck 2017-10-15 17:06:58 +02:00
nifosg Don't incorrectly discard root node transformation (Fixes #4272) 2017-12-31 23:49:43 +00:00
openmw-mp Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts 2018-02-12 06:50:52 +02:00
process
resource Add NPC base skeleton files to the optimizer blacklist (Fixes #4159) 2017-11-10 22:51:32 +00:00
sceneutil Fix the optimizer messing up LOD node's children (Fixes #4301) 2018-01-29 19:44:12 +00:00
sdlutil GraphicsWindowSDL2: support setting up GLESv2 context for android 2018-01-18 17:11:22 -05:00
settings Update Links to Documentation in settings.cfg files (#1523) 2017-10-28 16:05:30 +00:00
shader Reduce error spam 2017-11-08 00:24:03 +00:00
terrain Fall back to non-shader material if creating the shader fails 2017-11-08 00:24:03 +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 Fix NumericEditBox behavior broken by switch to std::stoi 2017-11-20 23:20:03 +00:00
CMakeLists.txt Merge pull request #380 from TES3MP/0.6.3 2018-01-30 16:05:24 +02:00
doc.hpp