| # Loads a scene in the background using a seperate thread and a queue. | |
| # Foreach new scene there will be an instance of ResourceInteractiveLoader | |
| # that will raise an on_scene_loaded event once the scene has been loaded. | |
| # Hooking the on_progress event will give you the current progress of any | |
| # scene that is being processed in realtime. The loader also uses caching | |
| # to avoid duplicate loading of scenes and it will prevent loading the | |
| # same scene multiple times concurrently. | |
| # | |
| # Sample usage: | |
| # |
Setting up p4merge
as diff and merge tool on Windows. Tried for Git version 1.8.4.msysgit.0.
Two alternatives are explained: using the command line, and directly editing the config file.
Being the installation path "C:Program Files\Perforce\p4merge.exe", just run:
$ git config --global diff.tool p4merge