scrawl
b0199c703c
Companion UI
2013-03-31 13:13:46 +02:00
Marc Zinnschlag
573368849b
Merge remote-tracking branch 'glorf/enchanting'
...
Conflicts:
apps/openmw/CMakeLists.txt
2013-03-29 16:48:21 +01:00
scrawl
6a2b87e14a
Fix dialogue response coloring for creatures
2013-03-25 17:37:59 +01:00
scrawl
4be0c6b708
Fix topics not being selectable for creatures
2013-03-25 17:32:01 +01:00
scrawl
20774f8f81
Added merchant repair feature
2013-03-22 14:13:10 +01:00
scrawl
b9c3a4816d
Fix dialogue topics still being accessible in the history pane when they shouldn't be
2013-03-20 03:30:15 +01:00
scrawl
cebcbe11f8
Implemented service refusal
2013-03-16 20:32:21 +01:00
scrawl
c0b0227e8a
enchanting
2013-03-16 19:00:14 +01:00
scrawl
a51b73b609
Fix topics that have the same name as a service opening that service when clicked
2013-03-09 21:50:01 +01:00
scrawl
9a84f6744f
Fix headers including whole MyGUI.h, forward declare where appropriate, and fix some deprecated types (WidgetPtr)
2013-03-03 13:11:02 +01:00
Emanuel Guevel
82287445af
DialogueWindow: do not execute onFrame() when not visible
2013-01-15 00:59:48 +01:00
eduard
2dc0064cc2
more string lowercase
2013-01-09 20:51:52 +01:00
lazydev
7cd1e87fe8
Merge branch 'master' of git://github.com/zinnschlag/openmw
...
Conflicts:
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
2013-01-01 22:18:21 +04:00
lazydev
cd5d95ed22
1. Dialogs in Russian version now works.
...
2. Destination names it travel window are now translated
2012-12-31 04:15:47 +04:00
Tom Mason
ad9b86058b
replaced explicit text with GMST entries, thanks to zinnschlag
2012-12-27 15:28:13 +00:00
Tom Mason
716fbbbd74
messageboxes during dialogue show up in dialogue window, and messageboxes are generated when an item is removed from inventory
2012-12-26 22:57:53 +00:00
scrawl
8e857587d7
fix a text coloring bug
2012-11-28 02:36:33 +01:00
scrawl
f218ef2675
fix separator
2012-11-23 19:21:13 +01:00
scrawl
1d7e92b6b3
dialogue fixes
2012-11-23 19:05:40 +01:00
scrawl
92bba18218
removed useless member
2012-11-10 00:47:24 +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
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
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
gugus
2841d831a6
Disposition is now updated everyframe
2012-11-05 23:16:37 +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
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
2057f5619e
move ESMStore to MWWorld
2012-11-05 17:18:01 +04:00
Marc Zinnschlag
6f7a621b6f
disabled enchanting unfinished enchantment GUI for now
2012-11-04 23:15:20 +01:00
scrawl
125315ebe7
remove a cout
2012-10-17 18:21:24 +02:00
scrawl
c64eb96952
Merge branch 'Travel_Dialogue' into training_travel
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwgui/dialogue.cpp
apps/openmw/mwrender/globalmap.cpp
files/mygui/CMakeLists.txt
2012-10-17 18:17:53 +02:00
scrawl
1a2034b4dd
training window
2012-10-17 18:03:02 +02:00
gugus
4f5c4bf89a
Merge branch 'spellcreation' of git@github.com:scrawl/openmw.git into Travel_Dialogue
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
apps/openmw/mwgui/dialogue.cpp
apps/openmw/mwgui/dialogue.hpp
apps/openmw/mwgui/mode.hpp
apps/openmw/mwgui/windowmanagerimp.cpp
2012-09-28 17:09:15 +02:00
scrawl
ac0c1ea986
Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation
...
Conflicts:
apps/openmw/mwgui/dialogue.cpp
2012-09-27 08:47:47 +02:00
gugus
3060fbee60
TravelGUI, not completly finished.
2012-09-26 18:30:47 +02:00
scrawl
9d7c35ae48
and go
2012-09-23 00:36:20 +02:00
scrawl
9f2668b45b
Task #400 Review GMST access
2012-09-22 21:35:57 +02:00
Marc Zinnschlag
273ac0a97f
Merge branch 'spellbuying'
2012-09-10 13:16:02 +02:00
scrawl
35dd49f948
fixed some "using namespace" in headers
2012-09-10 09:10:50 +02:00
Adam Hogan
08410b9062
Renamed SpellBuyingWindow, took some suggestions from scrawl
2012-09-09 14:10:07 -04:00
Adam Hogan
ebf80943a9
Added spell buying window
2012-09-08 18:17:03 -04: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
923109b260
Issue #107 : DialogueManager is accessed only through the interface class from now on
2012-08-09 10:35:53 +02:00
Marc Zinnschlag
0d3a7d482e
Merge remote branch 'modred11/master'
2012-07-17 10:21:46 +02:00
guidoj
0549e949ba
Mostly removal of unnecessary #include's and a little clean up
2012-07-17 09:27:12 +02:00
Carl Maxwell
e4d046f69c
Prepending m to the name of every member variable.
...
I made a bunch of changes in apps/openmw/mwrender/animation.cpp
because the scope brackets didn't line up in a bunch of places
npcanimations.cpp & creatureanimations.cpp were the same kind of
thing
2012-07-13 03:51:58 -07:00
scrawl
d27863bf8e
rename layout files to .layout to get them recognized by layout editor
2012-07-03 11:34:20 +02:00
