krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
7396 commits 35 branches 0 tags 65 MiB
Commit graph

383 commits

Author SHA1 Message Date
Glorf
ad49d1ecab Sixth minor fix 2013-04-10 15:24:20 +02:00
Glorf
46925e93a6 Second minor fix 2013-04-09 16:14:08 +02:00
Glorf
7c22e123f4 Bugfix #691 changes 2013-04-08 22:10:55 +02:00
Glorf
50932a7a6b Finished bugfix #691 2013-04-08 17:50:03 +02:00
scrawl
f3c8cd2065 Don't buy/sell keys which are set to open a lock 2013-04-07 21:38:53 +02:00
Glorf
48d9885554 Started bugfix #691 2013-04-05 15:42:05 +02:00
scrawl
ebaf80d539 Trace actors onto the ground after load, when moved to a different cell by the console or on player cell change. 2013-04-03 23:55:57 +02:00
scrawl
43cdbd033d Display remaining item health / enchantment charge in HUD icons, display remaining enchanment charge in tooltips 2013-04-03 21:17:31 +02:00
Marc Zinnschlag
751c679255 Merge remote-tracking branch 'glorf/enchanting' 2013-04-01 17:35:04 +02:00
Glorf
d29a42dcbe Fixed enchanting mechanics 2013-03-31 23:18:23 +02:00
scrawl
1a2daa3bc1 Merge branch 'master' of git://github.com/zinnschlag/openmw into companion 2013-03-31 14:50:03 +02:00
Chris Robinson
7611caa6eb Merge remote-tracking branch 'zini/master' into rotation 2013-03-31 03:00:11 -07:00
scrawl
69099c11a2 Merge branch 'enchanting' into companion 2013-03-31 11:52:55 +02:00
Chris Robinson
b6f2b39a2f Clear the movement and rotation vector when getting them 2013-03-31 01:56:38 -07:00
Chris Robinson
7b02ec411b Apply the rotation when updating the character controller 2013-03-31 01:29:24 -07:00
Chris Robinson
0ce188b7cc Store the position and rotation in MWMechanics::Movement 2013-03-30 19:00:46 -07:00
scrawl
0f0cc0e3e3 Fix a few gold conditions that I missed, trade window was affected 2013-03-30 18:29:21 +01:00
scrawl
0079f62180 Gold condition now always checks RefID instead of the name. This is necessary because in the french MW version, the sGold GMST is different from the name of the gold references. 2013-03-30 16:27:06 +01:00
scrawl
51204f098e Added soulgem dialog; made interactive message boxes not close the previous UI 2013-03-30 15:51:07 +01:00
scrawl
e7af718b55 Remove unnecessary WindowManager::messageBox arguments 2013-03-30 12:56:37 +01:00
Marc Zinnschlag
573368849b Merge remote-tracking branch 'glorf/enchanting' 
Conflicts:
	apps/openmw/CMakeLists.txt
 2013-03-29 16:48:21 +01:00
