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
scrawl b8e11cf197 Merge commit 'pull/upstream/678' into HEAD
Conflicts:
	apps/esmtool/record.cpp
	apps/opencs/model/doc/savingstages.cpp
	apps/opencs/model/world/land.cpp
	apps/opencs/model/world/land.hpp
	apps/opencs/model/world/landtexture.cpp
	apps/openmw/mwworld/store.cpp
	components/esm/loadland.cpp
	components/esm/loadland.hpp
9 years ago
..
mwbase Rotations: remove LocalRotation 9 years ago
mwclass Rotations: move doors via Rotation rather than LocalRotation 9 years ago
mwdialogue Update the dialogue topic list after running greeting script 9 years ago
mwgui Restore the previous key focus widget after playing video 9 years ago
mwinput Fix tab indentations in apps/ and components/ 9 years ago
mwmechanics Rotations: World::rotateObject takes radians instead of degrees 9 years ago
mwphysics Dead actors underwater will float to the surface 9 years ago
mwrender Remove a stray method declaration 9 years ago
mwscript improves InterpreterContext::updatePtr 9 years ago
mwsound extracted MWMechanics::getPlayer() 10 years ago
mwstate Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3' 9 years ago
mwworld Merge commit 'pull/upstream/678' into HEAD 9 years ago
CMakeLists.txt Fixes for building with unity build 9 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 Fix tab indentations in apps/ and components/ 9 years ago
crashcatcher.cpp Fix tab indentations in apps/ and components/ 9 years ago
doc.hpp doc.hpp fix 10 years ago
engine.cpp Remove old FPS setting code 9 years ago
engine.hpp Fix the Viewer's FrameStamp not being set correctly during Engine::frame 10 years ago
main.cpp Move OpenMW version information to a textfile instead of compiling it in 10 years ago