mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 17:19:56 +00:00
Code Issues Releases Wiki Activity
6184 commits 38 branches 54 tags 122 MiB
Commit graph

218 commits

Author SHA1 Message Date
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
greye
7606ebafd6 resolving conflicts, minor update 2012-09-17 11:37:50 +04: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
Marc Zinnschlag
f2a47d421b some cleanup 2012-03-19 19:21:08 +01:00
Michael Papageorgiou
82c4bfbf18 Add a notification when the journal is updated 2012-03-19 20:18:08 +02:00
gugus
d4f3430fc6 fix: topics who should not be displayed are not displayed anymore. 2012-03-19 19:17:20 +01:00
gugus
2707391535 fix for questions 2012-03-19 18:30:52 +01:00
gugus
ba4d44eb67 fix for questions. 2012-03-19 18:01:41 +01:00
gugus
1a832a65f6 Changed a lot of things. Topics can now change durring dialogue without bug. 
Missing: ability to remove keyword
 2012-03-19 00:19:58 +01:00
gugus
ff5d4b24fc journal filter works now 2012-03-18 21:47:43 +01:00
gugus
9c85a8c1ce Merge branch 'dialogue' of https://github.com/zinnschlag/openmw.git into DialogueSystem 2012-03-18 19:06:52 +01:00
Marc Zinnschlag
ce2cb709c5 fixed getJournalIndex function 2012-03-18 19:05:35 +01:00
gugus
00d3bc9d23 every filters are check during dialogue now. There is a problem with journal. 2012-03-18 18:58:22 +01:00
gugus
7f2ff6f5f1 removed the TODO 2012-03-18 18:05:28 +01:00
gugus
4afe6dd235 death filter 2012-03-18 18:04:51 +01:00
gugus
48e6a42168 Merge branch 'dialogue' of https://github.com/zinnschlag/openmw.git into DialogueSystem 
Conflicts:
	apps/openmw/mwdialogue/dialoguemanager.cpp
 2012-03-18 17:59:11 +01:00
gugus
34b33b78d2 better filters 2012-03-18 17:58:14 +01:00
Marc Zinnschlag
76b24d9d1a fixed a compile error 2012-03-18 17:30:05 +01:00
gugus
8740354c80 inventory filter now use player inventory 2012-03-18 17:03:54 +01:00
gugus
019a28093b better filters 2012-03-18 15:26:18 +01:00
Marc Zinnschlag
d9677cb33e fixed problem with parsing optional string arguments 2012-03-18 14:27:49 +01:00
gugus
100c6a42a5 better default values for filters 2012-03-18 11:32:05 +01:00
scrawl
9d4f79bcfc GCC compile fix 2012-03-17 15:24:47 +01:00
gugus
042d87f77f a lot of clean up 2012-03-16 17:53:34 +01:00
gugus
91801e5cab stop spamming messages 2012-03-16 17:39:14 +01:00
gugus
56a84b6a1a choices works. The only thing remaining is the script arguments problems. 
Need a lot of clean up too.
 2012-03-16 17:30:59 +01:00
