Skip to content

Commit

Permalink
Balloon Fix & Tool Content
Browse files Browse the repository at this point in the history 
* Added more overlay materials
* Added some materials to Material tool
* Added new trails from TF2
* Added 2 new effects to Emitter
* Added 2 new options to Utilities menu
* Fixed Balloon tool erroring
  • Loading branch information
@robotboy655
robotboy655 committed Jan 28, 2014
1 parent 9292294 commit c26040e
Show file tree
Hide file tree
Showing 9 changed files with 101 additions and 8 deletions.
26 changes: 26 additions & 0 deletions garrysmod/gamemodes/sandbox/entities/entities/gmod_emitter.lua
View file
Expand Up @@ -387,3 +387,29 @@ list.Set( "EffectType", "glassimpact", {
end
})
list.Set( "EffectType", "bloodimpact", {
print = "#effecttype.bloodimpact",
material = "gui/effects/bloodimpact.png",
func = function( ent, pos, angle, scale )
local effectdata = EffectData()
effectdata:SetOrigin( pos )
util.Effect( "BloodImpact", effectdata, true, true )
end
})
list.Set( "EffectType", "muzzleeffect", {
print = "#effecttype.muzzleeffect",
material = "gui/effects/muzzleeffect.png",
func = function( ent, pos, angle, scale )
local effectdata = EffectData()
effectdata:SetOrigin( pos + angle:Forward() * 4 )
effectdata:SetAngles( angle )
effectdata:SetScale( scale )
util.Effect( "MuzzleEffect", effectdata, true, true )
end
})
1 change: 1 addition & 0 deletions garrysmod/gamemodes/sandbox/entities/weapons/gmod_tool/stools/balloon.lua
View file
Expand Up @@ -202,6 +202,7 @@ function TOOL:Think()
if ( !IsValid( self.GhostEntity ) || self.GhostEntity.model != self:GetClientInfo( "model" ) ) then

local modeltable = list.Get( "BalloonModels" )[ self:GetClientInfo( "model" ) ]
if ( !modeltable ) then return end
self:MakeGhostEntity( modeltable.model, Vector( 0, 0, 0 ), Angle( 0, 0, 0 ) )
if ( IsValid( self.GhostEntity ) ) then self.GhostEntity.model = self:GetClientInfo( "model" ) end

Expand Down
5 changes: 5 additions & 0 deletions garrysmod/gamemodes/sandbox/entities/weapons/gmod_tool/stools/material.lua
View file
Expand Up @@ -62,6 +62,11 @@ function TOOL:RightClick( trace )

end

if ( IsMounted( "tf" ) ) then
list.Add( "OverrideMaterials", "models/player/shared/gold_player" )
list.Add( "OverrideMaterials", "models/player/shared/ice_player" )
end

list.Add( "OverrideMaterials", "models/wireframe" )
list.Add( "OverrideMaterials", "debug/env_cubemap_model" )
list.Add( "OverrideMaterials", "models/shadertest/shader3" )
Expand Down
24 changes: 18 additions & 6 deletions garrysmod/gamemodes/sandbox/entities/weapons/gmod_tool/stools/trails.lua
View file
Expand Up @@ -133,14 +133,26 @@ end
-- own file placed in autorun or something.
--
list.Set( "trail_materials", "#trail.plasma", "trails/plasma" )
list.Set( "trail_materials", "#trail.tube", "trails/tube" )
list.Set( "trail_materials", "#trail.electric", "trails/electric" )
list.Set( "trail_materials", "#trail.smoke", "trails/smoke" )
list.Set( "trail_materials", "#trail.laser", "trails/laser" )
list.Set( "trail_materials", "#trail.physbeam", "trails/physbeam" )
list.Set( "trail_materials", "#trail.love", "trails/love" )
list.Set( "trail_materials", "#trail.tube", "trails/tube" )
list.Set( "trail_materials", "#trail.electric", "trails/electric" )
list.Set( "trail_materials", "#trail.smoke", "trails/smoke" )
list.Set( "trail_materials", "#trail.laser", "trails/laser" )
list.Set( "trail_materials", "#trail.physbeam", "trails/physbeam" )
list.Set( "trail_materials", "#trail.love", "trails/love" )
list.Set( "trail_materials", "#trail.lol", "trails/lol" )

