Merge branch 'development' into null-activity

Causeless · web-flow · commit 5a80149ad611 · 2024-02-14T22:12:28.000Z
diff --git a/Data/Base.rte/Devices/Shared.ini b/Data/Base.rte/Devices/Shared.ini
@@ -141,6 +141,7 @@ AddAmmo = Round
 	FireVelocity = 75
 	ShellVelocity = 10
 	Separation = 5
+	LifeVariation = 0.1
 
 
 AddAmmo = Round
diff --git a/Data/Base.rte/Shaders/Blit8.frag b/Data/Base.rte/Shaders/Blit8.frag
@@ -1,5 +1,5 @@
 // Blit8.frag
-#version 330 core
+#version 130
 
 in vec2 textureUV;
 
diff --git a/Data/Base.rte/Shaders/Blit8.vert b/Data/Base.rte/Shaders/Blit8.vert
@@ -1,7 +1,7 @@
-#version 330 core
+#version 130
 
-layout(location = 0) in vec2 rteVertexPosition;
-layout(location = 1) in vec2 rteTexUV;
+in vec2 rteVertexPosition;
+in vec2 rteTexUV;
 
 out vec2 textureUV;
 
diff --git a/Data/Base.rte/Shaders/PostProcess.frag b/Data/Base.rte/Shaders/PostProcess.frag
@@ -1,4 +1,4 @@
-#version 330 core
+#version 130
 
 in vec2 textureUV;
 
diff --git a/Data/Base.rte/Shaders/PostProcess.vert b/Data/Base.rte/Shaders/PostProcess.vert
@@ -1,7 +1,7 @@
-#version 330 core
+#version 130
 
-layout(location = 0) in vec2 rteVertexPosition;
-layout(location = 1) in vec2 rteTexUV;
+in vec2 rteVertexPosition;
+in vec2 rteTexUV;
 
 out vec2 textureUV;
 
diff --git a/Data/Base.rte/Shaders/ScreenBlit.frag b/Data/Base.rte/Shaders/ScreenBlit.frag
@@ -1,4 +1,4 @@
-#version 330 core
+#version 130
 
 in vec2 textureUV;
 
diff --git a/Data/Base.rte/Shaders/ScreenBlit.vert b/Data/Base.rte/Shaders/ScreenBlit.vert
@@ -1,7 +1,7 @@
-#version 330 core
+#version 130
 
-layout(location = 0) in vec2 rteVertexPosition;
-layout(location = 1) in vec2 rteTexUV;
+in vec2 rteVertexPosition;
+in vec2 rteTexUV;
 
 out vec2 textureUV;
 
diff --git a/Data/Browncoats.rte/Devices/Weapons/Backblast/Backblast.ini b/Data/Browncoats.rte/Devices/Weapons/Backblast/Backblast.ini
@@ -133,6 +133,7 @@ AddAmmo = Round
 	AIFireVel = 100
 	AILifeTime = 300
 	Separation = 1
+	LifeVariation = 0.1
 
 
 AddEffect = MOSRotating
diff --git a/Data/Browncoats.rte/Devices/Weapons/Extinction/Extinction.ini b/Data/Browncoats.rte/Devices/Weapons/Extinction/Extinction.ini
@@ -183,6 +183,7 @@ AddAmmo = Round
 	FireVelocity = 135
 	ShellVelocity = 5
 	Separation = 0
+	LifeVariation = 0.1
 
 
 AddAmmo = Magazine
diff --git a/Data/Browncoats.rte/Devices/Weapons/Jackhammer/Jackhammer.ini b/Data/Browncoats.rte/Devices/Weapons/Jackhammer/Jackhammer.ini
@@ -95,6 +95,7 @@ AddAmmo = Round
 	AILifeTime = 400
 	ShellVelocity = 12
 	Separation = 1
+	LifeVariation = 0.1
 
 
 AddAmmo = Round
diff --git a/Data/Browncoats.rte/Devices/Weapons/Manbreaker/Manbreaker.ini b/Data/Browncoats.rte/Devices/Weapons/Manbreaker/Manbreaker.ini
@@ -247,6 +247,7 @@ AddAmmo = Round
 	FireVelocity = 120
 	ShellVelocity = 5
 	Separation = 0
+	LifeVariation = 0.1
 	
 AddAmmo = Round
 	PresetName = Tracer Browncoat MG-85