gugus
07d8d654cd one step toward function filters and end choices. 2012-03-14 18:47:29 +01:00
gugus
6f7752633a there was no extension in the compiler context. Corrected. But Choice doesn't work. 2012-03-07 18:44:09 +01:00
Marc Zinnschlag
69f0ec99f1 implemented dialogue scripts 2012-03-05 16:56:14 +01:00
Marc Zinnschlag
65756db49e Merge remote branch 'gus/DialogueSystem' into dialogue 2012-03-05 11:34:16 +01:00
gugus
9716199d18 script "fix". I'm waiting for you Zini^^ 2012-02-18 12:19:42 +01:00
gugus
c0bd86ce44 scripts. Not tested 2012-02-17 20:20:23 +01:00
gugus
232e478768 Fix for prefix/suffix stuff 2012-02-15 13:23:59 +01:00
Marc Zinnschlag
d66b6743f4 minor fix 2012-02-12 13:58:02 +01:00
gugus
4d4ae41a4a greetings are working now 2012-02-11 12:19:02 +01:00
gugus
eee5d20809 a little fix 2012-02-10 22:54:17 +01:00
gugus
554bf8e586 Improvement in the dialogue manager 2012-02-10 22:01:31 +01:00
gugus
ea8335a393 addTopic function 2012-02-10 16:09:43 +01:00
gugus
e7ef39cabc more improvements to dialogue filters. Some of them are still missing. 2012-02-09 19:27:15 +01:00
gugus
c65c160e7b finished connecting the dialogue GUI and the dialogue manager 2012-02-05 12:25:23 +01:00
gugus
abe38e5f87 Started to weire the dialogue manager and the dialogue GUI 2012-02-05 10:54:56 +01:00
Marc Zinnschlag
33f8049a36 accessing topic index didn't work 2011-12-29 17:32:57 +01:00
Marc Zinnschlag
e18dde4571 added topic tracking 2011-04-26 20:48:36 +02:00
Marc Zinnschlag
7a1b215b6a splitting of topic class from quest class 2011-04-26 20:39:59 +02:00
Marc Zinnschlag
3406d2fa89 removed redundant data from quest class 2011-04-26 20:22:50 +02:00
Marc Zinnschlag
944291d34f added quest tracking to the journal 2011-04-26 20:08:37 +02:00
Marc Zinnschlag
65e43c448a splitted StampedJournalEntry class off from JournalEntry 2011-04-22 11:16:39 +02:00
Marc Zinnschlag
f3fecdc627 quest entries are added to main journal now 2011-04-21 11:05:49 +02:00
Marc Zinnschlag
23464e4035 added interface and container for main journal 2011-04-19 11:02:22 +02:00
Marc Zinnschlag
5851e0a28c added journal entry struct 2011-04-19 10:54:11 +02:00
Marc Zinnschlag
b40117449a added journal script interface 2011-04-04 11:23:15 +02:00
Marc Zinnschlag
190f77f6c9 added journal class 2011-04-04 11:16:56 +02:00
Marc Zinnschlag
4a12be11bf moved PlayerPos class from MWRender to MWWorld and renamed it to Player 2011-01-04 15:58:22 +01:00
Jan-Peter Nilsson
54319b0117 Use the input manager to enable the dialog 2010-11-06 01:09:05 +01:00
Marc Zinnschlag
6e46ddae33 more detailed report of unhandled info record fields 2010-08-19 13:06:15 +02:00
Marc Zinnschlag
4f3f174016 fixed a dialogue bug 2010-08-18 11:06:41 +02:00
Marc Zinnschlag
e42f1bbc11 open dialogue window, if a matching greetings info record is found 2010-08-18 09:19:16 +02:00
Marc Zinnschlag
19c5ace602 added test for actor faction 2010-08-08 15:17:49 +02:00
Marc Zinnschlag
594d3cef4f added test for actor class 2010-08-08 15:12:53 +02:00
Marc Zinnschlag
11bc131417 added test for global variables 2010-08-08 15:09:44 +02:00
Marc Zinnschlag
fbe11956a6 added dummy test for select type '1' (Function); always yields false for now 2010-08-08 14:43:20 +02:00
Marc Zinnschlag
c7fab9aad6 added test for actor race 2010-08-08 14:36:45 +02:00
Marc Zinnschlag
2acfe22975 added test for actor ID 2010-08-08 14:28:35 +02:00
Marc Zinnschlag
8f4359db08 added test for select type '3' (Local) 2010-08-08 13:21:03 +02:00
Marc Zinnschlag
a25c7bb2c0 added test for cell name 2010-08-08 11:37:59 +02:00
Marc Zinnschlag
9d25e74a05 on dialogue start run through the info records of dialogue record 'hello'; currently no testing done -> the first info recrod will match 2010-08-08 11:34:03 +02:00
Marc Zinnschlag
c806415f08 changed namespace, class and function names to ensure consistent spelling 2010-08-06 19:16:44 +02:00
Marc Zinnschlag
d6541d4f3c changed file names to ensure consistent spelling 2010-08-06 19:10:56 +02:00