Marc Zinnschlag
|
f4ee8e2642
|
Issue #479: Added additional magnitude parameter to known spells
|
2013-01-12 13:10:20 +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 |
|
greye
|
9dc9098fa7
|
update MWBase::World interface since records contains own id
|
2012-11-08 01:52:34 +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 |
|
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
|
aaf1b66c7e
|
BarterOffer is used in other trading services too
|
2012-11-05 19:53:55 +01:00 |
|
greye
|
8691eac557
|
resolve Script::mData.mName -> mId, resolve moving ESMStore
|
2012-11-05 17:41:36 +04:00 |
|
scrawl
|
234716daa6
|
finished spell creation
|
2012-10-23 11:42:38 +02:00 |
|
scrawl
|
c991f68a2d
|
buying created spell
|
2012-10-15 21:54:19 +02:00 |
|
scrawl
|
f154031e54
|
last bits of the gui
|
2012-10-11 18:26:29 +02:00 |
|
scrawl
|
025e820703
|
abstracted code and use it in enchanting window as well
|
2012-10-03 15:36:10 +02:00 |
|
scrawl
|
1c0dd3ccc5
|
some editing code
|
2012-10-03 15:06:54 +02:00 |
|
scrawl
|
21493c2dbd
|
added magic effect flags from Research wiki page
|
2012-10-01 23:33:07 +02:00 |
|
scrawl
|
ff2c2d2b96
|
Merge branch 'master' into spellcreation
Conflicts:
apps/openmw/mwbase/windowmanager.hpp
|
2012-10-01 17:54:45 +02:00 |
|
scrawl
|
b63d205c6e
|
change the select attribute/skill dialogs to be reusable
|
2012-09-24 22:09:38 +02:00 |
|
scrawl
|
d393f551ed
|
edit effect dialog
|
2012-09-24 08:09:16 +02:00 |
|
scrawl
|
9d7c35ae48
|
and go
|
2012-09-23 00:36:20 +02:00 |
|