Hard Light Productions Forums

Modding, Mission Design, and Coding => FS2 Open Coding - The Source Code Project (SCP) => Topic started by: Bobboau on February 16, 2003, 06:28:53 pm

Title: mergeing DX8 branch
Post by: Bobboau on February 16, 2003, 06:28:53 pm

can we merge the DX8 branch,
I want vertex buffers

Title: mergeing DX8 branch
Post by: Inquisitor on February 16, 2003, 08:26:38 pm

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

Title: mergeing DX8 branch
Post by: RandomTiger on February 19, 2003, 07:23:09 am

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.

Title: mergeing DX8 branch
Post by: Inquisitor on February 20, 2003, 06:11:43 pm

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 :)

Title: mergeing DX8 branch
Post by: RandomTiger on February 21, 2003, 07:03:33 am

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.

Title: mergeing DX8 branch
Post by: Inquisitor on February 21, 2003, 01:29:30 pm

No worries RT.

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

I'll email ya :)