scrawl
|
94aeb15220
|
bartering disposition change
|
2012-11-10 00:38:45 +01:00 |
|
scrawl
|
33b4b29fbc
|
persuasion mechanics, added reputation
|
2012-11-10 00:29:36 +01:00 |
|
scrawl
|
ace9ee9c83
|
persuasion dialog
|
2012-11-09 20:18:38 +01:00 |
|
scrawl
|
d53a7ade1e
|
method names, disposition uint->int
|
2012-11-09 14:42:09 +01:00 |
|
scrawl
|
ae78eaeb28
|
fixed training, fixed todo comments
|
2012-11-08 23:21:03 +01:00 |
|
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
|
bf4e855260
|
fixed creatures
|
2012-11-08 22:31:08 +01:00 |
|
gugus
|
4634227f1c
|
notify the user when the merchant doesn't accept the offer
|
2012-11-08 21:50:56 +01:00 |
|
scrawl
|
3d7146cd50
|
don't allow opening a window multiple times, primarily the console
|
2012-11-08 19:34:54 +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
|
f818fa1ebf
|
minor update since records contains own id
|
2012-11-08 01:39:24 +04:00 |
|
greye
|
5b9621bca5
|
store player record data in ESMStore
|
2012-11-08 01:36:43 +04:00 |
|
greye
|
9ab2c16055
|
store created character classes as dynamic records
|
2012-11-08 01:22:44 +04:00 |
|
Marc Zinnschlag
|
918316168f
|
Merge remote-tracking branch 'greye/store' into next
Conflicts:
apps/openmw/mwclass/light.cpp
apps/openmw/mwworld/worldimp.cpp
|
2012-11-07 19:34:28 +01:00 |
|
Marc Zinnschlag
|
0805301922
|
Merge remote-tracking branch 'bwrsandman/master' into next
|
2012-11-07 10:40:40 +01:00 |
|
bwrsandman
|
7911f08c53
|
Issue #438: set 0 a.m. to be 12 a.m.
|
2012-11-06 13:19:35 -05:00 |
|
greye
|
b3ad872845
|
new interface in manualref, fix various typos
|
2012-11-06 13:43:48 +04:00 |
|
greye
|
e74b2c060d
|
disable createRecord(), Land constness hack, various fixes with Store<T> interface
|
2012-11-06 13:14:03 +04:00 |
|
greye
|
a9c1ce412a
|
applying new interface vol.7, inconsistent
|
2012-11-06 11:29:18 +04:00 |
|
gugus
|
2841d831a6
|
Disposition is now updated everyframe
|
2012-11-05 23:16:37 +01:00 |
|
Marc Zinnschlag
|
a7da929496
|
Merge remote-tracking branch 'scrawl/master' into next
|
2012-11-05 22:46:42 +01:00 |
|
greye
|
4637503680
|
applying new interface vol.6, inconsistent
|
2012-11-06 00:34:11 +04:00 |
|
scrawl
|
646e689239
|
clear name edits when opening alchemy / spell creation
|
2012-11-05 20:47:28 +01:00 |
|
greye
|
42aae566a7
|
applying new interface vol.5, inconsistent
|
2012-11-05 23:41:26 +04: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 |
|
gugus
|
aaf1b66c7e
|
BarterOffer is used in other trading services too
|
2012-11-05 19:53:55 +01:00 |
|
Marc Zinnschlag
|
61942c9c4a
|
Issue #440: Make day numbers start at 1 instead of 0
|
2012-11-05 18:01:50 +01:00 |
|
greye
|
d205723a17
|
resolving m prefix/ESMStore movement
|
2012-11-05 18:02:47 +04:00 |
|
greye
|
8691eac557
|
resolve Script::mData.mName -> mId, resolve moving ESMStore
|
2012-11-05 17:41:36 +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
|
6f7a621b6f
|
disabled enchanting unfinished enchantment GUI for now
|
2012-11-04 23:15:20 +01:00 |
|
scrawl
|
ba2fc2d6f8
|
better fix for chargen button colors
|
2012-11-04 11:37:47 +01:00 |
|
emoose
|
c8cc6b6e65
|
Fixed: engine: Bug #437 Stop animations when paused; tooltips: capitalize first letter (eg paper -> Paper)
|
2012-11-03 16:39:32 +00:00 |
|
emoose
|
b70b8cc4bc
|
Fixed: character creation: make OK button grayed out/disabled (loses the hoverover when it's re-enabled though...)
|
2012-11-03 06:02:33 +00:00 |
|
emoose
|
4a9821dc65
|
fix kdevelop indentation...
|
2012-11-02 20:43:07 +00:00 |
|
emoose
|
15f972cc62
|
fixes: compile: cast error; doors: key id case comparison; character creation: going from CharacterCreation to BirthDialog loses data; character creation: Class/Race/BirthDialog allowing no data; code: clean up a bit
todo: going from CharacterCreation back to CreateClassDialog loses data
|
2012-11-02 20:33:08 +00:00 |
|
bwrsandman
|
5d45d328b8
|
Fixed uninitialized variable that caused a segfault when going to previous page.
|
2012-10-26 21:28:22 -04:00 |
|
scrawl
|
234716daa6
|
finished spell creation
|
2012-10-23 11:42:38 +02:00 |
|
scrawl
|
33361e6539
|
Merge branch 'master' into spellcreation
|
2012-10-23 10:38:53 +02:00 |
|
scrawl
|
59560e84eb
|
small addition
|
2012-10-19 20:48:15 +02:00 |
|
scrawl
|
b2b9254718
|
improved the ingredient GUI code (this didnt fix anything, though)
|
2012-10-19 20:44:53 +02:00 |
|
scrawl
|
475163bd4a
|
Merge branch 'master' of https://github.com/zinnschlag/openmw
|
2012-10-19 20:21:34 +02:00 |
|
scrawl
|
fbe3538f32
|
bug #412: sort birth signs
|
2012-10-19 20:13:37 +02:00 |
|
Marc Zinnschlag
|
3f6afb13f1
|
Merge remote-tracking branch 'scrawl/alchemy'
|
2012-10-19 20:09:45 +02:00 |
|
scrawl
|
d76522e7a4
|
searchPtrViaHandle
|
2012-10-19 19:48:02 +02:00 |
|