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

529 commits

Author SHA1 Message Date
scrawl
b6c22ad5d9 Add starting gold for NPCs and creatures. Refactor gold removal in some gui windows (use containerstore method instead of a dependency on TradeWindow). Use real gold amount in trade window, not refill amount. 2013-11-21 17:19:30 +01:00
scrawl
6641fd4635 Fix bug when enchanting: only the mBase pointer was updated, not the CellRef mRefID, which is used for container stacking. The new (enchanted) item was stacking with the old item when it was added, so the enchantment completely disappears. 2013-11-21 17:14:30 +01:00
scrawl
74e42a2d02 Add missing skill increases for Enchant skill 2013-11-19 07:39:07 +01:00
scrawl
0dc2e829dd Lots of cleanup. Implemented Absorb and Resist. Implemented several instant effects. Added hand VFX. 2013-11-17 23:31:08 +01:00
scrawl
b1a29eb27e Implement Resist & Weakness effects 2013-11-16 02:34:43 +01:00
scrawl
992a8e9c36 Refactor NpcAnimation: get rid of delayed update (no longer required), make sure that the Animation is set up *before* the inventory store is accessed anywhere (which now triggers auto equip and animation update). Allows better tracking of magic VFX for permanent enchantments in InventoryStore. 2013-11-14 14:41:10 +01:00
scrawl
9b0e82a37f Projectile models are now spawned (no movement or impact yet). Refactored trap activation to apply range types properly. Handle ContinuousVFX for magic effects (note they aren't stopped yet when the effect ends) 2013-11-13 14:02:15 +01:00
scrawl
60bec03987 Rename variables called 'slots' to work around wrong code parsing in QT Creator. 2013-11-12 23:23:19 +01:00
scrawl
0dab7031c0 Make sure effects are destroyed with the animation 2013-11-12 02:22:44 +01:00
scrawl
eccb8f38ba Apply "cast when strikes" enchantments when hitting with a weapon 2013-11-12 02:07:51 +01:00
Emanuel Guevel
aefa54d72d Pass item count to ManualRef constructor 
This remove the need to call setCount in multiple places.
 2013-11-10 02:45:16 +01:00
Emanuel Guevel
10abb9d297 Call ContainerStore::remove() to remove items from inventory 
Make placeObject() and dropObjectOnGround() in MWWorld to copy objects
(and indicate it clearly).

Enchanting an item now unequips it.
 2013-11-10 02:45:16 +01:00
Marc Zinnschlag
8c139783b7 silenced a warning 2013-10-16 21:33:11 +02:00
Marc Zinnschlag
19bd0f90b9 Merge remote-tracking branch 'rainChu/torches' 2013-10-16 21:24:45 +02:00
Alex "rainChu" Haddad
e11da5c0a3 Added a constructor to Light CustomData 2013-10-16 15:13:36 -04:00
Alex "rainChu" Haddad
2643214ca6 Lights extinguish underwater 2013-10-15 21:50:32 -04:00
Alex "rainChu" Haddad
30ee3c5cf6 Equipped torches and lights run out of fuel 2013-10-15 21:50:14 -04:00
Marc Zinnschlag
458c752425 Merge remote-tracking branch 'mckibbenta/tgm' 2013-10-12 13:38:10 +02:00
Emanuel Guevel
4860514865 Acrobatics: cosmetic changes 2013-10-02 23:34:24 +02:00
mckibbenta
073f64c8bb stop weapon condition degredation (for the player) with tgm on 2013-10-02 13:46:33 -04:00
Emanuel Guevel
b8c60dabb3 Reintroduce Acrobatics changes made by Glorf 
Advance Acrobatics skill on jump and on landing,
apply fall damage on landing.
 2013-10-01 23:35:34 +02:00
Chris Robinson
e589d0ec91 Werewolves can't activate activators 2013-08-28 11:36:22 -07:00
Chris Robinson
f5d03a16c1 Rename getFacedObject and getFacedHandle for melee hits 2013-08-23 12:27:39 -07:00
scrawl
22d5598082 Fix bad_cast exception when hitting creatures 2013-08-22 12:17:12 +02:00
Chris Robinson
dca599b8c5 Add NPC landing sounds for soundgen keys 2013-08-19 08:58:50 -07:00
Emanuel Guevel
a47c76001c Apply trap magic effects 2013-08-13 04:56:15 +02:00
Chris Robinson
6fd4cdb5fb Play randomized werewolf sounds 2013-08-11 00:53:17 -07:00
Chris Robinson
00d6690b4d Ignore encumbrance in werewolf form 
According to UESP, inventory weight is ignored. Not sure if this
includes feather and burden effects.
 2013-08-10 20:25:18 -07:00
Chris Robinson
c2d8eb377f Play some appropriate sounds in werewolf form 2013-08-09 06:40:16 -07:00
Chris Robinson
72a399054f Don't assume only players activate doors 2013-08-09 01:35:29 -07:00
Chris Robinson
46bc7bd9c8 Some cleanup since NpcStats is now also CreatureStats 
This isn't a thorough cleaning, so keep an eye out for more
 2013-08-09 01:14:08 -07:00
Chris Robinson
75b6515915 Inherit NpcStats from CreatureStats 2013-08-08 23:28:02 -07:00
Chris Robinson
89c7f5bc70 Handle object activation as a werewolf 2013-08-08 22:34:53 -07:00
Chris Robinson
946ca7f931 Return the appropriate name for werewolf NPCs 2013-08-08 04:40:31 -07:00
Chris Robinson
dfdd2dc308 Handle swimleft and swimright soundgen keys 2013-08-08 04:40:31 -07:00
Chris Robinson
109df46590 Fix werewolf claw damage multiplier 2013-08-08 04:40:31 -07:00
Chris Robinson
076e7d8e16 Make insertBegin internal 2013-08-07 03:56:07 -07:00
Chris Robinson
0458fd5531 Remove unused/unneeded parameters 2013-08-07 03:56:06 -07:00
Chris Robinson
3555476dfd Use Animation-derived objects for generic objects 2013-08-06 19:49:07 -07:00
Chris Robinson
2c03fec4bb Use the fatigue term for jumping 2013-08-06 19:49:00 -07:00
Chris Robinson
b70975a74d Move getEvasion to CreatureStats 2013-08-02 00:21:01 -07:00
Marc Zinnschlag
5cafe65cd7 Merge remote-tracking branch 'scrawl/cppcheck' 2013-07-31 20:00:35 +02:00
Marc Zinnschlag
25917b00ec Merge remote-tracking branch 'scrawl/master' 2013-07-31 19:00:24 +02:00
scrawl
7dc30a01cd Some changes suggested by cppcheck 2013-07-31 18:46:32 +02:00
scrawl
43e0df479e Make NPCs auto-equip after their inventory is loaded, this fixes NPCs that start as dead not auto-equipping 2013-07-31 16:30:22 +02:00
PLkolek
f297c21e4d Old door sound fades out on door open/close. Door sound is synchronised to angle on action. 2013-07-31 15:46:23 +02:00
Marc Zinnschlag
6ce2b962e1 Merge remote-tracking branch 'scrawl/inventory' 2013-07-31 09:15:22 +02:00
scrawl
16cacb338a Initialize MWMechanics::AiSequence from ESM::AiPackageList 2013-07-31 00:55:08 +02:00
scrawl
45006ea193 Fix inventory/container content loading so that it's done for dynamically spawned objects as well 2013-07-31 00:02:24 +02:00
scrawl
472a381263 Fix health meter (again) 2013-07-30 16:09:12 +02:00
scrawl
426e3ec6c6 Fix enemy health meter for creatures 2013-07-30 06:17:21 +02:00
scrawl
3961c276b8 Added enemy health meter 2013-07-30 06:00:20 +02:00
Chris Robinson
3744850545 Fix hand-to-hand health damage reduction 2013-07-28 16:07:09 -07:00
Chris Robinson
39507e3f0f Decrease armor condition on successful hits 2013-07-28 15:51:17 -07:00
Chris Robinson
1af48ab6e0 Decrease weapon condition on successful hits 2013-07-28 15:17:01 -07:00
Chris Robinson
54f91d4b3a Implement hand-to-hand attacks 2013-07-28 06:48:25 -07:00
Chris Robinson
a34f0de3e1 Play the correct medium armor foot sounds 2013-07-28 04:17:36 -07:00
Chris Robinson
db4f34b332 Play hit sounds when hitting creatures and NPCs 2013-07-27 11:20:39 -07:00
Chris Robinson
1a40d01afa Fix NPC armor rating calculation and reduce redundant lookups 2013-07-27 09:31:16 -07:00
Chris Robinson
3298eb1b37 Implement HitOnMe script function 2013-07-26 10:50:23 -07:00
Chris Robinson
5379e607cb Handle the OnPCHitMe script variable 2013-07-26 10:50:23 -07:00
Chris Robinson
f215d2cc30 Only raise weapon skills for the player 2013-07-26 10:50:23 -07:00
Chris Robinson
bec420c69b Add Class::onHit for creatures 2013-07-26 10:50:23 -07:00
Chris Robinson
dd6edd21f8 Add a separate on-hit method to handle objects being hit 2013-07-26 10:50:23 -07:00
Chris Robinson
a569ae367e Fix hit chance calculation 2013-07-25 13:09:26 -07:00
Chris Robinson
6195062d72 Try to figure out what gets hit 
This isn't the greatest. The distance multiplier is a guess, and a sphere cast
may be better.
 2013-07-25 12:58:43 -07:00
Chris Robinson
b3a057d679 Handle hit chance and damage calculation 
Math is based on what the UESP describes, with some tweaks (using
fatigue term, and the fCombatCriticalStrikeMult GMST):
http://www.uesp.net/wiki/Morrowind:Combat
 2013-07-25 08:15:42 -07:00
Chris Robinson
1dcc893703 Merge remote-tracking branch 'zini/master' into combat 2013-07-25 01:16:49 -07:00
Chris Robinson
92cc566fdc Rename the Class::attack method to Class::hit 2013-07-25 00:30:01 -07:00
Chris Robinson
d9a9c3d6bd Handle the "land" soundgen type 2013-07-24 10:36:04 -07:00
Chris Robinson
d8ec813939 Say something from the "hit" dialog topic when losing health 2013-07-24 10:02:50 -07:00
Chris Robinson
cc8e8c1272 Use the attack strength as determined by how long the attack was held 2013-07-24 03:18:53 -07:00
Chris Robinson
0c8d4d9be2 Add beginnings of melee hits 2013-07-24 02:51:42 -07:00
Emanuel Guevel
70a5a83419 Change the formula used to calculate initial NPC health 2013-07-23 16:48:54 +02:00
Emanuel Guevel
1c330fc899 Use the correct formula for NPC health initialization 2013-07-21 10:13:46 +02:00
Emanuel Guevel
7837dcdc19 Calculate NPC health on loading instead of updating it continually 
Only NPC with auto-calculated stats are concerned.
 2013-07-20 22:14:10 +02:00
Chris Robinson
14e0c182f3 Allow specifying the sound type to playSound and playSound3D 2013-07-18 21:50:11 -07:00
Chris Robinson
ac4dfd3b39 Play the appropriate foot sound based on footwear 2013-07-18 21:50:11 -07:00
Chris Robinson
9ea6b22a83 Handle soundgen animation keys 2013-07-17 23:58:21 -07:00
scrawl
94d45e1518 Fix twohanded weapons not unequipping when equipping a torch 2013-07-15 23:21:01 +02:00
scrawl
0c7f48ec8a Implement movement for creatures (formula is a stub) 2013-05-27 18:03:06 +02:00
scrawl
d3effdf34c Fix exception when trying to equip a shield while a lockpick is equipped 2013-05-20 13:32:38 +02:00
scrawl
d096b19307 Fix not being able to equip arrows/bolts 2013-05-17 14:11:19 +02:00
scrawl
8a3d3f954b NPC/creature persistence flag 2013-05-16 18:50:26 +02:00
scrawl
0c4a963132 Container UI rewrite 2013-05-11 18:38:27 +02:00
Marc Zinnschlag
95eeea2a27 Revert "Merge remote-tracking branch 'glorf/acrobatics'" 
This reverts commit 089ef7a2a0, reversing
changes made to 67422c397c.
 2013-05-01 16:56:16 +02:00
Marc Zinnschlag
6f0ccb6e38 Merge remote-tracking branch 'scrawl/insertrecords' 2013-05-01 13:55:26 +02:00
scrawl
40a0969055 Insert records that may not exist in vanilla MW 2013-05-01 12:47:50 +02:00
Glorf
5a8c1661be Jump acrobatics working, started falling acrobatics implementation 2013-04-30 20:44:17 +02:00
scrawl
6c5ea1ea7a Fix incorrect weapon health meter for fully repaired weapons, fix exception when equipping lockpicks or probes 2013-04-29 12:05:10 +02:00
scrawl
867c7db014 Fix wrong door sounds 2013-04-29 11:00:15 +02:00
scrawl
78596cad83 Fix enchantment points value 2013-04-29 10:19:09 +02:00
scrawl
9343b4459e Opening doors 2013-04-28 14:59:15 +02:00
scrawl
ef9afeb53e Auto calculate attributes if there are not specified in the NPC record 2013-04-18 23:51:43 +02:00
scrawl
2693b78536 Add initial player inventory when new game is started 2013-04-15 02:56:23 +02:00
Marc Zinnschlag
beb1858a57 Merge remote-tracking branch 'glorf/bugfix' 2013-04-10 17:39:19 +02:00
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