For merging new code I found the easiest way is http://kdiff3.sourceforge.net/
make sure you have the vanilla copy of your previous codebase (ep1 scratch sdk) add your modified codebase (ep1 scratch sdk) then set the new codebase ep2 scratch sdk takes a day or so though to work out manual merges, mostly smooth last time I did it though. On Feb 13, 2008 9:16 PM, Dylan <[EMAIL PROTECTED]> wrote: > On a related note I have a couple of questions. > Is there going to be a beta sdk update alongside the big TF2 update? > If so may we see a changelog? > -------------------------------------------------- > From: "dave daveslastname" <[EMAIL PROTECTED]> > Sent: Wednesday, February 13, 2008 8:51 PM > To: <[email protected]> > Subject: [hlcoders] When is OB SDK coming out of beta? Also, difficultly in > merging code? > > > -- > > > [ Picked text/plain from multipart/alternative ] > > I have two questions for the more experienced: > > > > First, when is the OB / EP2 codebase coming out of it's beta status? We're > > going to be porting our mod's source code to the new engine, but don't > > want > > to do so until it's out of this experimental stage. > > > > Second, for those of you have done it or are currently doing it, how hard > > is > > it to merge EP1 code (we're using the scratch SDK) into the EP2 engine? > > How > > long will it take and what obstacles can we be expected to run into? > > > > Thanks in advance! > > -- > > > > _______________________________________________ > > To unsubscribe, edit your list preferences, or view the list archives, > > please visit: > > http://list.valvesoftware.com/mailman/listinfo/hlcoders > > > > > > _______________________________________________ > To unsubscribe, edit your list preferences, or view the list archives, please > visit: > http://list.valvesoftware.com/mailman/listinfo/hlcoders > > _______________________________________________ To unsubscribe, edit your list preferences, or view the list archives, please visit: http://list.valvesoftware.com/mailman/listinfo/hlcoders