diff --git a/Data/Browncoats.rte/Devices/Weapons/Stinger/Stinger.ini b/Data/Browncoats.rte/Devices/Weapons/Stinger/Stinger.ini
@@ -64,6 +64,7 @@ AddAmmo = Round
 	FireVelocity = 90
 	ShellVelocity = 12
 	Separation = 0
+	LifeVariation = 0.1
 
  
 AddAmmo = Magazine
diff --git a/Data/Browncoats.rte/Devices/Weapons/Stormbringer/Stormbringer.ini b/Data/Browncoats.rte/Devices/Weapons/Stormbringer/Stormbringer.ini
@@ -42,6 +42,7 @@ AddAmmo = Round
 	FireVelocity = 160
 	ShellVelocity = 12
 	Separation = 1
+	LifeVariation = 0.1
 
 
 AddAmmo = Magazine
diff --git a/Data/Browncoats.rte/Devices/Weapons/Trailblazer/Trailblazer.ini b/Data/Browncoats.rte/Devices/Weapons/Trailblazer/Trailblazer.ini
@@ -68,6 +68,7 @@ AddAmmo = Round
 	FireVelocity = 120
 	ShellVelocity = 12
 	Separation = 1
+	LifeVariation = 0.1
 
 
 AddAmmo = Magazine
diff --git a/Data/Coalition.rte/Devices/Weapons/AutoPistol/AutoPistol.ini b/Data/Coalition.rte/Devices/Weapons/AutoPistol/AutoPistol.ini
@@ -12,6 +12,7 @@ AddAmmo = Round
 	FireVelocity = 77
 	ShellVelocity = 8
 	Separation = 10
+	LifeVariation = 0.1
 
 
 AddAmmo = Magazine
diff --git a/Data/Coalition.rte/Devices/Weapons/CompactAssaultRifle/CompactAssaultRifle.ini b/Data/Coalition.rte/Devices/Weapons/CompactAssaultRifle/CompactAssaultRifle.ini
@@ -32,6 +32,7 @@ AddAmmo = Round
 	FireVelocity = 90
 	ShellVelocity = 12
 	Separation = 0
+	LifeVariation = 0.1
 
 	
 AddAmmo = Round
diff --git a/Data/Coalition.rte/Devices/Weapons/GatlingGun/GatlingGun.ini b/Data/Coalition.rte/Devices/Weapons/GatlingGun/GatlingGun.ini
@@ -58,6 +58,7 @@ AddAmmo = Round
 	LifeVariation = 0.5
 	ShellVelocity = 9
 	Separation = 0
+	LifeVariation = 0.1
 
 
 AddAmmo = Round
diff --git a/Data/Coalition.rte/Devices/Weapons/HeavyPistol/HeavyPistol.ini b/Data/Coalition.rte/Devices/Weapons/HeavyPistol/HeavyPistol.ini
@@ -32,6 +32,7 @@ AddAmmo = Round
 	LifeVariation = 0.2
 	ShellVelocity = 8
 	Separation = 5
+	LifeVariation = 0.1
 
 
 AddAmmo = Magazine
diff --git a/Data/Coalition.rte/Devices/Weapons/Pistol/Pistol.ini b/Data/Coalition.rte/Devices/Weapons/Pistol/Pistol.ini
@@ -31,6 +31,7 @@ AddAmmo = Round
 	FireVelocity = 79
 	ShellVelocity = 8
 	Separation = 10
+	LifeVariation = 0.1
 
 
 AddAmmo = Magazine
diff --git a/Data/Coalition.rte/Devices/Weapons/SniperRifle/SniperRifle.ini b/Data/Coalition.rte/Devices/Weapons/SniperRifle/SniperRifle.ini
@@ -32,6 +32,7 @@ AddAmmo = Round
 	FireVelocity = 140
 	ShellVelocity = 10
 	Separation = 0.1
+	LifeVariation = 0.1
 
 
 AddAmmo = Magazine
diff --git a/Data/Dummy.rte/Devices/Weapons/Annihilator/Annihilator.ini b/Data/Dummy.rte/Devices/Weapons/Annihilator/Annihilator.ini
@@ -109,6 +109,7 @@ AddAmmo = Round
 		CopyOf = Null Bullet
 	FireVelocity = 100
 	Separation = 0
