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

2597 commits

Author SHA1 Message Date
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
322a0ba8bb Initialize speed for magic projectiles 2016-09-14 21:39:44 +02:00
Allofich
34851349de Pass hitPosition by const reference 2016-09-13 00:59:56 +09:00
Allofich
bce0166931 Don't play blood effects for resisted hits 2016-09-12 22:46:32 +09:00
Allofich
02610828c1 Don't play area vfx for non-area spells on actors. 2016-09-08 02:07:01 +09:00
Allofich
88d992a020 Create area effect visual for non-area spells 2016-09-08 00:05:45 +09:00
scrawl
fbc9b90ebe Cleanup 2016-09-05 00:04:11 +02:00
scrawl
8677a6f803 Merge pull request #1044 from Allofich/magic 
Changes to multi-effect spells
 2016-09-05 00:03:10 +02:00
Allofich
c617e90755 Fix for loading projectile speed 2016-09-05 05:41:24 +09: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
c6cd1f813b Attach projectiles to nodes of multi-effect bolts 2016-09-05 02:59:33 +09:00
Allofich
5a0d3feb98 Use C++ int-to-string conversion 2016-09-05 02:52:44 +09:00
Allofich
a36f7babc1 Double scaling of spell explosions 2016-09-05 02:18:57 +09:00
Allofich
60384399ee Fix errors and warnings 2016-09-05 01:39:18 +09:00
Allofich
f49ebee56a Play sounds for multi-effect projectile 2016-09-04 23:57:06 +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
ecec7d8215 Fix spells having explosions for wrong range type 2016-09-04 17:42:27 +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
a6216d883f Don't allow casting Water Walking in deep water 2016-08-31 04:37:50 +09:00
David Cernat
abaa8cac72 Spawn players in Pelagiad on startup 2016-08-24 06:23:32 +03:00
David Cernat
d9cfd5bac2 Resolve conflicts with OpenMW 2016-08-15 19:14:13 +03:00
Bret Curtis
0547d4b937 clang says that these must be in the MWWorld namespace 2016-08-14 16:17:09 +02:00
Allofich
cb9bb92b26 Play locked sounds on locked objects instead of actors 2016-08-10 21:31:14 +09:00
David Cernat
babba95413 Merge pull request #34 from OpenMW/master 
Add OpenMW commits from 1st week of August
 2016-08-08 15:53:56 +03:00
David Cernat
8686b9cc12 Merge pull request #29 from OpenMW/master 
Add OpenMW commits from end of July
 2016-08-04 00:56:36 +03:00
MiroslavR
b65f379b7f Save scripted animation state (Fixes #1931, #2150, #3393) 2016-08-03 03:52:35 +02:00
MiroslavR
4a3529488b Fix possible reference duplication when the refID is modified by a plugin (Bug #3471) 2016-07-22 03:58:23 +02:00
MiroslavR
dafe184220 Fix moved references disappearing when modified by a plugin 2016-07-22 02:12:03 +02:00
MiroslavR
d790747389 Implement deletion of moved references (Bug #3471) 2016-07-22 01:59:02 +02:00
davidcernat
ab309180c2 Add useful debug info for cell changes 2016-07-21 23:07:37 +03:00
davidcernat
3c8543bfaf Make player references cross exterior cells only when called by server 
Previously, clientside representations of players were able to move to a new exterior cell once during their movement tick and then again when sending a cell change packet to the server. Besides causing crashes in CellRef because of a messy cell-changing record, this also led to major desyncs.

Clientside representations of players can now only change their cells when a server-sent cell change packet specifically allows it.
 2016-07-20 03:26:25 +03:00
Aesylwinn
b4a000913c Merge remote-tracking branch 'yar/master' into Even 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwdialogue/filter.cpp
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwworld/localscripts.cpp
#	components/CMakeLists.txt
#	components/compiler/exprparser.cpp
#	components/sceneutil/workqueue.cpp
 2016-07-17 23:50:52 -04:00
davidcernat
7bf08e5e5a Fix transition between exterior cells for non-local players 
Make the local player send a packet whenever moving from one exterior cell to another, don't require objects to have RefNums to be moved correctly between exterior cells, and increase the packet priority for cell changes.
 2016-07-17 22:03:20 +03:00
GrimKriegor
ace719507c Ported OpenMW's "Don't use unordered_map" commit to TES3MP to fix Issue #1 
https://github.com/TES3MP/TES3MP/issues/1
 2016-07-12 01:42:05 +01:00
scrawl
2329812988 Merge pull request #995 from Allofich/traps 
Trap and lock fixes
 2016-07-10 17:19:36 +02:00
scrawl
67d3571fac Fix activation distance in third person mode 2016-07-10 17:10:19 +02:00
Allofich
d4e656ceaf Play trap activation sound on trapped object, not actor 2016-07-10 21:39:53 +09:00
scrawl
6f376bd499 Merge pull request #983 from Allofich/telekinesis 
Don't allow telekinesis on actors or teleport doors
 2016-07-08 23:47:43 +02:00
Allofich
7a0f9a7989 Clean up, remove unnecessary code changes 2016-07-09 02:24:08 +09:00
Allofich
4e54338ce0 Implement and use getDistanceToFacedObject() 2016-07-08 23:28:49 +09:00
scrawl
0720a19fc0 Add support for placing BodyParts in a cell (Bug #3118) 2016-07-07 23:50:48 +08:00
scrawl
5d4063d8c7 LocalScripts: initialize mIter 2016-07-07 23:50:47 +08:00
Allofich
0e5c3f781f Only allow trap distance check to apply to player 2016-07-07 22:10:38 +09:00
Allofich
7de3afaa7d Cleanups 2016-07-07 21:57:00 +09:00
Allofich
cb621939fd Streamline trap code 2016-07-07 21:56:54 +09:00
Allofich
35a23c3b49 Implement and use new method allowTelekinesis() 2016-07-07 21:54:31 +09:00
Allofich
8014f37879 Avoid duplicate code 2016-07-07 21:54:30 +09:00
Allofich
538209b0a2 Change variable to mRatio and initialize it 2016-07-07 21:54:29 +09:00