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/apps/openmw
David Cernat 6cb5ac6e63 Merge pull request #457 from OpenMW/master while resolving conflicts
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/main.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwmechanics/character.cpp
	components/CMakeLists.txt
6 years ago
..
mwbase Merge pull request #457 from OpenMW/master while resolving conflicts 6 years ago
mwclass Merge pull request #457 from OpenMW/master while resolving conflicts 6 years ago
mwdialogue Merge pull request #456 from OpenMW/master while resolving conflicts 6 years ago
mwgui Merge pull request #457 from OpenMW/master while resolving conflicts 6 years ago
mwinput Merge pull request #456 from OpenMW/master while resolving conflicts 6 years ago
mwmechanics Merge pull request #457 from OpenMW/master while resolving conflicts 6 years ago
mwmp [Client] Simplify sending of ActorAI packets for uninitialized actors 6 years ago
mwphysics Merge pull request #456 from OpenMW/master while resolving conflicts 6 years ago
mwrender [Client] Avoid sending map tiles for Wilderness cells 6 years ago
mwscript Merge pull request #457 from OpenMW/master while resolving conflicts 6 years ago
mwsound Initialize some missing fields in constructors 6 years ago
mwstate Revert "Merge pull request #1701 from akortunov/standfix" 6 years ago
mwworld Merge pull request #457 from OpenMW/master while resolving conflicts 6 years ago
CMakeLists.txt Merge pull request #457 from OpenMW/master while resolving conflicts 6 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 android: Update for sdl 2.0.8 6 years ago
doc.hpp Fixed more spelling mistakes 8 years ago
engine.cpp Merge pull request #457 from OpenMW/master while resolving conflicts 6 years ago
engine.hpp Merge branch 'master' into screenshot360 6 years ago
main.cpp Merge pull request #457 from OpenMW/master while resolving conflicts 6 years ago