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*
- Open Options menu through
Tools
>Options
- Under the
Diff
tab, setExternal Diff Tool
toCustom
- Set the
Diff Command
to[VS Install Directory]\Common7\IDE\vsDiffMerge.exe
, where[VS Install Directory]
is probablyC:\Program Files (x86)\Visual Studio 14.0
andArguments
to$LOCAL $REMOTE \\t
- Set
External Merge Tool
toCustom
- Set the
Diff Command
to[VS Install Directory]\Common7\IDE\vsDiffMerge.exe
, where[VS Install Directory]
is probablyC:\Program Files (x86)\Visual Studio 14.0
andArguments
to$LOCAL $REMOTE $BASE $MERGED \\m
####Usage
When a merge conflict is encountered in SourceTree:
- 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) - When Visual Studio Launches, select the correct changesets and make adjustments to resolve conflicts
- Click
Accept Merge
(small button in the directly above the split view to the left). The spilt view should be closed. - 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
- On the repo page in GitHub, change clone url from
SSH
toHTTPS
and copy the clone URL (above the repo file listing). - In SourceTree, click
Clone / New
. - In the dialog that appears paste the clone URL into the
Source Path / URL:
field - Set the
Destination Path:
to where ever you want the project - 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).