+	LifeVariation = 0.1
 
 
 AddAmmo = Magazine
diff --git a/Data/Dummy.rte/Devices/Weapons/BlasterRifle/BlasterRifle.ini b/Data/Dummy.rte/Devices/Weapons/BlasterRifle/BlasterRifle.ini
@@ -67,6 +67,7 @@ AddAmmo = Round
 	FireVelocity = 100
 	ShellVelocity = 3
 	Separation = 5
+	LifeVariation = 0.1
 
 
 AddAmmo = Magazine
diff --git a/Data/Dummy.rte/Devices/Weapons/FragNailer/FragNailer.ini b/Data/Dummy.rte/Devices/Weapons/FragNailer/FragNailer.ini
@@ -123,6 +123,7 @@ AddAmmo = Round
 		CopyOf = Particle Dummy Frag Nailer Bomb
 	FireVelocity = 50
 	Separation = 0
+	LifeVariation = 0.1
 
 
 AddAmmo = Magazine
diff --git a/Data/Dummy.rte/Devices/Weapons/Nailgun/Nailgun.ini b/Data/Dummy.rte/Devices/Weapons/Nailgun/Nailgun.ini
@@ -38,6 +38,7 @@ AddAmmo = Round
 	FireVelocity = 75
 	ShellVelocity = 0
 	Separation = 5
+	LifeVariation = 0.6
 
 
 AddAmmo = Magazine
diff --git a/Data/Dummy.rte/Devices/Weapons/RailPistol/RailPistol.ini b/Data/Dummy.rte/Devices/Weapons/RailPistol/RailPistol.ini
@@ -39,6 +39,7 @@ AddAmmo = Round
 	LifeVariation = 0.5
 	ShellVelocity = 13
 	Separation = 5
+	LifeVariation = 0.1
 
 
 AddAmmo = Magazine
diff --git a/Data/Dummy.rte/Devices/Weapons/Repeater/Repeater.ini b/Data/Dummy.rte/Devices/Weapons/Repeater/Repeater.ini
@@ -60,6 +60,7 @@ AddAmmo = Round
 	FireVelocity = 100
 	ShellVelocity = 3
 	Separation = 5
+	LifeVariation = 0.1
 
 
 AddAmmo = Magazine
diff --git a/Data/Dummy.rte/Devices/Weapons/ScoutingRifle/ScoutingRifle.ini b/Data/Dummy.rte/Devices/Weapons/ScoutingRifle/ScoutingRifle.ini
@@ -29,6 +29,7 @@ AddAmmo = Round
 	FireVelocity = 190
 	ShellVelocity = 13
 	Separation = 0
+	LifeVariation = 0.1
 
 
 AddAmmo = Magazine
diff --git a/Data/Imperatus.rte/Devices/Weapons/Banshee/Banshee.ini b/Data/Imperatus.rte/Devices/Weapons/Banshee/Banshee.ini
@@ -130,6 +130,7 @@ AddAmmo = Round
 	FireVelocity = 160
 	ShellVelocity = 10
 	Separation = 0
+	LifeVariation = 0.1
 
 
 AddAmmo = Magazine
diff --git a/Data/Imperatus.rte/Devices/Weapons/Bulldog/Bulldog.ini b/Data/Imperatus.rte/Devices/Weapons/Bulldog/Bulldog.ini
@@ -32,6 +32,7 @@ AddAmmo = Round
 	FireVelocity = 133
 	ShellVelocity = 9
 	Separation = 1
+	LifeVariation = 0.1
 
 
 AddAmmo = Round
diff --git a/Data/Imperatus.rte/Devices/Weapons/Bullpup/Bullpup.ini b/Data/Imperatus.rte/Devices/Weapons/Bullpup/Bullpup.ini
@@ -32,6 +32,7 @@ AddAmmo = Round
 	FireVelocity = 120
 	ShellVelocity = 8
 	Separation = 0.1
+	LifeVariation = 0.1
 
 
 AddAmmo = Round
diff --git a/Data/Imperatus.rte/Devices/Weapons/Chunker/Chunker.ini b/Data/Imperatus.rte/Devices/Weapons/Chunker/Chunker.ini
@@ -31,7 +31,6 @@ AddAmmo = Round
 	FireVelocity = 80
 	LifeVariation = 0.2
 	ShellVelocity = 10
