Commit Graph

106 Commits (8c7e06293fbe6d0ed1dd7dd0f424b9f1b6f92162)

Author SHA1 Message Date
scrawl b2afb1fd5c Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwgui/spellbuyingwindow.cpp
	apps/openmw/mwgui/trainingwindow.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
12 years ago
gugus f72f898bd9 implement barterOffer. It's used for travel only.
I've started to implement disposition, but it's very basic for now.
12 years ago
Marc Zinnschlag 453f347ee8 Issue #68: added getdeadcount script function 12 years ago
Marc Zinnschlag f2e25b8a47 Issue #68: Keep dead actors out of the actor list for the current scene 12 years ago
scrawl 872fcf3e3d sleeping restoration of health, magicka, and fatigue 12 years ago
Marc Zinnschlag b68f9d6a28 Issue #107: MechanicsManager is accessed only through the interface class from now on 13 years ago