scrawl
|
1b5bfc52a1
|
Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwclass/apparatus.cpp
apps/openmw/mwclass/book.cpp
apps/openmw/mwclass/container.cpp
apps/openmw/mwclass/ingredient.cpp
apps/openmw/mwclass/misc.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/potion.cpp
apps/openmw/mwclass/repair.cpp
apps/openmw/mwgui/window_manager.cpp
|
2012-04-24 02:02:03 +02:00 |
|
Marc Zinnschlag
|
35f478071e
|
Issue #255: deleted the old environment class and using the new one instead
|
2012-04-23 15:27:03 +02:00 |
|
scrawl
|
cdd4d83d9e
|
moved the tooltip info to the appropriate MWWorld::Class classes
|
2012-04-16 22:58:16 +02:00 |
|
Marc Zinnschlag
|
79158b9325
|
NPCs are using InventoryStore instead of ContainerStore from now on
|
2012-03-10 12:49:54 +01:00 |
|
Marc Zinnschlag
|
f2972b1ca0
|
turned ContainerStore from a template into a simple struct
|
2012-01-28 11:45:55 +01:00 |
|
Marc Zinnschlag
|
8de6761a79
|
general cleanup
|
2012-01-27 15:11:02 +01:00 |
|
Marc Zinnschlag
|
c6761e3470
|
replaced NPC stats in ref data with new custom data implementation
|
2012-01-25 16:56:49 +01:00 |
|
Jason Hooks
|
16ff2a7a1b
|
Changing to Actors;NPCAnimation;CreatureAnimation
|
2011-11-24 01:48:54 -05:00 |
|
Jason Hooks
|
bc58ef28cd
|
Made corrections
|
2011-11-12 15:58:22 -05:00 |
|
Jason Hooks
|
c7dadec840
|
Updating the rest of mwclass
|
2011-11-11 23:01:12 -05:00 |
|
Marc Zinnschlag
|
4468a2b6a8
|
added movement data to MW references; added movement interface to MWWorld::Class
|
2011-02-03 11:37:17 +01:00 |
|
Marc Zinnschlag
|
b48a5084be
|
added NPC stances
|
2011-01-18 10:45:29 +01:00 |
|
Pieter van der Kloet
|
dd4d022301
|
Converted all tabs to four spaces
|
2011-01-05 22:18:21 +01:00 |
|
Jason Hooks
|
11406ae6f3
|
cleanupandupdate
|
2011-01-01 11:45:11 -05:00 |
|
Jason Hooks
|
467988455c
|
Preliminary npcs3
|
2010-12-12 22:05:47 -05:00 |
|
Marc Zinnschlag
|
3b49d6c826
|
added NPC stats
|
2010-08-19 12:49:13 +02:00 |
|
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
|
2010-08-18 09:25:07 +02:00 |
|
Marc Zinnschlag
|
d57c984517
|
added enable and disable functions to class hierarchy; fixed a bug regarding actors in cellings being actived
|
2010-08-14 11:27:13 +02:00 |
|
Marc Zinnschlag
|
967f85875d
|
reimplemented class-dependend rendering code in MWClass
|
2010-08-14 10:02:54 +02:00 |
|
Marc Zinnschlag
|
2acfe22975
|
added test for actor ID
|
2010-08-08 14:28:35 +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
|
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
|
239498bcd4
|
added getName function
|
2010-08-03 17:11:41 +02:00 |
|
Marc Zinnschlag
|
33b6a0b800
|
moved concrete record classes to separate sub-system (mwclass)
|
2010-08-03 13:17:31 +02:00 |
|