if ( IsMounted( "tf" ) ) then
list.Set( "trail_materials", "#trail.beam001_blu", "effects/beam001_blu" )
list.Set( "trail_materials", "#trail.beam001_red", "effects/beam001_red" )
list.Set( "trail_materials", "#trail.beam001_white", "effects/beam001_white" )
list.Set( "trail_materials", "#trail.arrowtrail_blu", "effects/arrowtrail_blu" )
list.Set( "trail_materials", "#trail.arrowtrail_red", "effects/arrowtrail_red" )
list.Set( "trail_materials", "#trail.repair_claw_trail_blue", "effects/repair_claw_trail_blue" )
list.Set( "trail_materials", "#trail.repair_claw_trail_red", "effects/repair_claw_trail_red" )
list.Set( "trail_materials", "#trail.australiumtrail_red", "effects/australiumtrail_red" )
list.Set( "trail_materials", "#trail.beam_generic01", "effects/beam_generic01" )
end

function TOOL.BuildCPanel( CPanel )

CPanel:AddControl( "Header", { Description = "#tool.trails.desc" } )
Expand Down
5 changes: 4 additions & 1 deletion garrysmod/lua/autorun/utilities_menu.lua
View file
Expand Up @@ -24,11 +24,14 @@ local function ServerSettings( CPanel )

CPanel:AddControl( "TextBox", { Label = "#utilities.password", Command = "sv_password", WaitForEnter = "1" } )

CPanel:AddControl( "CheckBox", { Label = "#utilities.kickerrornum", Command = "sv_kickerrornum" } )
CPanel:AddControl( "CheckBox", { Label = "#utilities.allowcslua", Command = "sv_allowcslua" } )

CPanel:AddControl( "Slider", { Label = "#utilities.gravity", Type = "Float", Command = "sv_gravity", Min = "-200", Max = "600" } )
CPanel:AddControl( "Slider", { Label = "#utilities.timescale", Type = "Float", Command = "phys_timescale", Min = "0", Max = "2" } )
CPanel:AddControl( "Slider", { Label = "#utilities.iterations", Type = "Integer", Command = "gmod_physiterations", Min = "1", Max = "10" } )

CPanel:AddControl( "Header", { Description = "#utilities.sandboxsettingss" } )
CPanel:AddControl( "Header", { Description = "#utilities.sandboxsettings" } )

CPanel:AddControl( "TextBox", { Label = "#persistent_mode", Command = "sbox_persist", WaitForEnter = "1" } )

