Marc Zinnschlag
|
8086933282
|
Merge branch 'master' into dialogue
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
|
2010-08-08 14:14:43 +02:00 |
|
Marc Zinnschlag
|
7afc8ffd2e
|
Merge branch 'container'
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
|
2010-08-07 20:33:07 +02:00 |
|
Marc Zinnschlag
|
a7fe28ecbe
|
implemented take action
|
2010-08-07 20:25:17 +02:00 |
|
Marc Zinnschlag
|
0a60bde834
|
added insertIntoContainer function to class hierarchy
|
2010-08-06 22:20:20 +02:00 |
|
Marc Zinnschlag
|
d42747e85b
|
Merge branch 'master' into dialogue
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
|
2010-08-06 19:20:05 +02:00 |
|
Marc Zinnschlag
|
09c42589cc
|
implemented npc/creature activation (enters dialog gui mode for now)
|
2010-08-06 18:15:46 +02:00 |
|
Marc Zinnschlag
|
10a63b10b5
|
Merge branch 'master' into container
Conflicts:
apps/openmw/mwclass/container.cpp
apps/openmw/mwclass/container.hpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/creature.hpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
apps/openmw/mwworld/class.cpp
apps/openmw/mwworld/class.hpp
|
2010-08-06 14:37:53 +02:00 |
|
Marc Zinnschlag
|
7a313f24ab
|
integrated activation into script system
|
2010-08-05 15:40:03 +02:00 |
|
Marc Zinnschlag
|
ee7570f7e7
|
added containerstore
|
2010-08-04 14:37:23 +02:00 |
|
Marc Zinnschlag
|
002345270b
|
implemented teleport doors (only for the player for now)
|
2010-08-03 18:44:52 +02:00 |
|
Marc Zinnschlag
|
239498bcd4
|
added getName function
|
2010-08-03 17:11:41 +02:00 |
|
Marc Zinnschlag
|
f50ced4616
|
added missing record classes
|
2010-08-03 15:24:44 +02:00 |
|
Marc Zinnschlag
|
bfc282779b
|
added item health interface
|
2010-08-03 14:14:04 +02:00 |
|
Marc Zinnschlag
|
93754b2851
|
moved some includes around
|
2010-08-03 13:32:37 +02:00 |
|
Marc Zinnschlag
|
33b6a0b800
|
moved concrete record classes to separate sub-system (mwclass)
|
2010-08-03 13:17:31 +02:00 |
|
Marc Zinnschlag
|
9d6e658e05
|
previous commit was missing some files
|
2010-08-03 13:03:08 +02:00 |
|