1.4.2 Merge
by Andrew Hull · in · 09/14/2006 (8:37 pm) · 13 replies
Has anyone successfully merged TLK and 1.4.2 CVS version?
About the author
#2
09/18/2006 (8:55 am)
OH! Awesome. I guess i'll just wait for the official release then, unless i get really bored. Thanks John. 
#3
09/18/2006 (9:20 am)
Not to damp things but is there estimate date on 1.4.2 or 1.5 release. I to find myself in place that I will have to merge TLK 1.4 with TGE 1.4.2 if TGE 1.4.2 or 1.5 does not come out soon. Thanks!
#4
If TGE 1.4.2 isn't officially out yet then it's probably not done, meaning you'll need to do another merge again when it comes out.
09/18/2006 (5:59 pm)
I recommend using TLK 1.4.If TGE 1.4.2 isn't officially out yet then it's probably not done, meaning you'll need to do another merge again when it comes out.
#6
@John: (if you're still watching this thread) Is there any easier way to merge only things surrounded by //Lighting Pack comment blocks? I read through the Getting Started PDF and tried to follow most of it, but 238 something different files is a lot to try and go through by hand!
09/18/2006 (8:47 pm)
I don't know... there are certainly a lot of nice bug fixes/additions even just with what's already in CVS. @John: (if you're still watching this thread) Is there any easier way to merge only things surrounded by //Lighting Pack comment blocks? I read through the Getting Started PDF and tried to follow most of it, but 238 something different files is a lot to try and go through by hand!
#7
SVN users have a technique called vendor drops, but in reality pretty much any version control system can do it.
svnbook.red-bean.com/en/1.0/ch07s04.html
Basically, the idea is to keep a series of branches related to vendor (aka GG) modifications. With these branches it's easy to take a newly released version of TGE / TLK and have the computer compare it against the last version and create a patch. You can apply this patch to your existing trunk code with minimal effort.
09/18/2006 (9:30 pm)
Download and use Subversion (SVN) for all of your version control needs. If not SVN, then at least use something for version control.SVN users have a technique called vendor drops, but in reality pretty much any version control system can do it.
svnbook.red-bean.com/en/1.0/ch07s04.html
Basically, the idea is to keep a series of branches related to vendor (aka GG) modifications. With these branches it's easy to take a newly released version of TGE / TLK and have the computer compare it against the last version and create a patch. You can apply this patch to your existing trunk code with minimal effort.
#8
10/15/2006 (1:28 pm)
I merged 1.4.2 and TLK using winmerge, took about and hour, it's not hard. 
#10
10/28/2006 (8:21 pm)
There is no official 1.4.2, AFAIK. TGE 1.5 just came out, which now has the Lighting Kit integrated into the engine.
#11
10/28/2006 (11:12 pm)
As far as I know TGE 1.4.2 was just released - this is the first I've heard of it being out. Based on the usual turnaround time for this sort of things, it will be a little while, but yes we'll definitely release a 1.4.2 version of TLK.
#12
10/29/2006 (1:40 pm)
Great to hear, I am looking forward to the fixes and especialy the sweet new shadows that Duncan Gray and others have been doing. 
#13
11/05/2006 (12:55 am)
Great. The 1.4.2 merge is on the products page. 
Torque Owner John Kabus (BobTheCBuilder)
The TGE 1.4 and 1.4.2 codebases are very similar, merging TLK 1.4 into TGE 1.4.2 should be relatively easy. If you want to wait TLK 1.4.2 will be out as soon as TGE 1.4.2 is officially released.