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 a083439139 Merge pull request #469 from davidcernat/master while resolving conflicts
# Conflicts:
#	apps/openmw/main.cpp
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
#	apps/openmw/mwworld/worldimp.hpp
6 years ago
..
mwbase Merge pull request #469 from davidcernat/master while resolving conflicts 6 years ago
mwclass Merge pull request #469 from davidcernat/master while resolving conflicts 6 years ago
mwdialogue Merge pull request #469 from davidcernat/master while resolving conflicts 6 years ago
mwgui Merge pull request #469 from davidcernat/master while resolving conflicts 6 years ago
mwinput Merge pull request #456 from OpenMW/master while resolving conflicts 7 years ago
mwmechanics Merge pull request #469 from davidcernat/master while resolving conflicts 6 years ago
mwmp [Client] Fix GCC build 6 years ago
mwphysics Merge pull request #469 from davidcernat/master while resolving conflicts 6 years ago
mwrender Merge pull request #469 from davidcernat/master while resolving conflicts 6 years ago
mwscript Merge pull request #469 from davidcernat/master while resolving conflicts 6 years ago
mwsound Replace 0 sound range values separately 7 years ago
mwstate Add resumeGame method 7 years ago
mwworld Merge pull request #469 from davidcernat/master while resolving conflicts 6 years ago
CMakeLists.txt [General] Implement PlayerItemUse packet 6 years ago
android_commandLine.cpp
android_commandLine.h
android_main.c android: Update for sdl 2.0.8 7 years ago
doc.hpp Fixed more spelling mistakes 8 years ago
engine.cpp Merge pull request #469 from davidcernat/master while resolving conflicts 6 years ago
engine.hpp Merge branch 'master' into screenshot360 7 years ago
main.cpp Merge pull request #469 from davidcernat/master while resolving conflicts 6 years ago