Closed mikecrews closed 10 years ago
Mike, merging it in wasn't the best idea.
Unfortunately I could not contact you over Skype, so I decided to reset --hard the previous merge commit on my own.
OK, I thought I did something wrong when my first merge didn't show up. You must have been very quick with the revert. I will revert my second merge.
I'll pull it into a Jint2 branch.
Let me add some answers to your points.
"It would have been better to make a separate module for jint2 (and for jint0.9 as well)."
I've had no discussion or direction from anyone on where this is going. Is there going to be a core scripting engine, or not? I thought there was, and that my task was to update the Jint version for the core scripting engine.
"Master branch didn't compile because there were two functions with the same signature in Player. Evidently, you didn't test before you merged :)."
I did. Someone added it after another one after tested. Not sure why, since I said I had added one in Skype.
"Unity 4 uses Mono 2.6."
An old version. The current version is 3.2.3, which is what I am using. The Mono version is not an issue. We all have newer versions of Mono and .Net than Unity uses.
"You made separate solutions for all the projects. What was the reason for such a change?"
I opened each project file and Xamarin made a sln for each one. I am not using them.
"Commiting userprefs was a bad idea. This file contains user-specific preferences which depend on the IDE"
I'm getting up to speed on using Git and excluding stuff from commits. They are excluded now, and I'll remove them from the repo, too.
"Three quarters of your pull request have nothing to do with jint 2. While your bugfixes are welcome, it is better to fix in the master and then merge changes back to the branch."
It would be great if you could outline how you would like to manage this project. No one has said a thing to me about any of this. Help me help you help all of us! ;)
Let's try this again. Not sure what I did wrong, but my first try to merge this didn't work.