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

2195 commits

Author SHA1 Message Date
scrawl
73aa07b81b Merge pull request #1189 from Allofich/attack 
Match best attack selection to vanilla behavior
 2017-01-11 18:36:10 +01:00
Allofich
2322ab3125 Don't make Command spells cancel AI packages 
(Fixes #3649)
 2017-01-12 00:07:22 +09:00
Allofich
c10585fb07 Match best attack selection to original MW 
(Fixes #3721)
 2017-01-11 22:22:46 +09:00
David Cernat
dfb87e9e0d Merge pull request #124 from OpenMW/master 
Add OpenMW commits up to 11 Jan
 2017-01-11 13:30:22 +02:00
Assumeru
1a073ca642 Fix teleportation being unreachable 2017-01-03 22:02:23 +01:00
Allofich
eee49b7ea7 Make dispel an instant effect again (Fixes #3695) 2017-01-02 17:35:50 +09:00
scrawl
212e85e810 Merge pull request #1174 from Allofich/combat 
Adjustments to AI combat engaging and disengaging
 2017-01-01 19:36:09 +01:00
David Cernat
fba4878fee Merge pull request #118 from OpenMW/master 
Add OpenMW changes up to 27 Dec
 2016-12-27 03:49:52 +02:00
MiroslavR
c9dd63af8d Merge pull request #1171 from NeveHanter/travel-followers-cost 
Implemented "paying" for travelling followers
 2016-12-26 22:34:39 +01:00
Allofich
54fa921dad Change some AI combat engagements to not need LOS 2016-12-26 22:42:46 +09:00
Allofich
6fa0354a17 Make AI attack player also if it attacks follower 2016-12-26 22:42:45 +09:00
Allofich
5a6ea4e84e Cleanup 2016-12-26 22:42:44 +09:00
Allofich
e10c4d8814 Stop combat between AI when canFight is false 2016-12-26 22:42:42 +09:00
Allofich
e8c7ad2f4b Change environment check to canFight check 
Instead of just checking that combatants are in compatible environments,
allow combat if in attack range using canFight. Together with previous
commit, fixes #3690.
 2016-12-26 02:14:01 +09:00
Allofich
588442b6cc Make enemies start combat with player followers 
Recreates vanilla behavior of enemies starting combat with player
followers and escorters. (Fixes #3691)
 2016-12-26 02:13:54 +09:00
NeveHanter
8902bb5b13 Player now pays for the following actors when travelling, with the exception of the first follower who travels for free, refactored getFollowers to getActorsFollowing/getActorsSidingWith 2016-12-20 12:38:51 +01:00
David Cernat
973db7c78a Merge pull request #113 from OpenMW/master 
Add OpenMW commits up to 17 Dec
 2016-12-17 23:27:09 +02:00
Aussiemon
2f66b91ac5 Added check to prevent attempted wandering of empty paths 2016-12-16 15:18:28 -07:00
Koncord
536715cf46 Cleanup tes3mp headers 2016-12-16 16:59:15 +08:00
Leon Krieg
12c8c3276a Disable NPC collision only when death animation has finished (#3666) 2016-12-15 19:33:14 +01:00
Leon Krieg
739cd5ba45 Fixed more spelling mistakes 2016-12-15 13:09:40 +01:00
Leon Krieg
c7b4b2cdd7 Fixed multiple spelling mistakes 2016-12-14 16:39:33 +01:00
MiroslavR
76ee5845ac Fix swish sound ID and play swish sound effects for all creatures (Fixes #3653) 2016-12-11 19:35:53 +01:00
mrohrlach
9624d8aade Added new method and variable to track float remainders of disintegration effections 2016-12-09 19:48:56 -07:00
scrawl
876d9c6a84 Merge pull request #1148 from Allofich/aicombat 
Require line of sight for AI attacks
 2016-12-06 20:02:39 +01:00
Allofich
a6dae51d87 Require line of sight for AI attacks (Fixes #3646) 2016-12-07 01:35:30 +09:00
Allofich
6816e935f1 Fix fortify maximum magicka expiration (Fixes #3648) 2016-12-06 21:00:03 +09:00
Kurnevsky Evgeny
28639c3b2f Crash fix when item is disabled before it casts spell. 2016-12-03 17:13:31 +03:00
David Cernat
7bbeed629d Merge pull request #109 from OpenMW/master 
Add OpenMW changes up to 25 Nov
 2016-11-26 01:58:43 +02:00
scrawl
b6d02d9b14 Fix order of operations when undoing werewolf transformation of an NPC 2016-11-22 16:37:49 +01:00
David Cernat
f9ca98498d Merge pull request #107 from OpenMW/master 
Add OpenMW commits up to 20 Nov, part 2
 2016-11-20 19:30:24 +02:00
scrawl
385db50f2d Merge pull request #1131 from Allofich/waterwalking 
Make water walking mechanics closer to original MW
 2016-11-20 17:19:15 +01:00
Allofich
0e429ae41d Make water walking mechanics closer to original MW 2016-11-20 22:21:33 +09:00
David Cernat
c6eac31d94 Merge pull request #106 from OpenMW/master 
Add OpenMW changes up to 20 Nov
 2016-11-20 01:20:25 +02:00
MiroslavR
8f91732b09 Show starting abilities, powers and spells in stat-review window (Fixes #2410) 2016-11-19 21:51:19 +01:00
David Cernat
234266755e Prevent player-controlled NPCs from auto-unequipping candles and torches 2016-11-18 02:47:59 +02:00
David Cernat
b028f0b51f Merge pull request #104 from OpenMW/master 
Add OpenMW commits up to 17 Nov
 2016-11-17 21:13:58 +02:00
David Cernat
3a733eb122 Make tes3mp includes consistent 2016-11-17 17:16:25 +02:00
MiroslavR
5e46121046 Implement fleeing AI (Closes #1118) 2016-11-16 20:15:25 +01:00
David Cernat
fa9d6e810e Use lowerCamelCase in tes3mp client function names like OpenMW does 2016-11-15 21:54:06 +02:00
Koncord
799842b5da Reduce using of the CPU 2016-11-12 20:11:27 +08:00
Koncord
56959ebfda Implement magic 2016-11-12 19:39:16 +08:00
David Cernat
06152fde77 Stop player-controlled NPCs from reporting crimes committed by players 2016-10-31 11:00:56 +02:00
David Cernat
cd798d5f23 Merge pull request #89 from OpenMW/master 
Add OpenMW commits up to 30 Oct
 2016-10-30 21:49:07 +02:00
Allofich
125e94ef0e Fix shadowing warnings 2016-10-31 00:39:31 +09:00
David Cernat
c25ebc34b3 Shorten WorldPacket IDs by removing WORLD from them 2016-10-25 12:15:27 +03:00
David Cernat
3a5a5e73a1 Send ID_WORLD_OBJECT_UNLOCK from ingame scripts and regular unlocking 2016-10-24 11:43:27 +03:00
David Cernat
e27d1857ef Fix formatting in previous changes made by tes3mp to OpenMW's core 2016-10-19 22:06:11 +03:00
David Cernat
3136a12051 Resolve conflicts in pull request #75 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
 2016-10-14 18:34:17 +03:00
Allofich
610f36f47b Set magic effects that don't support variable durations to use duration of 1 2016-10-14 00:13:08 +09:00
Allofich
675bd09462 Change several instant effects to be non-instant (Fixes #2054) 2016-10-13 23:38:21 +09:00
scrawl
454d1ffaef Make the cell change check during actor update more robust 2016-10-13 14:39:58 +02:00
scrawl
37bfa88b2d Merge pull request #1094 from Allofich/alchemy 
Fix reversed use of alembics and retorts
 2016-10-06 19:02:24 +02:00
Allofich
498976775a Fix reversed use of alembics and retorts 2016-10-07 01:38:50 +09:00
scrawl
73b6c34a23 Merge pull request #1092 from Allofich/warnings 
Fix shadowing warnings
 2016-10-06 17:50:26 +02:00
Allofich
53e94b7c3f Fix shadowing warnings 2016-10-06 23:33:52 +09:00
David Cernat
6eae017561 Merge pull request #74 from OpenMW/master 
Add OpenMW commits up to 5 Oct
 2016-10-06 06:16:09 +03:00
Allofich
df03b32205 Coverity fixes 2016-10-05 23:32:26 +09:00
MiroslavR
a05649e1d5 Use loop fallback for movement animations (Fixes #3578) 2016-10-03 22:36:56 +02:00
scrawl
44dffe55ab Merge pull request #1083 from Allofich/onhit 
Make AI response to spell hits more like original MW
 2016-10-02 14:06:51 +02:00
Allofich
6ec37b5cfb Fix shadowing warnings 2016-10-02 17:48:54 +09:00
Allofich
e78f02aaf2 Consider reflected/absorbed hostile spells as assaults 2016-10-02 16:08:24 +09:00
Allofich
a81a04e6d0 Remove unused line 2016-10-02 01:11:01 +09:00
Allofich
fa17784722 Change breaks to continues 2016-10-02 00:54:01 +09:00
scrawl
140be70a90 Merge pull request #1082 from Gladdy/master 
Fix for segmentation fault on entering a cell
 2016-10-01 16:42:47 +02:00
Allofich
a2e174a40f Don't let water-only creatures prevent resting 2016-10-01 22:15:31 +09:00
Allofich
266ec1aadc Make AI response to spell hits more like original MW 2016-10-01 21:38:17 +09:00
David Cernat
728a09e423 Reorder functions in LocalPlayer and make their names more consistent 2016-09-30 08:59:58 +03:00
David Cernat
15a4602482 Add getSkillIncrease, setSkillIncrease functions to OpenMW's NpcStats 2016-09-30 07:15:03 +03:00
David Cernat
8fbc6f31f1 Add setLevelProgress function to OpenMW's NpcStats 2016-09-30 06:26:43 +03:00
Martijn Bakker
45ffdbb284 fixed a segmentation fault when entering a cell which contains someone already attacking you 2016-09-30 00:40:13 +01:00
David Cernat
25026a9b95 Allow player-controlled NPCs to have attack animations again 2016-09-29 16:57:39 +03:00
David Cernat
7e4543ffcb Merge pull request #64 from OpenMW/master 
Add OpenMW commits up to 24 Sep
 2016-09-25 11:06:07 +03:00
Allofich
04c13ffab3 Add unarmed attack selection to chooseBestAttack() 2016-09-22 00:45:54 +09:00
David Cernat
f515111845 Merge pull request #62 from OpenMW/master 
Add OpenMW commits up to 20 Sep
 2016-09-21 06:05:24 +03:00
scrawl
c6ef26ba4b Merge pull request #1070 from mrcheko/pathfinding 
fix using potion as weapon
 2016-09-20 22:58:54 +02:00
mrcheko
229cb4b386 remove dynamic_cast to ActionPotion 2016-09-20 23:00:00 +03:00
mrcheko
48765f2ff2 fix using potion as weapon 2016-09-19 23:43:26 +03:00
David Cernat
1534f835a6 Merge pull request #61 from OpenMW/master 
Add OpenMW commits up to 19 Sep
 2016-09-19 23:38:20 +03:00
scrawl
718178bfe9 Merge pull request #1066 from MiroslavR/setinvisible 
Don't use base invisibility magnitude for setting alpha
 2016-09-19 15:35:12 +02:00
Allofich
7e3cca6d37 Vfx after Divine/Almsivi intervention should be attached to player 2016-09-19 22:20:16 +09:00
Allofich
d1157b3e10 Use correct vfx for teleport spells 2016-09-19 18:12:30 +09:00
David Cernat
79c561057c Merge pull request #59 from OpenMW/master 
Add OpenMW commits up to 18 Sep
 2016-09-19 02:47:09 +03:00
MiroslavR
744667e163 Don't use base invisibility magnitude for setting alpha (Fixes #3555) 2016-09-19 00:05:50 +02:00
scrawl
cd4b182091 Merge pull request #1051 from Allofich/textures 
Use spell effect particle textures
 2016-09-18 22:37:14 +02:00
David Cernat
3b7693c719 Resolve conflicts in pull request #55 
# Conflicts:
#	README.md
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwmechanics/combat.cpp
 2016-09-15 08:49:57 +03:00
Allofich
a033ba3bd2 Override spell textures by NiTexturingProperty 2016-09-14 23:03:04 +09:00
scrawl
1362264561 Fix warning 2016-09-13 02:49:19 +02:00
scrawl
65dc12cdd6 Remove unused parameter 2016-09-13 02:48:36 +02:00
scrawl
feaf3652a5 Merge pull request #1055 from mrcheko/pathfinding 
prevent running in circles around path points
 2016-09-13 02:47:49 +02:00
scrawl
3cd73d0fc3 Merge pull request #1058 from Allofich/onhit 
Don't play blood effects for completely resisted hits
 2016-09-13 02:47:43 +02:00
Allofich
bce0166931 Don't play blood effects for resisted hits 2016-09-12 22:46:32 +09:00
Allofich
3bbde312b9 Remove unneeded code 2016-09-12 19:54:06 +09:00
Allofich
3f6543860a Make creatures use fHandToHandReach 2016-09-11 00:01:20 +09:00
Allofich
c98d4e0473 Allow dodging for bipedal creatures 2016-09-10 23:56:31 +09:00
Allofich
7bc4535c0d Make NPCs dodge according to target's weapon reach 2016-09-10 23:30:46 +09:00
mrcheko
72786fef9d prevent running in circles around path points 
addresses http://bugs.openmw.org/issues/2229
 2016-09-09 23:57:19 +03:00
Allofich
368828b217 Update TODO comments 2016-09-10 01:38:05 +09:00
Allofich
bca477ca8a Apply particle textures like original engine does 2016-09-08 23:59:23 +09:00
Allofich
85349da26c Add comments 2016-09-08 23:58:00 +09:00
Allofich
502a758eff Use particle texture for "hit" effects 2016-09-08 23:58:00 +09:00
Allofich
fe3a033642 Use particle textures for spell projectiles 2016-09-08 23:56:54 +09:00
scrawl
05e4542d33 Merge pull request #1048 from mrcheko/pathfinding 
Pathfinding unification v2
 2016-09-06 13:19:18 +02:00
mrcheko
aa441f2648 AiPackage: fix path recalc on cell change 
AiTravel: remove unneeded code
 2016-09-06 01:11:10 +03:00
mrcheko
a22fc43947 aiwander: reset path on cell change 
remove redundant mIsWanderDestReady var
 2016-09-05 15:18:34 +03:00
scrawl
fbc9b90ebe Cleanup 2016-09-05 00:04:11 +02:00
Allofich
f8270f6bd5 Consolidations and cleanup for multi-effect spells 2016-09-05 05:30:51 +09:00
Allofich
dbd7c038b2 Add loading code for multi-effect projectiles 2016-09-05 03:45:13 +09:00
Allofich
5a0d3feb98 Use C++ int-to-string conversion 2016-09-05 02:52:44 +09:00
Allofich
60384399ee Fix errors and warnings 2016-09-05 01:39:18 +09:00
Allofich
37f07f7435 Combine into one multi-effect magic projectile 2016-09-04 22:35:29 +09:00
Allofich
10842462c7 Send lists of models and sounds to launchMagicBolt 2016-09-04 17:42:27 +09:00
Allofich
96e1726e4d Fix warnings 2016-09-04 17:42:27 +09:00
Allofich
c4d77b6a8b Casting animation comes from the first effect 2016-09-04 17:42:27 +09:00
Allofich
3300ef5db7 Don't apply projectile effects multiple times 2016-09-04 17:42:27 +09:00
Allofich
f36e5ef403 Use last effect of spell for hand effect color 2016-09-04 17:42:27 +09:00
Allofich
f6c3a62b3e Use average speed for multiple spell projectiles 2016-09-04 17:42:27 +09:00
Allofich
f1a18027f2 Shoot projectiles of spells with multiple effects 2016-09-04 17:42:27 +09:00
Allofich
446c0a4fa8 Play all of a spell's casting effects 2016-09-04 17:42:27 +09:00
Allofich
b4577fe751 Allow multiple spell hit sounds on single target 2016-09-04 17:42:27 +09:00
scrawl
7859e378df Merge pull request #1045 from Allofich/attack 
Fix AI melee attack
 2016-09-04 00:22:59 +02:00
Allofich
5c2bc515fe Remove overridden code in aicombat 2016-09-04 02:13:09 +09:00
mrcheko
0775ed75ea fix zero div in getXAngleToDir 2016-09-03 17:50:06 +03:00
Allofich
0d63d75bb0 Remove no longer used parameter 2016-09-03 22:40:24 +09:00
Allofich
286e4bb98f Remove attacktype movement 2016-09-03 21:16:59 +09:00
David Cernat
9764dbb8d2 Merge pull request #52 from OpenMW/master 
Add OpenMW commits up to 2 Sep
 2016-09-02 06:29:34 +03:00
Allofich
154dcc942c Let NPCs use attack type regardless of movement 2016-09-01 22:43:33 +09:00
Allofich
b99c2c54d8 Allow Water Walking on non-submerged creatures 2016-09-01 03:53:53 +09:00
Allofich
22b11c5947 Move Water Walking check into checkEffectTarget() 2016-08-31 23:56:31 +09:00
Allofich
f25c65260c Limit sMagicinvalidEffect to self-cast spells 2016-08-31 17:22:45 +09:00
Allofich
6c3cad238b Use castByPlayer bool 2016-08-31 17:18:23 +09:00
David Cernat
e9dce26f38 Resolve conflicts in pull request #50 
# Conflicts:
#	CMakeLists.txt
 2016-08-31 07:28:32 +03:00
Allofich
a6216d883f Don't allow casting Water Walking in deep water 2016-08-31 04:37:50 +09:00
Allofich
9e1bfde46f Add comment 2016-08-26 02:42:56 +09:00
Allofich
67bd882bc7 Disable current idle when an action is taken 2016-08-25 23:42:09 +09:00
Allofich
6190ff1f0d Update idle if current idle finishes playing 2016-08-25 21:45:56 +09:00
Allofich
f4cc5d0399 Sometimes play 1st-person weapon idle to Stop key 2016-08-25 21:34:45 +09:00
David Cernat
4d2ca20445 Resolve conflicts in pull request #43 
# Conflicts:
#	README.md
 2016-08-24 22:03:35 +03:00
Allofich
9b0e5d6b59 Loop mid-animation idles when loading a save game 2016-08-23 19:50:56 +09:00
scrawl
b0dc625b18 Run setLoopingEnabled after the anim queue is updated 2016-08-22 23:33:24 +02:00
scrawl
719e884b7c Remove duplicate code 2016-08-22 23:25:00 +02:00
scrawl
6450c9be27 Simplify condition 2016-08-22 23:22:58 +02:00
Allofich
bf9dc45b2b Emulate vanilla animation loops more closely 2016-08-23 01:42:36 +09:00
mrcheko
612c7f1a2f Revert "Revert "Merge pull request #993 from mrcheko/pathfinding"" 
This reverts commit 3732979eec.
 2016-08-19 22:15:26 +03:00
Allofich
b332a13b4e Don't restart looped animations on repeated calls 2016-08-18 23:23:38 +09:00
David Cernat
436548413e Resolve conflicts in pull request #39 
# Conflicts:
#	CMakeLists.txt
 2016-08-18 15:10:52 +03:00
Allofich
c05782581e Account for all instances of play() 2016-08-16 02:52:55 +09:00
Allofich
6163c7bb03 Use loopfallback for idle animation groups 2016-08-16 01:15:26 +09:00
David Cernat
d9cfd5bac2 Resolve conflicts with OpenMW 2016-08-15 19:14:13 +03:00
scrawl
3732979eec Revert "Merge pull request #993 from mrcheko/pathfinding" 
This reverts commit 5190275b37, reversing
changes made to d7845012bf.
 2016-08-14 18:04:33 +02:00