This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
.../UnityTestTools/Assertions/Editor/AssertionComponentEditor.cs | 3 --- | |
1 file changed, 3 deletions(-) | |
diff --git a/ProjectName/Assets/UnityTestTools/Assertions/Editor/AssertionComponentEditor.cs b/ProjectName/Assets/UnityTestTools/Assertions/Editor/AssertionComponentEditor.cs | |
index c5d19a0..90411fd 100644 | |
--- a/ProjectName/Assets/UnityTestTools/Assertions/Editor/AssertionComponentEditor.cs | |
+++ b/ProjectName/Assets/UnityTestTools/Assertions/Editor/AssertionComponentEditor.cs | |
@@ -201,9 +201,6 @@ namespace UnityTest | |
{ | |
foreach (var prop in script.Action.GetType ().GetFields (BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly)) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
import com.petebevin.markdown.MarkdownProcessor | |
import org.xhtmlrenderer.pdf.ITextRenderer | |
import org.ccil.cowan.tagsoup.Parser | |
import org.apache.xalan.xsltc.trax.SAX2DOM | |
import org.xml.sax.InputSource | |
buildscript{ | |
repositories { | |
mavenCentral() // i.e. http://repo1.maven.org/maven2 | |
maven { url "https://oss.sonatype.org/content/groups/scala-tools" } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git "a/C:\\Users\\User\\AppData\\Local\\Temp\\TortoiseGit\\MasEC0A.tmp\\MasterAudio-b3070d8-left.cs" "b/C:\\Users\\User\\Dev\\Unity3D\\MusicExperiments\\Assets\\DarkTonic\\MasterAudio\\Scripts\\Singleton\\MasterAudio.cs" | |
index 4d6ccf1..c9b20e9 100644 | |
--- "a/C:\\Users\\User\\AppData\\Local\\Temp\\TortoiseGit\\MasEC0A.tmp\\MasterAudio-b3070d8-left.cs" | |
+++ "b/C:\\Users\\User\\Dev\\Unity3D\\MusicExperiments\\Assets\\DarkTonic\\MasterAudio\\Scripts\\Singleton\\MasterAudio.cs" | |
@@ -1092,62 +1092,67 @@ public class MasterAudio : MonoBehaviour { | |
do { | |
playedState = PlaySoundIfAvailable(randomSource, sourcePosition, volumePercentage, pitch, _group, sourceTrans, attachToSource, delaySoundTime, useVector3, makePlaySoundResult); | |
- | |
- if (playedState != null && (playedState.SoundPlayed || playedState.SoundScheduled)) { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -ru C:\Users\User\Dev\Unity3D\FracturingNoChanges\Assets\Ultimate Game Tools\Fracturing\Editor\FracturedObjectEditor.cs C:\Users\User\Dev\Unity3D\SnowFallFracturedExperiment\Assets\Ultimate Game Tools\Fracturing\Editor\FracturedObjectEditor.cs | |
--- C:\Users\User\Dev\Unity3D\FracturingNoChanges\Assets\Ultimate Game Tools\Fracturing\Editor\FracturedObjectEditor.cs Tue Dec 10 20:01:47 2013 | |
+++ C:\Users\User\Dev\Unity3D\SnowFallFracturedExperiment\Assets\Ultimate Game Tools\Fracturing\Editor\FracturedObjectEditor.cs Sat Dec 21 18:24:45 2013 | |
@@ -56,6 +56,7 @@ | |
SerializedProperty PropEventDetachedMinLifeTime; | |
SerializedProperty PropEventDetachedMaxLifeTime; | |
SerializedProperty PropEventDetachedOffscreenLifeTime; | |
+ SerializedProperty PropEventDetachedDestroyRatherThanInactivate; | |
SerializedProperty PropEventDetachedMinMass; | |
SerializedProperty PropEventDetachedMinVelocity; |
NewerOlder