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
|
2012-11-08 23:16:40 +01:00 |
|
scrawl
|
322faf13e4
|
cleanup
|
2012-11-08 22:37:59 +01:00 |
|
scrawl
|
bf4e855260
|
fixed creatures
|
2012-11-08 22:31:08 +01:00 |
|
greye
|
2a86432887
|
store birthsign in MWWorld::Player
|
2012-11-08 18:50:23 +04:00 |
|
gugus
|
0a883f4492
|
The player can now barter with merchants
|
2012-11-08 13:38:20 +01:00 |
|
greye
|
83e758ee50
|
clean up interfaces
|
2012-11-08 16:37:57 +04:00 |
|
greye
|
9dc9098fa7
|
update MWBase::World interface since records contains own id
|
2012-11-08 01:52:34 +04:00 |
|
greye
|
5b9621bca5
|
store player record data in ESMStore
|
2012-11-08 01:36:43 +04:00 |
|
gugus
|
bf98b95955
|
bugfix
|
2012-11-06 13:10:54 +01:00 |
|
gugus
|
2841d831a6
|
Disposition is now updated everyframe
|
2012-11-05 23:16:37 +01:00 |
|
gugus
|
9ebe9cb40c
|
Disposition is now calculated according to the Wiki. But: bouty and deacease are not implemented (for disposition at least), and there is still no temporary/permanent dispositons changes
|
2012-11-05 19:55:06 +01:00 |
|
greye
|
86ad7a96f4
|
applying new interface vol.2, inconsistent
|
2012-11-05 21:19:22 +04:00 |
|
greye
|
d205723a17
|
resolving m prefix/ESMStore movement
|
2012-11-05 18:02:47 +04:00 |
|
greye
|
2057f5619e
|
move ESMStore to MWWorld
|
2012-11-05 17:18:01 +04:00 |
|
greye
|
3c2ce25f5f
|
m prefix for mwworld/cellstore.hpp
|
2012-11-05 16:07:59 +04:00 |
|
gugus
|
f72f898bd9
|
implement barterOffer. It's used for travel only.
I've started to implement disposition, but it's very basic for now.
|
2012-11-05 11:07:43 +01:00 |
|
Marc Zinnschlag
|
453f347ee8
|
Issue #68: added getdeadcount script function
|
2012-10-27 11:33:18 +02:00 |
|
Marc Zinnschlag
|
bdca5aff87
|
Issue #68: simplified the dynamic stats interface
|
2012-10-19 13:10:06 +02:00 |
|
greye
|
2fa4ac177a
|
initial resolving
|
2012-10-01 00:23:49 +04:00 |
|
scrawl
|
872fcf3e3d
|
sleeping restoration of health, magicka, and fatigue
|
2012-09-21 17:53:16 +02:00 |
|
greye
|
7606ebafd6
|
resolving conflicts, minor update
|
2012-09-17 11:37:50 +04:00 |
|
Marc Zinnschlag
|
e97d23e626
|
Issue #361: reset skill level in race selection stage
|
2012-08-16 15:42:37 +02:00 |
|
Marc Zinnschlag
|
6534c2a55a
|
Issue #107: WindowManager is accessed only through the interface class from now on
|
2012-08-12 18:11:09 +02:00 |
|
Marc Zinnschlag
|
b68f9d6a28
|
Issue #107: MechanicsManager is accessed only through the interface class from now on
|
2012-08-11 17:30:55 +02:00 |
|