Merge branch 'master' into new-netcode

Conflicts: Subsurface/Source/Characters/Character.cs Subsurface/Source/GUI/GUI.cs Subsurface/Source/GUI/LoadingScreen.cs
2017-02-13 22:04:28 +02:00
parent bfc22c7b33 1ea3044fd6
commit 7f7ac76484
17 changed files with 137 additions and 17 deletions
@@ -49,3 +49,8 @@
 /processorParam:DebugMode=Auto
 /build:damageshader.fx

+#begin utg_4.mp4
+/importer:H264Importer
+/processor:VideoProcessor
+/build:utg_4.mp4
+