You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
openmw-tes3coop/components
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
7 years ago
..
bsa purge unnecessary imports 8 years ago
compiler allow . and - in the name part of a begin script statement, but not at the beginning of a name. Fixes #4061 7 years ago
config Fix assert with empty setting value 7 years ago
contentselector purge the rest of boost::shared and any other boost related things that no longer are required 8 years ago
esm Merge pull request #376 from TES3MP/0.6.3 while resolving conflicts 7 years ago
esmterrain Cast LAND_SIZE to integer to avoid linking error 8 years ago
fallback be explicit about what we are trying to catch instead of catching everything and fixed up formatting 8 years ago
files Removed escape_hash_filter::mPrevious, removed usage of boost::replace_all 7 years ago
fontloader Fix shadowing warnings 8 years ago
interpreter More consistent wording of errors/warnings 8 years ago
loadinglistener LoadingScreen: add support for important labels 9 years ago
misc Move toUpper() from StringUtils to the JournalViewModel 7 years ago
myguiplatform purge unnecessary imports 8 years ago
nif camelCase 7 years ago
nifbullet Fix some style issues flagged by cppcheck 7 years ago
nifosg Don't incorrectly discard root node transformation (Fixes #4272) 7 years ago
openmw-mp Merge pull request #384 from TES3MP/0.6.3 while resolving conflicts 7 years ago
process OSX build fix 10 years ago
resource Add NPC base skeleton files to the optimizer blacklist (Fixes #4159) 7 years ago
sceneutil Fix the optimizer messing up LOD node's children (Fixes #4301) 7 years ago
sdlutil GraphicsWindowSDL2: support setting up GLESv2 context for android 7 years ago
settings Update Links to Documentation in settings.cfg files (#1523) 7 years ago
shader Reduce error spam 7 years ago
terrain Fall back to non-shader material if creating the shader fails 7 years ago
to_utf8 Fix typo in a comment 9 years ago
translation Merge pull request #228 from OpenMW/master while resolving conflicts 8 years ago
version Allow getting available version information even when clone is shallow 8 years ago
vfs Ignore duplicate data directories to work around the fallout of (Fixes #3557) 7 years ago
widgets Fix NumericEditBox behavior broken by switch to std::stoi 7 years ago
CMakeLists.txt Merge pull request #380 from TES3MP/0.6.3 7 years ago
doc.hpp