Merge remote-tracking branch 'origin/master'

.gitignore

@@ -48,6 +48,10 @@ Makefile.me
 *.settings
 *.cbp
 *.layout
+*.config
+*.creator
+*.files
+*.includes
 config.log
 *.sconsign.dblite
 *.sconf_temp

src/simulation/elements/FIRW.cpp

@@ -32,7 +32,7 @@ Element_FIRW::Element_FIRW()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 70;
-	Description = "Fireworks! Colorful, set off by fire";
+	Description = "Fireworks! Colorful, set off by fire.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_PART|PROP_LIFE_DEC;

src/simulation/elements/FRAY.cpp

@@ -28,7 +28,7 @@ Element_FRAY::Element_FRAY()
 	
 	Temperature = 20.0f+0.0f +273.15f;
 	HeatConduct = 0;
-	Description = "Force Emitter. Pushes or pulls objects based on its temp value. Use like ARAY.";
+	Description = "Force Emitter. Pushes or pulls objects based on its temperature. Use like ARAY.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID|PROP_LIFE_DEC;

src/simulation/elements/METL.cpp

@@ -28,7 +28,7 @@ Element_METL::Element_METL()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 251;
-	Description = "The basic conductor, meltable and breaks under pressure.";
+	Description = "The basic conductor. Meltable.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID|PROP_CONDUCTS|PROP_LIFE_DEC|PROP_HOT_GLOW;

src/simulation/elements/PRTI.cpp

@@ -28,7 +28,7 @@ Element_PRTI::Element_PRTI()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 0;
-	Description = "Portal IN. Particles go in here. Also has temperature dependent channels (same as WIFI)";
+	Description = "Portal IN. Particles go in here. Also has temperature dependent channels. (same as WIFI)";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;

src/simulation/elements/PRTO.cpp

@@ -28,7 +28,7 @@ Element_PRTO::Element_PRTO()
 	
 	Temperature = R_TEMP+0.0f	+273.15f;
 	HeatConduct = 0;
-	Description = "Portal OUT. Particles come out here. Also has temperature dependent channels (same as WIFI)";
+	Description = "Portal OUT. Particles come out here. Also has temperature dependent channels. (same as WIFI)";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;

src/simulation/elements/VIBR.cpp

@@ -157,7 +157,7 @@ int Element_VIBR::update(UPDATE_FUNC_ARGS) {
 					{
 						if (!parts[r>>8].life)
 							parts[r>>8].tmp += 45;
-						else if (parts[i].tmp2 && rand()%2)
+						else if (parts[i].tmp2 && parts[i].life > 75 && rand()%2)
 						{
 							parts[r>>8].tmp2 = 1;
 							parts[i].tmp = 0;

src/simulation/elements/WIRE.cpp

@@ -28,7 +28,7 @@ Element_WIRE::Element_WIRE()
 	
 	Temperature = R_TEMP+0.0f +273.15f;
 	HeatConduct = 250;
-	Description = "WireWorld wires, conducts based on a set of GOL-like rules";
+	Description = "WireWorld wires, conducts based on a set of GOL-like rules.";
 	
 	State = ST_SOLID;
 	Properties = TYPE_SOLID;