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
scrawl
9e3ed45320
Merge pull request #1003 from MiroslavR/camera-distance
...
Fix camera distance not getting reset to max value (Fixes #3473 )
2016-07-17 20:24:49 +02:00
MiroslavR
19a8800d4d
Fix camera distance not getting reset to max value ( Fixes #3473 )
2016-07-17 19:52:12 +02:00
Koncord
45fab50bd8
Merged branch master into master
2016-07-17 17:59:57 +08:00
Koncord
6f07d590d4
Fix SetPos and SetAngle functions
...
Fix types for SetPos and SetAngle
2016-07-17 17:59:46 +08:00
scrawl
2ed813d5f3
Merge pull request #1002 from MiroslavR/nitextureeffect-crash
...
Fix assertion failure with NiTextureEffect missing source texture
2016-07-16 19:26:09 +02:00
MiroslavR
721fa28c1e
Fix assertion failure with NiTextureEffect missing source texture
2016-07-16 18:59:18 +02:00
David Cernat
f6d72ca5c1
Merge pull request #3 from testman42/patch-1
...
Use English translation for changelog
2016-07-16 15:19:55 +03:00
davidcernat
b7e377c636
Remove _boundingBoxComputed from sceneutil's riggeometry.cpp
...
Recent versions of OpenSceneGraph have no _boundingBoxComputed, which is why building TES3MP with them causes an error. As expected, recent versions of OpenMW do not use _boundingBoxComputed either.
2016-07-16 15:12:22 +03:00
Stanislav Zhukov
645a21af21
Added new script functions for lua compatibility
...
GetPosX, GetPosY, GetPosZ
GetAngleX, GetAngleY, GetAngleZ
2016-07-16 16:19:35 +08:00
testman42
0b4a560ae2
Full translation to Engilsh
...
Makes changelog English-only
2016-07-13 16:02:43 +02:00
Stanislav Zhukov
ce92f30022
Fix maximum incoming connections
2016-07-13 04:24:42 +08:00
Stanislav Zhukov
b09e4a0218
Fix chat 'y'
...
Now you can close chat only if pressed 'Enter'.
2016-07-13 03:21:30 +08:00
Stanislav Zhukov
131887c981
Delete script.pwn
...
Not for this repo.
2016-07-13 02:49:14 +08:00
Koncord
299c4c904e
Resurrect function
2016-07-12 23:26:53 +08:00
Koncord
1a32385632
Fix cmake modules
2016-07-12 20:37:39 +08:00
testman42
001b83fdfb
Add English translation
...
To be honest, just copy pasted from this Reddit post: https://www.reddit.com/r/tes3mp/comments/4rvf5c/source_code/d54inw9
2016-07-12 11:29:56 +02:00
Stanislav Zhukov
1d5f0bd38f
Merge pull request #2 from GrimKriegor/master
...
Ported OpenMW's "Don't use unordered_map" commit changes to TES3MP to fix #1
2016-07-12 04:02:52 -05: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
cff37cdd08
Merge pull request #999 from Allofich/aifix
...
Trim unneeded code
2016-07-11 23:04:26 +02:00
scrawl
33ab9db9f6
Merge pull request #1000 from MiroslavR/particle-range
...
Fix doubled particle spawn range
2016-07-11 23:03:04 +02:00
MiroslavR
9c6739f1b3
Fix doubled particle spawn range
2016-07-11 22:40:58 +02:00
Allofich
c57d177f1c
Trim unneeded code
2016-07-12 04:17:08 +09:00
scrawl
432723bfe6
Merge pull request #997 from MiroslavR/inactive-kfctrls
...
Do not skip inactive keyframe controllers
2016-07-10 20:48:59 +02:00
MiroslavR
2a987b6857
Do not skip inactive keyframe controllers (Bug #1942 )
2016-07-10 19:02:28 +02: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
scrawl
9375cbea44
Make NIFFilePtr const
2016-07-10 17:10:19 +02:00
Allofich
599e6708ec
Allow using keys to open trapped objects of lock level 0
2016-07-10 23:08:11 +09:00
Allofich
cabe038a97
Make lockpick and probe sounds 3d positional
2016-07-10 22:08:42 +09:00
Allofich
249918612d
Play trap disarm sound when key used on trapped object
2016-07-10 22:06:35 +09:00
Allofich
d4e656ceaf
Play trap activation sound on trapped object, not actor
2016-07-10 21:39:53 +09:00
scrawl
251ba041f3
Merge pull request #994 from MiroslavR/no-scroll-stacking
...
Don't stack effects for scrolls of the same type
2016-07-10 05:45:42 +02:00
MiroslavR
b0fcad4cb8
Don't stack effects for scrolls of the same type ( Fixes #3466 )
2016-07-10 03:49:09 +02:00
scrawl
da0e20edcd
Merge pull request #991 from MiroslavR/opface
...
Implement Face instruction (Feature #1424 )
2016-07-10 02:10:23 +02:00
MiroslavR
75a66ced20
Fix actors lacking turning animations while in first person mode
2016-07-10 01:48:54 +02:00
scrawl
c842d4976e
Merge pull request #992 from MiroslavR/msgformat
...
Improve format specifiers for message boxes
2016-07-09 20:00:30 +02:00
MiroslavR
f6f3f71db5
Improve format specifiers for message boxes
2016-07-09 03:18:45 +02:00
MiroslavR
dc0bc5b68c
Implement Face instruction (Feature #1424 )
2016-07-09 02:16:47 +02: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
53ceefa46a
Allow some telekinesis on teleport doors
2016-07-09 01:08:00 +09:00
Allofich
4e54338ce0
Implement and use getDistanceToFacedObject()
2016-07-08 23:28:49 +09:00
scrawl
8332f26887
Merge pull request #989 from AlexanderKurtz/master
...
Update gamecontrollerdb.txt from upstream.
2016-07-07 18:37:06 +02:00
scrawl
b0a37553b2
Merge pull request #988 from nikolaykasyanov/osx-cmake-min-version
...
OS X: specify minimum CMake version & remove redundant argument from CI script
2016-07-07 18:36:54 +02:00
Alexander Kurtz
ff3b7de0e7
Update gamecontrollerdb.txt from upstream.
2016-07-07 18:31:49 +02:00
Koncord
1b259e2d33
Syncing inventory, animations, position, 8 key attributes
...
Created Package system
2016-07-07 23:50:48 +08:00
scrawl
e362e3e6a5
Fix cppcheck warnings
2016-07-07 23:50:48 +08:00
scrawl
dca0e2f582
Pass a Vec4f by reference
2016-07-07 23:50:48 +08:00
