Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use new gmod_tool HUD style #1273

Merged
merged 2 commits into from Nov 27, 2016
Merged

Use new gmod_tool HUD style #1273

merged 2 commits into from Nov 27, 2016

Conversation

AbigailBuccaneer
Copy link
Contributor

I don't know when this was introduced, but it's very pretty:

image

language.Add( "WireNamerTool_name", "Name:" )
TOOL.Information = {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indentayshun

language.Add("WireDataTransfererTool_cd_disk", "CD Disk:")

TOOL.Information = {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indentayshun

@@ -4,12 +4,16 @@ WireToolSetup.open( "cd_ray", "CD Ray", "gmod_wire_cd_ray", nil, "CD Rays" )
if ( CLIENT ) then
language.Add( "Tool.wire_cd_ray.name", "CD Ray Tool (Wire)" )
language.Add( "Tool.wire_cd_ray.desc", "Spawns a CD Ray." )
language.Add( "Tool.wire_cd_ray.0", "Primary: Create/Update CD Ray Secondary: Create CD lock (to keep CD in same spot)" )
language.Add( "WireCDRayTool_cd_ray", "CD Ray:" )
language.Add( "sboxlimit_wire_cd_rays", "You've hit CD Rays limit!" )
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indentayshun

@@ -4,9 +4,13 @@ WireToolSetup.open( "clutch", "Clutch", "gmod_wire_clutch", nil, "Clutchs" )
if CLIENT then
language.Add( "Tool.wire_clutch.name", "Clutch Tool (Wire)" )
language.Add( "Tool.wire_clutch.desc", "Control rotational friction between props" )
language.Add( "Tool.wire_clutch.0", "Primary: Place/Select a clutch controller\nSecondary: Select an entity to apply the clutch to\nReload: Remove clutch from entity/deselect controller" )
language.Add( "Tool.wire_clutch.1", "Right click on the second entity you want the clutch to apply to" )
language.Add( "undone_wireclutch", "Undone Wire Clutch" )
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indentayshun

language.Add( "WireColorerTool_colorer", "Colorer:" )
language.Add( "WireColorerTool_outColor", "Output Color" )
language.Add( "WireColorerTool_Range", "Max Range:" )
language.Add( "WireColorerTool_Model", "Choose a Model:")
TOOL.Information = { { name = "left", text = "Create/Update " .. TOOL.Name } }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indentayshun

@TomyLobo
Copy link
Contributor

Not going to review all of it right now, but there are clearly indentation problems in there, some of them pre-existing.
I pointed out a few.

@AbigailBuccaneer
Copy link
Contributor Author

Yeah, these indentation problems are all in files which use inconsistent indentation. Specifically, my editor guessed the indentation for the file based on what most lines in the file use, but these blocks at the top of the file seem to be the odd ones out (maybe due to copy-pasting). I'll go through and audit it now and make the indentation locally correct rather than file-level correct.

@AbigailBuccaneer
Copy link
Contributor Author

Okay, I fixed the (existing) indentation problems in a separate commit.

@Divran
Copy link
Contributor

Divran commented Nov 23, 2016

Cool 👍

@oldmud0
Copy link

oldmud0 commented Nov 23, 2016

@TomyLobo, the Start a review button doesn't bite. Just click it and you can comment as much as you want, finish the review, and all the comments will be placed in one review.

@AbigailBuccaneer AbigailBuccaneer self-assigned this Nov 26, 2016
@AbigailBuccaneer
Copy link
Contributor Author

Will merge this soon unless anybody wants to actually review it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants