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 3b7693c719 Resolve conflicts in pull request #55
# Conflicts:
#	README.md
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwmechanics/combat.cpp
8 years ago
..
mwbase Consolidations and cleanup for multi-effect spells 8 years ago
mwclass Resolve conflicts in pull request #55 8 years ago
mwdialogue Reject conditions testing agaist Choice when not currently in a choice (Fixes #3117) 9 years ago
mwgui Revert "Disable CharGen custom class choice until we can handle custom classes" 8 years ago
mwinput Merge remote-tracking branch 'yar/master' into Even 9 years ago
mwmechanics Resolve conflicts in pull request #55 8 years ago
mwmp Add some verbose messages for chat 8 years ago
mwphysics Improve performance by skipping update if transform is unchanged 8 years ago
mwrender Add loading code for multi-effect projectiles 8 years ago
mwscript add missing item when executing the Equip instruction 8 years ago
mwsound Include cleanup 9 years ago
mwstate Save scripted animation state (Fixes #1931, #2150, #3393) 9 years ago
mwworld Resolve conflicts in pull request #55 8 years ago
CMakeLists.txt Use tes3mp icon for executable, part 2 8 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 10 years ago
android_main.c enable opengl es1 9 years ago
crashcatcher.cpp Mainly making compilable under OpenBSD. 9 years ago
doc.hpp doc.hpp fix 10 years ago
engine.cpp Merge remote-tracking branch 'yar/master' into Even 9 years ago
engine.hpp Refactor: InputManager no longer depends on Engine 9 years ago
main.cpp Add --connect option to client 8 years ago