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

16657 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Cernat
360eec30a0 Merge pull request #2 from OpenMW/master 
Add recent OpenMW commits by AnyOldName3
 2016-07-20 02:58:57 +03:00
Marc Zinnschlag
4ac5174d89 updated credits file 2016-07-19 16:29:26 +02:00
Marc Zinnschlag
c17e1ca24a Merge remote-tracking branch 'anyoldname3/ignore-hash-test' 2016-07-19 16:19:28 +02:00
Stanislav Zhukov
7b4a5fdcc2 Merge pull request #1 from Aesylwinn/MergeTES3MP 
Merge tes3 mp
 2016-07-19 00:13:52 -05:00
Aesylwinn
3483b54df5 Build fix. 2016-07-18 00:05:27 -04: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
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
AnyOldName3
f1b5ad5804 Remove unused unsafe function and properly remove inheritance from std::string, providing implementations of missing stream operators preventing boost reading and writing to escape strings. 2016-07-12 17:09:57 +01: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
AnyOldName3
e6f78ae5b7 Switch indentation to spaces to remain consistent with the rest of the project 2016-07-12 01:06:57 +01:00
AnyOldName3
08df463c94 Separate declaration and definition of some static members to hopefully calm Travis down. 2016-07-12 00:37:08 +01:00
AnyOldName3
7475d90693 Fix dodgy include by changing backslashes to forwardslashes 2016-07-12 00:14:19 +01:00
AnyOldName3
5121e77a95 Remove the cause of a warning which upset Travis (but not the thing that made the Travis build fail, as I have no idea why it wouldn't work or how to fix it 2016-07-12 00:00:29 +01:00
AnyOldName3
1a0642f1db Make it work by realising that what boost::program_options calls validation is what any sane person would regard as parsing 2016-07-11 22:33:15 +01:00
AnyOldName3
195dd27780 Resolve obvious runtime error revealing more subtle one 2016-07-11 22:05:38 +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
AnyOldName3
fbe6dc9704 Change compilation error to runtime exception and decide that inheriting from std::string may have been a bad idea in C++ 2016-07-11 21:33:36 +01:00
Allofich
c57d177f1c Trim unneeded code 2016-07-12 04:17:08 +09:00
AnyOldName3
7697406467 Partially fix '2 overloads have similar conversions' compilation error 2016-07-11 14:39:38 +01:00
AnyOldName3
2a9b12bb3f Fix an issue preventing compilation, revealing another that doesn't make much sense. 2016-07-11 14:15:35 +01:00
AnyOldName3
c1ffc9e776 Remove a compilation error and set up framework to remove the others 2016-07-11 01:59:16 +01:00
AnyOldName3
f2456225db Merge branch 'ignore-hash-test' of https://github.com/AnyOldName3/openmw into ignore-hash-test 2016-07-11 01:17:59 +01:00
AnyOldName3
e17e354e84 Make # only start a comment in openmw.cfg if it starts a line and introduct compilation errors 2016-07-11 01:16:32 +01:00
AnyOldName3
7e0962c5ea Make # only start a comment in openmw.cfg if it starts a line and introduct compilation errors 2016-07-11 01:09:34 +01: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