-	Separation = 4
 
 
 AddAmmo = Magazine
diff --git a/Data/Imperatus.rte/Devices/Weapons/Devastator/Devastator.ini b/Data/Imperatus.rte/Devices/Weapons/Devastator/Devastator.ini
@@ -141,6 +141,7 @@ AddAmmo = Round
 	FireVelocity = 80
 	ShellVelocity = 10
 	Separation = 5
+	LifeVariation = 0.1
 
 
 AddAmmo = Magazine
diff --git a/Data/Imperatus.rte/Devices/Weapons/Marauder/Marauder.ini b/Data/Imperatus.rte/Devices/Weapons/Marauder/Marauder.ini
@@ -61,6 +61,7 @@ AddAmmo = Round
 	FireVelocity = 100
 	ShellVelocity = 2
 	Separation = 1
+	LifeVariation = 0.1
 
 
 AddAmmo = Magazine
diff --git a/Data/Imperatus.rte/Devices/Weapons/Slugger/Slugger.ini b/Data/Imperatus.rte/Devices/Weapons/Slugger/Slugger.ini
@@ -113,6 +113,7 @@ AddAmmo = Magazine
 		FireVelocity = 30
 		ShellVelocity = 8
 		Separation = 5
+		LifeVariation = 0.1
 	Discardable = 0
 	AIBlastRadius = 20
 
diff --git a/Data/Ronin.rte/Devices/Weapons/357Magnum/357Magnum.ini b/Data/Ronin.rte/Devices/Weapons/357Magnum/357Magnum.ini
@@ -33,6 +33,7 @@ AddAmmo = Round
 	FireVelocity = 94
 	LifeVariation = 0.1
 	Separation = 0.01
+	LifeVariation = 0.1
 
 
 AddAmmo = Magazine
diff --git a/Data/Ronin.rte/Devices/Weapons/AK47/AK47.ini b/Data/Ronin.rte/Devices/Weapons/AK47/AK47.ini
@@ -32,6 +32,7 @@ AddAmmo = Round
 	FireVelocity = 100
 	ShellVelocity = 12
 	Separation = 0
+	LifeVariation = 0.1
 
 
 AddAmmo = Round
diff --git a/Data/Ronin.rte/Devices/Weapons/Beretta93R/Beretta93R.ini b/Data/Ronin.rte/Devices/Weapons/Beretta93R/Beretta93R.ini
@@ -31,6 +31,7 @@ AddAmmo = Round
 	FireVelocity = 75
 	ShellVelocity = 12
 	Separation = 0
+	LifeVariation = 0.1
 
 
 AddAmmo = Magazine
diff --git a/Data/Ronin.rte/Devices/Weapons/DesertEagle/DesertEagle.ini b/Data/Ronin.rte/Devices/Weapons/DesertEagle/DesertEagle.ini
@@ -30,6 +30,7 @@ AddAmmo = Round
 	FireVelocity = 105
 	LifeVariation = 0.2
 	Separation = 0.1
+	LifeVariation = 0.1
 	Shell = MOSParticle
 		CopyOf = Casing
 	ShellVelocity = 13
diff --git a/Data/Ronin.rte/Devices/Weapons/DoubleBarreledShotgun/DoubleBarreledShotgun.ini b/Data/Ronin.rte/Devices/Weapons/DoubleBarreledShotgun/DoubleBarreledShotgun.ini
@@ -47,6 +47,7 @@ AddAmmo = Round
 	LifeVariation = 0.3
 	ShellVelocity = 5
 	Separation = 8
+	LifeVariation = 0.1
 
 
 AddAmmo = Magazine
diff --git a/Data/Ronin.rte/Devices/Weapons/LugerP08/LugerP08.ini b/Data/Ronin.rte/Devices/Weapons/LugerP08/LugerP08.ini
@@ -31,6 +31,7 @@ AddAmmo = Round
 	FireVelocity = 75
 	ShellVelocity = 12
 	Separation = 0
+	LifeVariation = 0.1
 
 
 AddAmmo = Magazine
diff --git a/Data/Ronin.rte/Devices/Weapons/M16A2/M16A2.ini b/Data/Ronin.rte/Devices/Weapons/M16A2/M16A2.ini
@@ -32,6 +32,7 @@ AddAmmo = Round
 	FireVelocity = 100
 	ShellVelocity = 12
 	Separation = 0
