lance-gg / lance

Multiplayer game server based on Node.JS
https://lance-gg.github.io/
Apache License 2.0
1.57k stars 165 forks source link

Add additional exports for ThreeVector and Quaternion. #115

Closed alexanderson1993 closed 5 years ago

namel commented 5 years ago

This is a good pull request. I'd be happy to accept it - but it currently has conflicts (due to dist files which have changed). Can you rebase, overwriting the dist files?

alexanderson1993 commented 5 years ago

I've updated the branch. I'm afraid I didn't rebase properly, but you should be able to rebase my changes onto the original repo when you merge the PR.

Thanks!

namel commented 5 years ago

hi @alexanderson1993 github does not allow me to rebase and merge in this PR, because it doesn't know how to handle the conflicts.

This is actually my fault, because I checked in the dist directory.

I removed the contents of the dist subdirectories now, leaving them empty and the contents git-ignored.

Can you create a new PR, which is based on the latest master version? it doesn't need to include the build outputs any more.

alexanderson1993 commented 5 years ago

Yeah, let me do that.