teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
18396 commits 34 branches 0 tags 66 MiB
Commit graph

2148 commits

Author SHA1 Message Date
David Cernat
a58601fb2b [Client] Delineate tes3mp-only code more clearly, part 1 2017-02-26 16:59:53 +02:00
David Cernat
ed2176c984 [Client] Reuse 1 BaseEvent over and over instead of creating new ones 2017-02-23 09:19:09 +02:00
David Cernat
d4ff136837 [Client] Add comments about spellcasting as a result of merge conflict 2017-02-23 01:05:45 +02:00
David Cernat
38ccc2671c Merge pull request #164 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
 2017-02-23 00:52:53 +02:00
scrawl
eefe1ed1a8 Fix being affected by Silence in god mode 2017-02-21 15:48:45 +01:00
David Cernat
a1988ac6ef Merge pull request #161 from OpenMW/master 
Add OpenMW commits up to 21 Feb 2017
 2017-02-21 07:02:59 +02:00
scrawl
7e02bb7348 Preload summoned creature models before the spell is cast 2017-02-20 19:58:00 +01:00
David Cernat
0d75264221 Merge pull request #155 from OpenMW/master 
Add OpenMW commits up to 17 Feb 2017, part 2
 2017-02-17 23:19:30 +02:00
Allofich
3897c49e30 Fix loading 0-duration Follow and Escort packages 
(Fixes #3755)
 2017-02-18 01:55:50 +09:00
David Cernat
c32c004516 Merge pull request #151 from OpenMW/master 
Add OpenMW commits up to 16 Feb 2017
 2017-02-16 11:53:02 +02:00
scrawl
c4a89065a2 Preload VFX of spells selected by AI actors 2017-02-15 21:01:25 +01:00
David Cernat
2ed9ae5739 Merge pull request #149 from OpenMW/master 
Add OpenMW commits up to 14 Feb 2017
 2017-02-14 10:27:53 +02:00
scrawl
183c46b0ef Fix summoning effects 2017-02-14 07:58:16 +01:00
David Cernat
a5d7c5fd39 Merge pull request #148 from OpenMW/master 
Add OpenMW commits up to 13 Feb 2017
 2017-02-13 21:29:51 +02:00
scrawl
051b4038d9 Merge pull request #1203 from Allofich/magic 
Make AI not go hostile when absorbing/reflecting
 2017-02-12 17:18:10 +01:00
scrawl
cdf65ef681 Merge pull request #1201 from Allofich/hit 
Prevent AI actors from hitting unintended targets
 2017-02-12 16:25:52 +01:00
Allofich
72c3ee0a3d Make AI not go hostile when absorbing/reflecting 2017-02-12 23:14:09 +09:00
Allofich
6b53541571 Prevent AI actors from hitting unintended targets 
(Fixes #3254)
 2017-02-12 19:51:19 +09:00
scrawl
9fa8e88366 Revert "Don't create a CharacterController for objects with no animations" 
This reverts commit cce42b6e9d.
 2017-02-12 10:22:11 +01:00
David Cernat
d528a0edb5 Merge pull request #147 from OpenMW/master 
Add OpenMW commits up to 11 Feb 2017
 2017-02-11 21:27:51 +02:00
scrawl
03a10f217a Catch exceptions in AiSequence::execute 2017-02-11 17:53:11 +01:00
scrawl
5a12407436 Revert "Rearranged check for better performance" 
This reverts commit 332ceb51a2.
 2017-02-11 17:53:11 +01:00
Allofich
e047679595 Fix trying to access stats on non-actors 2017-02-11 19:59:42 +09:00
David Cernat
6763718412 Merge pull request #146 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwmechanics/actors.cpp
 2017-02-10 21:39:16 +02:00
scrawl
332ceb51a2 Rearranged check for better performance 2017-02-10 06:48:03 +01:00
scrawl
8752ae9c6a Fix include 2017-02-10 06:28:23 +01:00
scrawl
bbcba57495 Disable hitAttemptActorId saving code for now 2017-02-10 06:26:32 +01:00
Allofich
5d2090684a Store mHitAttemptActorId in save files 2017-02-07 01:26:26 +09:00
Allofich
25c64dbb0f Make combat engagement logic more like vanilla 
(Fixes #2678, Fixes #3705)
 2017-02-07 01:25:12 +09:00
David Cernat
e703dd42aa [Client] Rename LocalEvent into WorldEvent 2017-02-06 17:40:32 +02:00
David Cernat
27242cdab9 Merge pull request #142 from OpenMW/master 
Add OpenMW commits up to 6 Feb 2017
 2017-02-06 09:13:19 +02:00
scrawl
bc29a99a53 Fix broken timer 2017-02-06 05:10:40 +01:00
scrawl
cce42b6e9d Don't create a CharacterController for objects with no animations 2017-02-06 03:43:08 +01:00
scrawl
fe0cf5be05 StatsWindow: don't rebuild all skill widgets when one skill changes 2017-02-06 02:40:35 +01:00
David Cernat
3a29b2d41d Merge pull request #141 from OpenMW/master 
Add OpenMW commits up to 5 Feb 2017
 2017-02-05 07:11:45 +02:00
scrawl
3065600a86 Skip expensive visitEffectSources call if no summoned creatures or summon effects are active 2017-02-05 02:26:28 +01:00
scrawl
a2cede8f34 Add timer for updateEquippedLight 2017-02-05 02:26:28 +01:00
scrawl
1eb3384043 Avoid rotating by zero in CharacterController 2017-02-05 02:26:28 +01:00
Koncord
f78c749981 [Client] Use "NULL" instead "nullptr" 
nullptr keyword introduced in C++11
 2017-02-01 15:58:29 +08:00
David Cernat
703f253712 [Client] Delete new LocalEvents after sending them 2017-01-31 09:48:37 +02:00
David Cernat
9f1e491a75 [General] Make WorldEvents store information about multiple objects 2017-01-28 12:34:45 +02:00
David Cernat
624b85347a [Client] Create LocalEvent class and use it instead of WorldEvent 2017-01-27 20:57:47 +02:00
David Cernat
63c8a98083 [General] Stop using virtual functions in BasePlayer 2017-01-25 17:06:15 +02:00
David Cernat
83277a1512 Send spellbook in LocalPlayer CharGen & change UPDATE action name to SET 2017-01-20 09:07:07 +02:00
David Cernat
be851f5e1a Send packet with spells gained at character generation 2017-01-19 16:56:21 +02:00
David Cernat
fa8650f99a Merge pull request #128 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwmechanics/combat.cpp
 2017-01-18 15:38:18 +02:00
NeveHanter
e82d542d89 Merge remote-tracking branch 'upstream/master' into bugfix-3617 2017-01-15 09:49:45 +01:00
NeveHanter
811e9ad9f3 Fixed bug https://bugs.openmw.org/issues/3617 by allowing touch and target enchantments from ranged weapons and their projectiles to explode even when colliding with non-activable objects, terrain, water slab or when shoot underwater. 
Also allowed projectiles to fly through the dead bodies as in vanilla.
 2017-01-15 09:49:25 +01:00
David Cernat
f376b8416e Merge pull request #127 from OpenMW/master 
Add OpenMW commits up to 15 Jan
 2017-01-15 02:51:15 +02:00
Allofich
f2240dde9c Allow command spells to work when cast by AI on AI 
(Fixes #3723)
 2017-01-15 01:56:22 +09:00