Merge tes3 mp #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
A common mistake in mods is to use playSound with volume/pitch arguments, which only playSoundVP supports. Previously these extra arguments raised a parser error, making the respective mod unusable.
Created Package system
Ported OpenMW's "Don't use unordered_map" commit changes to TES3MP to fix #1
To be honest, just copy pasted from this Reddit post: https://www.reddit.com/r/tes3mp/comments/4rvf5c/source_code/d54inw9
Not for this repo.
Now you can close chat only if pressed 'Enter'.
Makes changelog English-only
GetPosX, GetPosY, GetPosZ GetAngleX, GetAngleY, GetAngleZ
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.
Use English translation for changelog
Fix types for SetPos and SetAngle
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.
# 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
|
@Aesylwinn thank you for your time, this is much appreciated. |
davidcernat
pushed a commit
that referenced
this pull request
Aug 6, 2016
Uploaded finished TES3MP logo
davidcernat
pushed a commit
that referenced
this pull request
Mar 2, 2017
davidcernat
pushed a commit
that referenced
this pull request
Sep 17, 2017
Docs - Reference modding - minor typoes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As requested in a forum post, I've posted a merge solution. There was only one major issue I wasn't sure how to resolve because the changes in OpenMW were incompatible from what I could tell, so I just used OpenMW's change in that case. I'll comment where that change was.