Jason Hooks
|
467988455c
|
Preliminary npcs3
|
14 years ago |
Marc Zinnschlag
|
3b49d6c826
|
added NPC stats
|
15 years ago |
|
Marc Zinnschlag
|
2cfe5f0697
|
Merge branch 'master' into dialogue
Conflicts:
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
|
15 years ago |
|
Marc Zinnschlag
|
d57c984517
|
added enable and disable functions to class hierarchy; fixed a bug regarding actors in cellings being actived
|
15 years ago |
|
Marc Zinnschlag
|
967f85875d
|
reimplemented class-dependend rendering code in MWClass
|
15 years ago |
|
Marc Zinnschlag
|
2acfe22975
|
added test for actor ID
|
15 years ago |
|
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
|
15 years ago |
|
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
|
15 years ago |
|
Marc Zinnschlag
|
09c42589cc
|
implemented npc/creature activation (enters dialog gui mode for now)
|
15 years ago |
|
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
|
15 years ago |
|
Marc Zinnschlag
|
7a313f24ab
|
integrated activation into script system
|
15 years ago |
|
Marc Zinnschlag
|
ee7570f7e7
|
added containerstore
|
15 years ago |
|
Marc Zinnschlag
|
239498bcd4
|
added getName function
|
15 years ago |
|
Marc Zinnschlag
|
33b6a0b800
|
moved concrete record classes to separate sub-system (mwclass)
|
15 years ago |