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.

David Cernat 436548413e Resolve conflicts in pull request #39 ... # Conflicts: # CMakeLists.txt		8 years ago
..
model	Change free axis rotation.	8 years ago
view	Merge remote-tracking branch 'aesylwinn/InstanceRotateAndScale'	8 years ago
CMakeLists.txt	Fix globals not being initialized with a valid type.	9 years ago
Networking.cpp	Add OpenMW-mp target	9 years ago
editor.cpp	Read fallback settings in OpenCS	9 years ago
editor.hpp	removed old user settings system	9 years ago
main.cpp	Syncing inventory, animations, position, 8 key attributes	9 years ago