openmw-tes3coop/apps/opencs
David Cernat 3b7693c719 Resolve conflicts in pull request #55
# Conflicts:
#	README.md
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwmechanics/combat.cpp
2016-09-15 08:49:57 +03:00
..
model Merge remote-tracking branch 'aesylwinn/ContentNumberFix' 2016-09-06 15:48:05 +02:00
view Make it easier to place objects in the scene editor. 2016-09-03 17:37:13 -04:00
CMakeLists.txt Fix globals not being initialized with a valid type. 2016-08-09 00:17:41 -04:00
editor.cpp Read fallback settings in OpenCS 2016-01-11 23:10:16 +01:00
editor.hpp removed old user settings system 2015-12-15 12:49:55 +01:00
main.cpp Syncing inventory, animations, position, 8 key attributes 2016-07-07 23:50:48 +08:00
Networking.cpp Add OpenMW-mp target 2016-01-04 20:15:55 +08:00