Some minor code changes and then can't open some scenes about ringed HOT 7 CLOSED

@cjhorton well some minutes ago there were a conflict in the main.xml so we need to solve that, do you check with an actual Godot build? in the facebook page there are several users posting nice builds :)
@bojidar-bg I think we should to manage the main menu .xml with instantiate scenes for the different menus (to avoid more conflicts in the menu), can you please check this issue? I'm in the middle of a travel

from ringed.

@cjhorton make note that we develop on dev version.
@erik90mx Good idea. BTW, you fixed all of the merge errors, right?

from ringed.

@bojidar-bg for the main.xml file, yes, but there is an error with the global script, can you check it?

from ringed.

@erik90mx What is the error message? (I have committed some half-baked changes...)

from ringed.

I save this screenshot of the error: http://s23.postimg.org/6fp8ksdjv/screenshot_370.png

from ringed.

@bojidar-bg Updated and works now after the edit in the screenshot.

from ringed.

@cjhorton nice to hear that :) and thank you very much for the notification.

from ringed.