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-tes3mp/apps/openmw
David Cernat fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/main.cpp
7 years ago
..
mwbase Merge pull request #228 from OpenMW/master while resolving conflicts 7 years ago
mwclass Merge pull request #228 from OpenMW/master while resolving conflicts 7 years ago
mwdialogue Merge pull request #228 from OpenMW/master while resolving conflicts 7 years ago
mwgui Merge pull request #228 from OpenMW/master while resolving conflicts 7 years ago
mwinput Merge pull request #228 from OpenMW/master while resolving conflicts 7 years ago
mwmechanics Merge pull request #228 from OpenMW/master while resolving conflicts 7 years ago
mwmp [General] Implement CleanChat() 7 years ago
mwphysics convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis 7 years ago
mwrender purge unnecessary imports 7 years ago
mwscript Merge pull request #228 from OpenMW/master while resolving conflicts 7 years ago
mwsound Fixes for building in MSVC 7 years ago
mwstate Fixes for building in MSVC 7 years ago
mwworld Merge pull request #228 from OpenMW/master while resolving conflicts 7 years ago
CMakeLists.txt [General] Implement PlayerKillCount packets 7 years ago
android_commandLine.cpp Fix tab indentations in apps/ and components/ 9 years ago
android_commandLine.h Remove empty line at the beginning of files 9 years ago
android_main.c enable opengl es1 9 years ago
crashcatcher.cpp crashcatcher: complain when launching gdb fails 7 years ago
doc.hpp Fixed more spelling mistakes 8 years ago
engine.cpp Merge pull request #228 from OpenMW/master while resolving conflicts 7 years ago
engine.hpp convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis 7 years ago
main.cpp Merge pull request #228 from OpenMW/master while resolving conflicts 7 years ago