[Bobboau]

can we merge the DX8 branch,
I want vertex buffers

[Inquisitor]

Last time I tried it, it overwrote most of the DX8 stuff. I really need the authors to look at the merge.

Important lesson: No more branches like this.

You're welcome to look at it, it's called directx8 I believe.

1. checkout / update normally (ie, main branch)
2. update w/ join option "cvs update -j directx8"
3. resolve any conflicts that might have occurred

[RandomTiger]

Probably the most realistic way to get it done if you want to get rid of branches is a code freeze at a time that someone DX8 literate has time to sort it out.

Theres still bugs in there though.

[Inquisitor]

Actually, branches can be managed, but they need constant love and merging

You ucan take ANY date stamp, and try the merge, I am gonna try again this weekend.

And there are still bugs in a few places, we kill em as we find em

[RandomTiger]

Im sorry I cant help you with this, I still dont have net access at home. Perhaps you could contact me about the launcher though.

[Inquisitor]

No worries RT.

I thought you were gonna email me when you had the launcher in a ready state?

I'll email ya