+	LifeVariation = 0.1
 
 
 AddAmmo = Round
diff --git a/Data/Ronin.rte/Devices/Weapons/M1Garand/M1Garand.ini b/Data/Ronin.rte/Devices/Weapons/M1Garand/M1Garand.ini
@@ -46,6 +46,7 @@ AddAmmo = Round
 	FireVelocity = 120
 	ShellVelocity = 10
 	Separation = 1
+	LifeVariation = 0.1
 
 
 AddAmmo = Magazine
diff --git a/Data/Ronin.rte/Devices/Weapons/M60/M60.ini b/Data/Ronin.rte/Devices/Weapons/M60/M60.ini
@@ -32,6 +32,7 @@ AddAmmo = Round
 	FireVelocity = 120
 	ShellVelocity = 12
 	Separation = 1
+	LifeVariation = 0.1
 
 
 AddAmmo = Round
diff --git a/Data/Ronin.rte/Devices/Weapons/M79/M79.ini b/Data/Ronin.rte/Devices/Weapons/M79/M79.ini
@@ -125,6 +125,7 @@ AddAmmo = Round
 	FireVelocity = 30
 	ShellVelocity = 3
 	Separation = 5
+	LifeVariation = 0.1
 
 
 AddAmmo = Magazine
diff --git a/Data/Ronin.rte/Devices/Weapons/Stoner63/Stoner63.ini b/Data/Ronin.rte/Devices/Weapons/Stoner63/Stoner63.ini
@@ -32,6 +32,7 @@ AddAmmo = Round
 	FireVelocity = 125
 	ShellVelocity = 13
 	Separation = 1
+	LifeVariation = 0.1
 
 
 AddAmmo = Round
diff --git a/Data/Techion.rte/Devices/Weapons/MicroPulsar/MicroPulsar.ini b/Data/Techion.rte/Devices/Weapons/MicroPulsar/MicroPulsar.ini
@@ -51,6 +51,7 @@ AddAmmo = Magazine
 		AIFireVel = 500
 		ShellVelocity = 0
 		Separation = 5
+		LifeVariation = 0.1
 
 
 ///////////////////////////////////////////////////////////////////////
diff --git a/Data/Techion.rte/Devices/Weapons/PulseRifle/PulseRifle.ini b/Data/Techion.rte/Devices/Weapons/PulseRifle/PulseRifle.ini
@@ -39,6 +39,7 @@ AddAmmo = Magazine
 		FireVelocity = 80
 		ShellVelocity = 0
 		Separation = 5
+		LifeVariation = 0.1
 
 
 ///////////////////////////////////////////////////////////////////////
diff --git a/Source/GUI/GUICollectionBox.cpp b/Source/GUI/GUICollectionBox.cpp
@@ -16,10 +16,6 @@ GUICollectionBox::GUICollectionBox(GUIManager* Manager, GUIControlManager* Contr
 	m_IsContainer = true; // We are a container
 }
 
-GUICollectionBox::~GUICollectionBox() {
-	Destroy();
-}
-
 void GUICollectionBox::Create(const std::string& Name, int X, int Y, int Width, int Height) {
 	GUIControl::Create(Name, X, Y, Width, Height);
 
diff --git a/Source/GUI/GUICollectionBox.h b/Source/GUI/GUICollectionBox.h
diff --git a/Source/GUI/GUIControl.h b/Source/GUI/GUIControl.h
diff --git a/Source/GUI/GUISkin.cpp b/Source/GUI/GUISkin.cpp
diff --git a/Source/GUI/GUISkin.h b/Source/GUI/GUISkin.h
diff --git a/Source/GUI/GUISound.cpp b/Source/GUI/GUISound.cpp
diff --git a/Source/GUI/GUISound.h b/Source/GUI/GUISound.h
diff --git a/Source/Managers/WindowMan.cpp b/Source/Managers/WindowMan.cpp
diff --git a/Source/System/glad/gl.c b/Source/System/glad/gl.c
diff --git a/external/include/glad-2.0.0-beta/glad/gl.h b/external/include/glad-2.0.0-beta/glad/gl.h

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#version 330 core`
	`1`	`+#version 130`
`2`	`2`
`3`	`3`	`in vec2 textureUV;`
`4`	`4`