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

4705 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marc Zinnschlag
e97f3003ab Issue #219: added expelled status tracking; implemented expelled filter 2012-11-10 12:28:40 +01:00
Marc Zinnschlag
bd2c772dae Issue #219: implemented player skill and attribute filter 2012-11-10 12:08:04 +01:00
Marc Zinnschlag
d6961c0246 Issue #219: made all unimplemented filters return false 2012-11-10 11:42:03 +01:00
Marc Zinnschlag
ceaf1677ce Issue #219: rewrote AI settings and implemented AI settings filters 2012-11-10 11:38:37 +01:00
Marc Zinnschlag
eb4e72aaa7 Issue #219: implemented disease filters 2012-11-10 11:08:36 +01:00
Marc Zinnschlag
c425b3f4a3 Issue #219: fixed function decoding and moved choice function from DialogueManager to Filter 2012-11-10 09:48:20 +01:00
Marc Zinnschlag
a752536cea Issue #219: added function decoding and moved same faction function from DialogueManager to Filter 2012-11-10 09:35:50 +01:00
greye
235b565bb7 update main character model 2012-11-10 11:51:48 +04:00
greye
b1ef0026a9 race selection/inventory preview character model update 2012-11-10 11:41:12 +04:00
scrawl
92bba18218 removed useless member 2012-11-10 00:47:24 +01:00
scrawl
553ea08eae consider temporary disposition change when trading 2012-11-10 00:42:31 +01:00
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
f6a9029c4b bounty & disease disposition effect 2012-11-09 18:33:11 +01:00
Marc Zinnschlag
4994a253da Merge branch 'bountydisease' into dialogue 2012-11-09 18:17:14 +01:00
Marc Zinnschlag
be1334b202 disease tests 2012-11-09 18:16:29 +01:00
Marc Zinnschlag
0727d943b1 Merge branch 'next' into bountydisease 
Conflicts:
	apps/openmw/mwmechanics/npcstats.cpp
 2012-11-09 18:04:44 +01:00
scrawl
d53a7ade1e method names, disposition uint->int 2012-11-09 14:42:09 +01:00
Marc Zinnschlag
39ff2f06ce added bounty to NpcStats 2012-11-09 14:31:38 +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
322faf13e4 cleanup 2012-11-08 22:37:59 +01:00
scrawl
bf4e855260 fixed creatures 2012-11-08 22:31:08 +01:00
Marc Zinnschlag
e6021a3fe3 Issue #219: moved checks for local and global variables from DialogueManager to Filter 2012-11-08 22:11:50 +01:00
gugus
4634227f1c notify the user when the merchant doesn't accept the offer 2012-11-08 21:50:56 +01:00
Marc Zinnschlag
e68bb3481e Issue #219: moved over the second batch of functions (boolean and one integer I forgot last time) 2012-11-08 21:48:17 +01:00
Marc Zinnschlag
91afef140b Issue #219: moved first batch of integer type functions from DialogueManager to Filter 2012-11-08 21:16:49 +01:00
greye
c3f0dc0dfb m prefix for NpcAnimation members 2012-11-08 23:11:43 +04:00
Marc Zinnschlag
90e679746b Merge remote-tracking branch 'scrawl/consolefix' into next 2012-11-08 19:37:37 +01:00
scrawl
3d7146cd50 don't allow opening a window multiple times, primarily the console 2012-11-08 19:34:54 +01:00
scrawl
867fb620c3 part 2 2012-11-08 19:25:06 +01:00
scrawl
00a2de432a fix BulletShapeLoader namespace 2012-11-08 18:48:07 +01:00
Marc Zinnschlag
2be60041f3 Merge remote-tracking branch 'greye/player-dynamics' into next 2012-11-08 18:32:25 +01:00
Marc Zinnschlag
e912b5bed2 Merge remote-tracking branch 'greye/next' into dialogue 2012-11-08 18:19:52 +01:00
greye
af5fb7916f fix searching in store 2012-11-08 21:07:14 +04:00
Marc Zinnschlag
235397dde8 Issue #219: added missing implemented for isInverted function 2012-11-08 17:29:10 +01:00
Marc Zinnschlag
f5972a3080 Issue #219: Support for boolean select structs 2012-11-08 17:04:44 +01:00
Marc Zinnschlag
b412ebd0af Issue #219: Supoort for inverted select structs 2012-11-08 17:01:26 +01:00
Marc Zinnschlag
4614d2bc8e Issue #219: added basic select struct analysis and type checking 2012-11-08 16:49:38 +01:00
greye
b5a59c3a07 minor doxygen comments update 2012-11-08 19:01:42 +04:00
greye
2a86432887 store birthsign in MWWorld::Player 2012-11-08 18:50:23 +04:00
Marc Zinnschlag
662054acf4 Issue #219: moved checks for various dialogue info fields from DialogueManager to Filter 2012-11-08 14:55:31 +01:00
Marc Zinnschlag
1502b3f6f8 Issue #219: Begin of refactoring; added filter class (doesn't do anything yet) 2012-11-08 14:09:40 +01:00
Marc Zinnschlag
6c6c0dd1e3 Merge branch 'next' into dialogue 2012-11-08 13:45:20 +01: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
scrawl
fba32e406c changed OIS includes since OIS_INCLUDE_DIR is already an include directory 2012-11-08 10:13:53 +01:00
greye
2a06d72e32 remove unused custom character classes 2012-11-08 02:27:01 +04:00
greye
9dc9098fa7 update MWBase::World interface since records contains own id 2012-11-08 01:52:34 +04:00