chriscalef Posted April 17, 2015 Posted April 17, 2015 Just a quick note to say Hi, I LOVE YOU GUYS! Hugs and kisses all around. Quote
JeffR Posted April 22, 2015 Posted April 22, 2015 *Where (will you?) be wanting that type of thing pushed?Actually, I'm not really sure... feel free to make suggestions.On a related note, I'm trying to figure out the best strategy for branches. Currently the AFX-fork's master branch just modifies the T3D master which seems straight-forward and obvious. I'm not really sure what to do with the AFX-fork's development branch in its current form, but would like to have a branch which effectively starts with the AFX-fork's master and folds in changes from T3D development and then continues to track the T3D development branch at some reasonable frequency. So you want to take what's currently in the master branch, and roll it into the development branch, and after that keep the dev branch more or less alongside the main repo's dev branch?I believe the best route for that would be to pull down the AFX-master. And then pull down the main repo dev branch, and run a merge on it of the stuff in the afx-master branch. If the merge works, that'll be the changes in afx-master with the main-development. Then you can push that branch to the afx-development on github. If that all works, you'd just need to periodically pull down main-development and do a merge to roll in the changes that have been made and push back to your afx-development branch on github.Buckmaster's got more git-fu than me, so he could critique my idea, but I believe that should work. Quote
NekoDemon117 Posted April 26, 2015 Posted April 26, 2015 I can't get it to work. When I load a level, it gets stuck at "Loading Datablocks" and never makes it past it. Quote
Faustlogic Posted April 26, 2015 Posted April 26, 2015 @NekoDemon117 - If you're looking for feedback, you are going to have to provide a little more context regarding the steps that lead you to a failure state. An infinite number of possible scenarios might produce the exact same outcome you describe. You need to narrow down the problem space a bit.All I can say is that at least six of the most generic paths I can think of for testing the projects available with the Torque3D-plus-AFX repo, all produce the intended outcome, and none get stuck at "Loading Datablocks". Quote
Azaezel Posted May 20, 2015 Posted May 20, 2015 Sorry for the long delay there. No excuses. Would say something along the lines of...AFX_Development would be the type of thing I'd look to PR to you when it comes to stuff like https://github.com/Azaezel/Torque3D/commit/0ed95d25df3409deb47fe81f8095d50b9531f010 since that touches on afx and afx alone, while anAFX_Integration would be the type of thing I'd personally look for for stuff like https://github.com/Azaezel/Torque3D/commits/afx_full which brings it up to main repo development spec. (well, at that point)The question has also come up in up in another thread of how much of this stuff you want to continue maintaining yourself, and how much you'd prefer the community to take responsibility for? Quote
Azaezel Posted June 24, 2015 Posted June 24, 2015 @Faustlogic: 3.7 finally dropping reminded me still hadn't thrown over those opengl file alts publicly yet. Those'll be sitting in the afx_full queue. Also found a pinhole leak in the validators for afxMagicMissile. that one's sitting in the afx_alts queue. Just want a clean PR tossed your way straight to your master fork bringing it up to 3.7 spec next time I get a chance to come up for air? Quote
Azaezel Posted August 8, 2015 Posted August 8, 2015 Since 3.8 is rounding the bend and I (finally) got an ubuntu dual-boot up and running, couple more adds to support that end once there's a place to stick em: https://github.com/Azaezel/Torque3D/commit/6c3f0e21289ede3771c19866a64dabc3bb767a75 +https://github.com/Azaezel/Torque3D/commit/1635484a83dcb0812a4d336f706004f579151973 Quote
Chelaru Posted September 4, 2015 Posted September 4, 2015 Hey.Would ArcaneFx be a part of the main line of T3D? Quote
Recommended Posts
Join the conversation
You can post now and register later. If you have an account, sign in now to post with your account.