Expand Down
21 changes: 20 additions & 1 deletion garrysmod/lua/postprocess/overlay.lua
View file
Expand Up @@ -51,8 +51,27 @@ list.Set( "OverlayMaterials", "#overlay_pp.shield", { Material = "models/props
list.Set( "OverlayMaterials", "#overlay_pp.froested", { Material = "models/props_c17/frostedglass_01a", Icon = "models/props_c17/frostedglass_01a" } )
list.Set( "OverlayMaterials", "#overlay_pp.tankglass", { Material = "models/props_lab/tank_glass001", Icon = "models/props_lab/tank_glass001" } )
list.Set( "OverlayMaterials", "#overlay_pp.globe", { Material = "models/props_combine/tprings_globe", Icon = "models/props_combine/tprings_globe" } )
list.Set( "OverlayMaterials", "#overlay_pp.fisheye", { Material = "models/props_c17/fisheyelens", Icon = "models/props_c17/fisheyelens" } )
list.Set( "OverlayMaterials", "#overlay_pp.fisheye", { Material = "models/props_c17/fisheyelens", Icon = "models/props_c17/fisheyelens" } )
list.Set( "OverlayMaterials", "#overlay_pp.rendertarget", { Material = "models/overlay_rendertarget", Icon = "models/overlay_rendertarget" } )
list.Set( "OverlayMaterials", "#overlay_pp.strider_pinch_dudv", { Material = "models/strider_pinch_dudv", Icon = "effects/strider_pinch_dudv" } )
list.Set( "OverlayMaterials", "#overlay_pp.teleport", { Material = "effects/tp_eyefx/tpeye", Icon = "effects/tp_eyefx/tpeye" } )
list.Set( "OverlayMaterials", "#overlay_pp.teleport2", { Material = "effects/tp_eyefx/tpeye2", Icon = "effects/tp_eyefx/tpeye2" } )
list.Set( "OverlayMaterials", "#overlay_pp.teleport3", { Material = "effects/tp_eyefx/tpeye3", Icon = "effects/tp_eyefx/tpeye3" } )
list.Set( "OverlayMaterials", "#overlay_pp.tvnoise", { Material = "effects/tvscreen_noise002a", Icon = "effects/tvscreen_noise002a" } )
list.Set( "OverlayMaterials", "#overlay_pp.water_warp01", { Material = "effects/water_warp01", Icon = "effects/water_warp01" } )
if ( IsMounted( "tf" ) ) then
list.Set( "OverlayMaterials", "#overlay_pp.jarate", { Material = "effects/jarate_overlay", Icon = "effects/jarate_overlay" } )
list.Set( "OverlayMaterials", "#overlay_pp.invuln_overlay_red", { Material = "effects/invuln_overlay_red", Icon = "effects/invuln_overlay_red" } )
list.Set( "OverlayMaterials", "#overlay_pp.invuln_overlay_blu", { Material = "effects/invuln_overlay_blue", Icon = "effects/invuln_overlay_blue" } )
list.Set( "OverlayMaterials", "#overlay_pp.water_warp", { Material = "effects/water_warp", Icon = "effects/water_warp" } )
list.Set( "OverlayMaterials", "#overlay_pp.water_warp_2fort", { Material = "effects/water_warp_2fort", Icon = "effects/water_warp_2fort" } )
list.Set( "OverlayMaterials", "#overlay_pp.water_warp_well", { Material = "effects/water_warp_well", Icon = "effects/water_warp_well" } )
list.Set( "OverlayMaterials", "#overlay_pp.bleed_overlay", { Material = "effects/bleed_overlay", Icon = "effects/bleed_overlay" } )
list.Set( "OverlayMaterials", "#overlay_pp.bombinomicon_distortion", { Material = "effects/bombinomicon_distortion", Icon = "effects/bombinomicon_distortion" } )
list.Set( "OverlayMaterials", "#overlay_pp.dodge_overlay", { Material = "effects/dodge_overlay", Icon = "effects/dodge_overlay" } )
list.Set( "OverlayMaterials", "#overlay_pp.distortion_normal", { Material = "effects/distortion_normal001", Icon = "effects/distortion_normal001" } )
end
list.Set( "PostProcess", "#overlay_pp", {
Expand Down
16 changes: 16 additions & 0 deletions garrysmod/resource/localization/en/postprocessing.properties
View file
Expand Up @@ -16,6 +16,22 @@ overlay_pp.tankglass=Fuel Tank
overlay_pp.globe=Globe
overlay_pp.fisheye=Fish Eye
overlay_pp.rendertarget=Render Target
overlay_pp.strider_pinch_dudv=Strider Pinch
overlay_pp.teleport=Teleport
overlay_pp.teleport2=Teleport 2
overlay_pp.teleport3=Teleport 3
overlay_pp.tvnoise=TV Noise
overlay_pp.water_warp01=Water
overlay_pp.jarate=Jarate
overlay_pp.invuln_overlay_red=RED Uber
overlay_pp.invuln_overlay_blu=BLU Uber
overlay_pp.water_warp=Water
overlay_pp.water_warp_2fort=Water 2Fort
overlay_pp.water_warp_well=Water Well
overlay_pp.bleed_overlay=Bleed
overlay_pp.bombinomicon_distortion=Bombinomicon
overlay_pp.dodge_overlay=Dodge
overlay_pp.distortion_normal=Distortion

# Shaders

Expand Down
2 changes: 2 additions & 0 deletions garrysmod/resource/localization/en/spawnmenu.properties
View file
Expand Up @@ -33,6 +33,8 @@ utilities.password=Server Password\:
utilities.gravity=Gravity\:
utilities.timescale=Physics Timescale\:
utilities.iterations=Physics Iterations\:
utilities.kickerrornum=Kick for clientside errors
utilities.allowcslua=Allow clientside scripts

KP_INS=Numpad 0
KP_END=Numpad 1
Expand Down
9 changes: 9 additions & 0 deletions garrysmod/resource/localization/en/tool.properties
View file
Expand Up @@ -351,6 +351,15 @@ trail.laser=Laser
trail.physbeam=Physics Beam
trail.love=Hearts
trail.lol=LOL
trail.beam001_blu=BLU Tube
trail.beam001_red=RED Tube
trail.beam001_white=White Tube
trail.arrowtrail_blu=BLU Arrow Trail
trail.arrowtrail_red=RED Arrow Trail
trail.repair_claw_trail_blue=BLU Wave
trail.repair_claw_trail_red=RED Wave
trail.australiumtrail_red=Australium
trail.beam_generic01=Generic

tool.inflator.name=Inflator
tool.inflator.desc=Inflate a ragdoll/NPC
Expand Down

0 comments on commit c26040e

Please sign in to comment.