tweecode / twine

UI for creating hypertext stories
http://twinery.org
657 stars 97 forks source link

Fixed App.getPath to correctly support Py2Exe application on Windows #83

Closed greyelf closed 11 years ago

greyelf commented 11 years ago

This fix solves the "System cannot find the path specified" error which occurs when running a Microsoft Windows generated via the buildexe.py script.

This has been tested on Windows XP and Windows 7.

webbedspace commented 11 years ago

This pullreq shouldn't really have been accepted without comment. It's from a fork of my fork, and the exact bug the pullreq description describes exists only in my code, so it's probable this was actually meant to be requested to my fork, and not the main tweecode branch.

Nevertheless, since I've recently submitted a pullreq of my fork anyway, I guess it doesn't really matter as long as my one (holding the last few commits I made to finish the image feature) is accepted as well.

Stormrose commented 11 years ago

I'll wrk on the other pull req later. It didn't auto merge so have to find time later to do it the hard way. I'm hoping that my huge schedule will lighten up soon so I can it some more time back into Twine.

--Et

Sent from my iPad

On 25/10/2013, at 10:28 pm, Leon notifications@github.com wrote:

This pullreq shouldn't really have been accepted without comment. It's from a fork of my fork, and the exact bug the pullreq description describes exists only in my code, so it's probable this was actually meant to be requested to my fork, and not the main tweecode branch.

Nevertheless, since I've recently submitted a pullreq of my fork anyway, I guess it doesn't really matter as long as my one (holding the last few commits I made to finish the image feature) is accepted as well.

\ Reply to this email directly or view it on GitHub.

webbedspace commented 11 years ago

I've just now tried to give you a hand by merging my fork's master with this one. I'm not fully sure how auto-merge works, but I think it might be possible to do so for my pullreq now?

(Also I need to maybe email you regarding the SugarCube header and what parts of it I'd like to integrate into Sugarcane.)

greyelf commented 11 years ago

Sorry if I made things more complex.

I thought you would pull in the single commit point (82533c527d499a32774dcfad764a60303543dd69) that fixed the problem mentioned, not the current HEAD of my master branch.