Glorf
86275e5bd4 Some enchanting fixes 2013-03-29 12:00:09 +01:00
Glorf
eb88463b94 Some enchanting fixes 2013-03-28 23:39:20 +01:00
Glorf
6643fe789c Enchanting system 2013-03-28 17:41:00 +01:00
scrawl
406488d086 Soulgem value should be multiplied by the trapped soul 2013-03-27 17:39:49 +01:00
scrawl
6f1575d42a CELL record corrections 2013-03-27 17:27:43 +01:00
scrawl
a2ca679beb Added PC repair feature 2013-03-23 08:16:46 +01:00
scrawl
78f3f19f62 Thrown weapons, arrows and bolts shouldn't have item health 2013-03-22 14:28:50 +01:00
scrawl
8e2f9f5186 Fix CellRef to load current weapon/armor health correctly, also show it in the tooltips 2013-03-22 12:24:09 +01:00
scrawl
918cdcffc2 Split up components/esm/loadlocks 2013-03-22 05:50:54 +01:00
scrawl
95e1cdc07d Move getArmorRating to MWWorld::Class. 2013-03-17 22:29:12 +01:00
scrawl
dd57eabc3e Better use an enum for magic effect IDs 2013-03-16 23:28:26 +01:00
scrawl
c0b0227e8a enchanting 2013-03-16 19:00:14 +01:00
scrawl
485b6c855a Fix NPC race height not being applied 2013-03-15 16:44:35 +01:00
scrawl
b36295cbb3 Removed a leftover 2013-03-14 21:10:22 +01:00
scrawl
5b943a965f Handle always run in the inputmanager, instead of using forced stance. 2013-03-14 21:08:19 +01:00
scrawl
2d8f0949a4 Always run key (Y) 2013-03-14 20:27:16 +01:00
scrawl
84afd87321 Placeable objects should not collide unless they have a NiRootCollisionNode 2013-03-14 03:04:02 +01:00
scrawl
41a958cd4e Fix hardcoded beast races in MWClass::Npc::getModel 2013-03-12 02:50:23 +01:00
scrawl
0ee0dbdb97 Added "dispose corpse" button, added stealing (all items visible and no penalty yet) 2013-03-07 14:00:13 +01:00
scrawl
268bb23590 Implemented sneaking animation 2013-03-06 16:58:56 +01:00
scrawl
e1957e4ee9 Potion effects should be hidden until discovered 2013-03-02 13:34:26 +01:00
Chris Robinson
955e2713a9 Fix encumbrance term calculation 2013-02-25 17:29:32 -08:00
Chris Robinson
74b8095fc7 Use default parameters where appropriate 2013-02-24 14:43:20 -08:00
ChrisKCat
9e7b559b09 Merge pull request #6 from scrawl/lights 
For light objects without an AttachLight bone, attach the light to the c...
 2013-02-24 14:12:53 -08:00
scrawl
1ae2d3c6ab For light objects without an AttachLight bone, attach the light to the center of the object instead of the origin. 2013-02-24 19:00:06 +01:00
Chris Robinson
89d4c245e9 Better calculate jump velocity 
The fatigue term isn't currently used correctly
 2013-02-24 03:30:33 -08:00
scrawl
7e816c826b Fix lights without a mesh 2013-02-23 09:17:12 +01:00
scrawl
f17ea109ca Fix light positions 2013-02-23 04:06:05 +01:00
Chris Robinson
84227caa0c Cleanup Npc::getSpeed a little 2013-02-22 01:30:06 -08:00
Chris Robinson
8255a64bfe Handle levitate and swift swim effects 2013-02-19 02:10:36 -08:00
Chris Robinson
5a1a0b7338 Add and use an MWWorld::isFlying method 2013-02-18 22:39:43 -08:00
Chris Robinson
bea460955d Merge remote-tracking branch 'zini/next' into animation2 2013-02-17 16:03:39 -08:00
scrawl
00db13be32 Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed. 2013-02-17 15:56:22 +01:00
Chris Robinson
e2d7cc49e3 Merge remote-tracking branch 'zini/next' into animation2 2013-02-17 03:42:37 -08:00
scrawl
4da11a96a5 Fixed gold ref count always becoming 1 when dropped on the ground 2013-02-15 17:34:55 +01:00
Chris Robinson
e1a1530774 Better implement Npc::getSpeed 2013-02-15 01:27:57 -08:00
Chris Robinson
04524fbf92 Don't scale the movement vector up 2013-02-06 15:23:52 -08:00
Chris Robinson
8d98f3649c Use a separate class to handle activator mechanics 2013-01-28 23:39:11 -08:00
Chris Robinson
0cd3880b20 Merge remote-tracking branch 'zini/master' into animation2 2013-01-26 04:54:52 -08:00
Emanuel Guevel
05796d85a4 NPC: take stats from NPDT12 into account 
Some available stats (level, reputation and disposition) were not used
for NPC with auto-calculated stats.
 2013-01-20 17:44:08 +01:00
Chris Robinson
94b93227d3 Treat activators as actors for rendering and mechanics 
Kinda hacky, but it's the only way to get animated activators (flags, silt
striders, etc) to work properly.
 2013-01-16 14:37:32 -08:00
Chris Robinson
94e30199d1 Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
 2013-01-15 14:59:30 -08:00
