Skip to content
master
Switch branches/tags
Go to file
Code

Latest commit

 

Git stats

Files

Permalink
Failed to load latest commit information.
Type
Name
Latest commit message
Commit time
 
 
 
 
 
 
 
 
 
 
 
 

README.md

SoulTrain

VS Tools for Unity must be re-installed for the project to compile on a lab machine!

###Recommended Tools:

  • Visual Studio 2015
  • Unity 5.2(.4)
  • SourceTree (1.7)
  • Maya 2016

###Using Visual Studio as Diff Tool in Source Tree

####Setup*

  1. Open Options menu through Tools > Options
  2. Under the Diff tab, set External Diff Tool to Custom
  3. Set the Diff Command to [VS Install Directory]\Common7\IDE\vsDiffMerge.exe, where [VS Install Directory] is probably C:\Program Files (x86)\Visual Studio 14.0 and Arguments to $LOCAL $REMOTE \\t
  4. Set External Merge Tool to Custom
  5. Set the Diff Command to [VS Install Directory]\Common7\IDE\vsDiffMerge.exe, where [VS Install Directory] is probably C:\Program Files (x86)\Visual Studio 14.0 and Arguments to $LOCAL $REMOTE $BASE $MERGED \\m

*Source

####Usage

When a merge conflict is encountered in SourceTree:

  1. Right click on the conflicted file and select Resolve Conflicts > Launch External Merge Tool (note: Visual Studio may take a few seconds to start up)
  2. When Visual Studio Launches, select the correct changesets and make adjustments to resolve conflicts
  3. Click Accept Merge (small button in the directly above the split view to the left). The spilt view should be closed.
  4. When you focus back to SourceTree, the merged file should be automatically Staged and a [conflicted file].orig created. The .orig file can be safely deleted.

###Project Setup

  1. On the repo page in GitHub, change clone url from SSH to HTTPS and copy the clone URL (above the repo file listing).
  2. In SourceTree, click Clone / New.
  3. In the dialog that appears paste the clone URL into the Source Path / URL: field
  4. Set the Destination Path: to where ever you want the project
  5. Click Clone

####Visual Studio Tools for Unity (VS 2015)*

Better integration between Visual Studio and Unity, allows VS breakpoints and inspection

Download VS Tools for Unity and complete setup

For Editor debugging, run "Attch to Unity" in Visual Studio, then run the game from Unity. Warning: Pausing from VS crashes Unity.

For Build debugging In Unity, open the Build Settings dialog under File > Build Settings and check Development Build and Script Debugging (haven't actually gotten this to work).

*Source

About

No description, website, or topics provided.

Resources

License

Releases

No releases published

Packages

No packages published

Contributors 4

  •  
  •  
  •  
  •