teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
openmw-tes3coop/apps/openmw
History
gugus 8e8f80807e Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwclass/apparatus.cpp
	apps/openmw/mwclass/armor.cpp
	apps/openmw/mwclass/book.cpp
	apps/openmw/mwclass/clothing.cpp
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/ingredient.cpp
	apps/openmw/mwclass/light.cpp
	apps/openmw/mwclass/lockpick.cpp
	apps/openmw/mwclass/misc.cpp
	apps/openmw/mwclass/potion.cpp
	apps/openmw/mwclass/probe.cpp
	apps/openmw/mwclass/repair.cpp
	apps/openmw/mwclass/weapon.cpp
	apps/openmw/mwgui/window_manager.cpp
	apps/openmw/mwgui/window_manager.hpp
	apps/openmw/mwworld/class.cpp
2012-05-11 10:40:40 +02:00
..
mwbase fixed exception handling during subsystem setup 2012-05-04 17:20:57 +02:00
mwclass Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
mwdialogue allow talking with creatures 2012-05-03 06:07:41 +02:00
mwgui Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
mwinput Merge branch 'master' into physicsaedra2 & fix warnings 2012-04-30 18:46:51 +02:00
mwmechanics Merge branch 'master' into physicsaedra2 & fix warnings 2012-04-30 18:46:51 +02:00
mwrender Merge branch 'master' into physicsaedra2 & fix warnings 2012-04-30 18:46:51 +02:00
mwscript Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips 2012-04-24 02:02:03 +02:00
mwsound Add voices to the chargen class questions 2012-05-01 20:30:31 -07:00
mwworld Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
CMakeLists.txt Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
config.hpp.cmake another minor correction (fixing the previous one) 2011-07-08 16:16:06 +02:00
doc.hpp first set of additional doxygen comments 2010-09-25 15:03:53 +02:00
engine.cpp throw an exception when no default settings file is found, which indicates a packaging error 2012-05-07 23:16:29 +02:00
engine.hpp fixed exception handling during subsystem setup 2012-05-04 17:20:57 +02:00
main.cpp removed --report-focus which is now useless 2012-04-19 01:16:41 +02:00