scrawl
9f2668b45b
Task #400 Review GMST access
2012-09-22 21:35:57 +02:00
Adam Hogan
ebf80943a9
Added spell buying window
2012-09-08 18:17:03 -04:00
greye
a90547bbbe
code formatting
2012-08-29 21:35:06 +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
484cce12a8
Issue #107 : removed redundant getStore function from window manager
2012-08-12 14:36:46 +02:00
Marc Zinnschlag
0231533d05
Issue #107 : InputManager is accessed only through the interface class from now on
2012-08-11 17:53:39 +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
Marc Zinnschlag
b53b27533a
fixes some include guards
2012-08-11 12:02:51 +02:00
Marc Zinnschlag
d00d40cc3f
Issue #107 : Journal is accessed only through the interface class from now on
2012-08-09 12:56:03 +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
e6ede480c7
Issue #107 : fixed up some interfaces
2012-08-09 09:41:17 +02:00
Marc Zinnschlag
28ecfb4290
Issue #107 : ScriptManager is accessed only through the interface class from now on
2012-08-08 15:18:55 +02:00
Marc Zinnschlag
2c70a93553
Merge branch 'master' into potions
...
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
2012-07-17 10:32:18 +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
Marc Zinnschlag
6277e39216
Merge branch 'master' into skillgain
2012-07-07 20:27:56 +02:00
Alexander "Ace" Olofsson
113457d934
Fixed some windows issues and got rid of a few tiny warnings while at it.
2012-07-07 01:14:18 +02:00
Marc Zinnschlag
d30ba14a17
Issue #324 : Finished turning NpcStats into a proper class
2012-07-06 18:23:48 +02:00
Marc Zinnschlag
4c39fefd1e
Issue #107 : World is accessed only through the interface class from now on; some include cleanup
2012-07-03 12:30:50 +02:00
Marc Zinnschlag
7fcd41c69d
Issue #107 : Detemplateised CellStore; some include cleanup
2012-06-29 18:54:23 +02:00
Marc Zinnschlag
76174098c7
Issue #107 : CellStore moved from ESMS to MWWorld
2012-06-29 16:48:50 +02:00
scrawl
15e959868c
make some of the gui mode changes a bit safer
2012-06-19 17:07:00 +02:00
scrawl
c85c794c86
fixed some cppcheck issues
2012-06-06 20:29:30 +02:00
scrawl
7ebbc099b3
allow stacking gui modes
2012-05-23 12:23:35 +02:00
Marc Zinnschlag
3e85151c9d
Merge remote branch 'scrawl/inventoryGUI'
...
Conflicts:
apps/openmw/CMakeLists.txt
2012-05-21 10:13:27 +02:00
scrawl
76d71f86bc
fixed a faction case folding issue
2012-05-21 03:10:55 +02:00
scrawl
ee884634b9
fixed item refID handling in the dialogue manager and container script extensions.
2012-05-19 13:19:26 +02:00
scrawl
5da4da820e
beginnings of trade window layout.
2012-05-17 17:15:44 +02:00
scrawl
0dc5e5919b
show the Barter entry in the dialogue gui for npcs/creatures that buy/sell stuff. doesn't work for the Creeper for some reason, but Mudcrab Merchant works.
2012-05-17 14:54:03 +02:00
scrawl
c4aae96d94
implemented "goodbye" script function that force-cancels dialogue
2012-05-11 07:18:41 +02:00
scrawl
ad5753ba91
Merge branch 'master' of https://github.com/zinnschlag/openmw into gui
2012-05-04 07:34:38 +02:00
scrawl
dc378fc6cf
allow talking with creatures
2012-05-03 06:07:41 +02:00
scrawl
e4b057be30
translated journal notification
2012-05-01 21:49:00 +02:00
scrawl
eca18f3e1d
dialogue topic and choice sorting independent of case
2012-04-29 18:13:03 +02:00
Marc Zinnschlag
7ac9523e0c
Merge branch 'master' into next
2012-04-23 15:32:02 +02:00
Marc Zinnschlag
35f478071e
Issue #255 : deleted the old environment class and using the new one instead
2012-04-23 15:27:03 +02:00
Marc Zinnschlag
cc86998281
removing some cout spam
2012-04-21 10:12:59 +02:00
scrawl
8231cab599
correct case for dialogue topics
2012-04-17 23:47:50 +02:00
gugus
7edc5c733c
corrected a bug about rank.
2012-04-12 17:29:05 +02:00
gugus
0553227ee1
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into Factions2
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwworld/player.cpp
apps/openmw/mwworld/player.hpp
2012-04-09 14:43:35 +02:00
gugus
45d11eaf14
fixed a bug in the dialogue manager.
2012-04-09 14:23:12 +02:00
gugus
e5b1e27fa6
pcRaiseRank works. Player can now join factions.
2012-04-09 13:24:19 +02:00
gugus
2c7c945208
check playerfaction during dialogue
2012-04-04 22:13:57 +02:00
Marc Zinnschlag
e403c7158a
Merge remote branch 'gus/DialogueSystem'
2012-04-03 18:27:36 +02:00
gugus
a268b89239
changed the way NPC faction is checked. Should be the same way for the player.
2012-04-03 17:31:41 +02:00
gugus
319022d962
speed up dialogue start-up.
2012-03-23 15:24:39 +01:00
Marc Zinnschlag
1023ddd587
silenced some warnings
2012-03-20 10:30:21 +01:00
Marc Zinnschlag
6a0474a977
removed some cout spam
2012-03-20 10:15:22 +01:00
Marc Zinnschlag
aca274cbca
Merge remote branch 'gus/DialogueSystem'
2012-03-20 10:11:40 +01:00
gugus
7a1ff61541
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem
2012-03-19 21:31:36 +01:00
Marc Zinnschlag
b46a2bfa01
Merge remote branch 'werdanith/journalmessage'
2012-03-19 19:34:28 +01:00