teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
openmw-tes3coop/apps/openmw/mwclass
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
..
activator.cpp Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips 2012-04-24 02:02:03 +02:00
activator.hpp Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips 2012-04-24 02:02:03 +02:00
apparatus.cpp Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
apparatus.hpp Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
armor.cpp Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
armor.hpp Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
book.cpp Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
book.hpp Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
classes.cpp Mantis: #18 - Move components from global namespace into their own namespace. 2011-06-19 18:14:03 +02:00
classes.hpp moved concrete record classes to separate sub-system (mwclass) 2010-08-03 13:17:31 +02:00
clothing.cpp Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
clothing.hpp Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
container.cpp Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
container.hpp Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips 2012-04-24 02:02:03 +02:00
creature.cpp Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips 2012-04-24 02:02:03 +02:00
creature.hpp Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips 2012-04-24 02:02:03 +02:00
creaturelevlist.cpp added getName function 2010-08-03 17:11:41 +02:00
creaturelevlist.hpp added getName function 2010-08-03 17:11:41 +02:00
door.cpp Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips 2012-04-24 02:02:03 +02:00
door.hpp Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips 2012-04-24 02:02:03 +02:00
ingredient.cpp Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
ingredient.hpp Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
itemlevlist.cpp added getName function 2010-08-03 17:11:41 +02:00
itemlevlist.hpp more corrections 2011-11-13 18:19:29 -05:00
light.cpp Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
light.hpp Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
lockpick.cpp Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
lockpick.hpp Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
misc.cpp Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
misc.hpp Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
npc.cpp Merge branch 'master' into physicsaedra2 & fix warnings 2012-04-30 18:46:51 +02:00
npc.hpp Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips 2012-04-24 02:02:03 +02:00
potion.cpp Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
potion.hpp Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
probe.cpp Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
probe.hpp Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
repair.cpp Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
repair.hpp Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
static.cpp Issue #255: deleted the old environment class and using the new one instead 2012-04-23 15:27:03 +02:00
static.hpp Issue #255: deleted the old environment class and using the new one instead 2012-04-23 15:27:03 +02:00
weapon.cpp Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00
weapon.hpp Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI 2012-05-11 10:40:40 +02:00