Originally posted by Mikand79
View Post
Announcement
Collapse
No announcement yet.
NVIDIA GameWorks Integration
Collapse
X
-
Why not, clone it from my github repo and checkout branch 4.6-integrating, it contains the substance plugin and the nv branches. Don't overwrite files when setup.cmd downloads dependencies.
Though I dont guarantee I did it right, that it works at all, and I don't support it. If you computer blows, I didnt do it
And the branch will not be there forever.
Comment
-
Originally posted by Mikand79 View PostWhy not, clone it from my github repo https://github.com/eAlex79/UnrealEng....6-integrating and checkout branch 4.6-integrating, it contains the substance plugin and the nv branches. Don't overwrite files when setup.cmd downloads dependencies.
Though I dont guarantee I did it right, that it works at all, and I don't support it. If you computer blows, I didnt do it
And the branch will not be there forever.
Comment
-
Originally posted by Mikand79 View PostI think Mike Skolones said further up that one doesn't need to merge HBAO+ to the VXGI as VXGI has its voxel AO or stuff.
The merge errors are easy though, they aren't real conflicts but git doesn't know if its right to keep the changes from both branches.
So edit the files with conflict and remove the <<<<<<, ======= and >>>>>> messages until it looks reasonable again (think while you do) and then 'git add' the changed file, after you done all files 'git commit' will complete the merge.
------------------------------------------------------------------------------
Originally posted by Gandosh View Postim new to this whole programming thing. I have no idea how this github works and was waiting for merged version from mike. Is it possible to get merged version from you?
Originally posted by Mike.Skolones View PostYou _should_ be able to merge the branches into a single branch (for example, called 'AllFeatures'). You would do:- git checkout release (switch to standard 4.6.1 release branch)
- git branch AllFeatures (make a new branch from it)
- git checkout AllFeatures (switch to the new branch)
- git merge Flex (merge all the changes from the Flex branch, which should work fine because the FleX branch started out as the release branch)
- compile the AllFeatures branch to make sure the merge worked OK.
- git merge WaveWorks (merge all the changes from the WaveWorks branch, the WaveWorks branch also started out as the release branch)
Then you would try to compile the combined branch. This is what I intend to do when we get the VXGI, HairWorks, TurfEffects, etc., up and running.
Originally posted by Mikand79 View PostWhy not, clone it from my github repo https://github.com/eAlex79/UnrealEng....6-integrating and checkout branch 4.6-integrating, it contains the substance plugin and the nv branches. Don't overwrite files when setup.cmd downloads dependencies.
Though I dont guarantee I did it right, that it works at all, and I don't support it. If you computer blows, I didnt do it
And the branch will not be there forever.Last edited by rabellogp; 03-02-2015, 09:53 AM.
Comment
-
Originally posted by rabellogp View PostIt's not hard at all. Just download the github windows client, clone the release and you don't even need to use a console to manage the branches. But I think it's even easier with the console, just right click on your clone inside github windows client, choose "Open in Git Shell" and follow these instructions:
thank you!
Comment
-
Originally posted by Mikand79 View PostGreat so now I don't have to test it myself. lol
If I broke something, tell me
Comment
-
According to this schedule: https://developer.nvidia.com/gdc-2015 Nvidia conference will start soon but there is no link where to watch it. Anyone maanged to find a live stream for this? It seems Mike is at GDC now.
Comment
-
No, didn't find any live stream for that, but would love to see that though :/STONE RAGE
StoneRage Steam: https://store.steampowered.com/app/640860/Stone_Rage/
https://stoneragegame.com/
Comment
-
hey unreal just became free... Sooo... what the hell? all these gworks comes for free?Last edited by Gandosh; 03-02-2015, 01:20 PM.
Comment
-
Originally posted by Gandosh View Posthey unreal just became free... Sooo... what the hell? all these gworks comes for free?
Comment
-
Originally posted by Mike.Skolones
http://www.ign.com/articles/2015/02/...ht-here-on-ign
--MikeLast edited by Mike.Skolones; 03-02-2015, 02:56 PM.
Comment
-
Originally posted by Mike.Skolones View PostYou were already getting these GW integrations with your UE4 license, via Github. Now there is no subscription fee for UE4, but that doesn't change anything with GW.
Comment
-
Originally posted by fdslk View PostSo, only for licenses who have their github account associated? I entered that link Mike, but they were talking about robots
Comment
-
Originally posted by Mike.Skolones View PostThe IGN link? Yes, I'm sure there will be a lot of content that seems unrelated to GameWorks and UE4. I'm not sure what you mean by "...for licensees who have their github account..."
Comment
Comment