scrawl
c71656493d Ingredient effects now correctly hide until the player has discovered them 2013-01-11 01:23:24 +01:00
Chris Robinson
23ac1c2de5 Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
 2013-01-09 20:52:12 -08:00
eduard
2dc0064cc2 more string lowercase 2013-01-09 20:51:52 +01:00
Chris Robinson
efca5ded47 Clean up some header includes to reduce nesting 2013-01-05 21:12:08 -08:00
lazydev
74ae479780 Cell names localization fix 2012-12-23 23:23:24 +04:00
Marc Zinnschlag
5d45bcd03a Merge remote-tracking branch 'trombonecot/master' 
Conflicts:
	apps/openmw/mwclass/light.cpp
 2012-11-19 21:21:00 +01:00
eduard
4e4d15f8ac Failed action 2012-11-19 21:04:49 +01:00
eduard
82ea547ce4 Failed action 2012-11-17 18:17:08 +01:00
Marc Zinnschlag
75f64aa38b Merge branch 'master' into dialogue 
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.hpp
	apps/openmw/mwmechanics/npcstats.cpp
	apps/openmw/mwmechanics/npcstats.hpp
 2012-11-10 15:44:44 +01:00
Marc Zinnschlag
ceaf1677ce Issue #219: rewrote AI settings and implemented AI settings filters 2012-11-10 11:38:37 +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
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
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
greye
620184a009 fix typos 2012-11-06 14:44:56 +04:00
emoose
7a7825577a Changed: use MWWorld::Ptr for PhysicsSystem arguments 2012-11-05 19:37:27 +00:00
greye
bd1bb2e55d applying new interface vol.1, inconsistent 2012-11-05 18:39:42 +04:00
greye
d205723a17 resolving m prefix/ESMStore movement 2012-11-05 18:02:47 +04:00
greye
2057f5619e move ESMStore to MWWorld 2012-11-05 17:18:01 +04:00
greye
3c2ce25f5f m prefix for mwworld/cellstore.hpp 2012-11-05 16:07:59 +04:00
gugus
f72f898bd9 implement barterOffer. It's used for travel only. 
I've started to implement disposition, but it's very basic for now.
 2012-11-05 11:07:43 +01:00
emoose
1c8e941f0d fix kdevelop indentation again... 2012-11-02 21:21:32 +00:00
emoose
96b56d9803 fixes: containers: key id case comparison 2012-11-02 21:18:37 +00:00
emoose
4a9821dc65 fix kdevelop indentation... 2012-11-02 20:43:07 +00:00
emoose
15f972cc62 fixes: compile: cast error; doors: key id case comparison; character creation: going from CharacterCreation to BirthDialog loses data; character creation: Class/Race/BirthDialog allowing no data; code: clean up a bit 
todo: going from CharacterCreation back to CreateClassDialog loses data
 2012-11-02 20:33:08 +00:00
scrawl
a04df37f83 implemented looting corpses 2012-10-28 16:04:33 +01:00
Marc Zinnschlag
ed3641b214 Issue #68: check for essential actors 2012-10-27 13:33:54 +02:00
Marc Zinnschlag
9172c3ec4d Issue #68: stop NPCs from instantly dropping dead 2012-10-23 13:54:36 +02:00
Marc Zinnschlag
bdca5aff87 Issue #68: simplified the dynamic stats interface 2012-10-19 13:10:06 +02:00
greye
2fa4ac177a initial resolving 2012-10-01 00:23:49 +04:00
greye
721324c1db rm record inheritance, rework esmtool accordingly 2012-09-30 23:34:53 +04:00
scrawl
1cb1259e18 fixing some unrelated warnings 2012-09-23 19:36:37 +02:00
scrawl
9f2668b45b Task #400 Review GMST access 2012-09-22 21:35:57 +02:00
greye
18cc435aa1 resolving conflicts 2012-09-21 13:13:11 +04:00
Marc Zinnschlag
4abb9a00da Merge remote-tracking branch 'jhooks/physicsaedra3' into next 2012-09-18 11:25:09 +02:00
greye
7606ebafd6 resolving conflicts, minor update 2012-09-17 11:37:50 +04:00
Marc Zinnschlag
835c530e06 Merge branch 'ingredients' 2012-09-13 13:31:46 +02:00