diff options
| author | Scott <scotth0828@gmail.com> | 2016-05-04 20:06:51 -0400 |
|---|---|---|
| committer | Scott <scotth0828@gmail.com> | 2016-05-04 20:06:51 -0400 |
| commit | 0d96ddcca1302d516ed2f0a6f14ed79a0b84221e (patch) | |
| tree | 9ae700bc69813bf317624ae8b2ad1a9a6e0d17aa | |
| parent | c179c43f6bf13757c88585907c9448d5fbf65eed (diff) | |
| parent | 18dcbaa7c1853d6cbb1c05681c5cfe4c06101479 (diff) | |
| download | gmstranded-0d96ddcca1302d516ed2f0a6f14ed79a0b84221e.tar.gz gmstranded-0d96ddcca1302d516ed2f0a6f14ed79a0b84221e.tar.bz2 gmstranded-0d96ddcca1302d516ed2f0a6f14ed79a0b84221e.zip | |
Merge branch 'master' of ssh://cogarr.net:43/home/git/gmstranded
| -rw-r--r-- | gamemode/client/cl_inventory.lua | 23 | ||||
| -rw-r--r-- | gamemode/configure_me.lua | 2 | ||||
| -rw-r--r-- | gamemode/server/database.lua | 4 | ||||
| -rw-r--r-- | gmstranded.txt (renamed from gmsurvival.txt) | 6 |
4 files changed, 25 insertions, 10 deletions
diff --git a/gamemode/client/cl_inventory.lua b/gamemode/client/cl_inventory.lua index f1b0b5e..da07939 100644 --- a/gamemode/client/cl_inventory.lua +++ b/gamemode/client/cl_inventory.lua @@ -519,9 +519,15 @@ function PANEL:Init() draw.RoundedBox( 4, 0, 0, self:GetWide(), self:GetTall(), Color( 75, 75, 75 ) ) end - self.ControlPanel = vgui.Create("DForm",self) + self.Encapsulate = vgui.Create("DScrollPanel",self) + self.Encapsulate:SetSize((dPanelWidth/3)*2,dPanelHeight) + --self.Encapsulate:SetSize(200,200) + self.Encapsulate:SetPos(dPanelWidth/3,0) + --self.Encapsulate:EnableVerticalScrollbar(true) + + self.ControlPanel = vgui.Create("DForm") self.ControlPanel:SetSize((dPanelWidth*2)/3,dPanelWidth) - self.ControlPanel:SetPos(dPanelWidth/3,0) + self.Encapsulate:AddItem(self.ControlPanel) self.PanelProxy = {} self.PanelProxy.cp = self.ControlPanel @@ -563,6 +569,7 @@ function PANEL:Init() elseif(type == "Color") then local color = vgui.Create( "DRGBPicker" ) local color_cube = vgui.Create( "DColorCube" ) + color_cube:SetSize(200,200) local colorvars = {} local curcolor = {} for k,v in pairs({"Red","Green","Blue"}) do @@ -599,13 +606,17 @@ function PANEL:Init() self.cp:AddItem(DComboBox) elseif(type == "PropSelect") then local grid = vgui.Create( "DGrid" ) - grid:SetPos( 10, 30 ) - grid:SetCols( 5 ) - grid:SetColWide( 36 ) + grid:SetSize(256,64) + grid:SetPos( 0, 0 ) + grid:SetCols( 3 ) + grid:SetColWide( 128 ) + grid:SetRowHeight(64) for k,v in pairs(table.Models) do local icon = vgui.Create( "DModelPanel", Panel ) - icon:SetSize( 32, 32 ) + icon:SetSize( 64, 64 ) icon:SetModel( k ) + icon:SetCamPos( Vector( 15,15,15 ) ) + icon:SetLookAt( Vector( 0, 0, 1 ) ) icon.DoClick = function() GetConVar(table.ConVar):SetString(k) end diff --git a/gamemode/configure_me.lua b/gamemode/configure_me.lua index 8bace06..543dae2 100644 --- a/gamemode/configure_me.lua +++ b/gamemode/configure_me.lua @@ -8,7 +8,7 @@ */ //Make sure that this is the gamemode folder name -GM.GAMEMODE_FOLDER_NAME = "gmsurvival" +GM.GAMEMODE_FOLDER_NAME = "gmstranded" if (GMS == nil) then GMS = {} end diff --git a/gamemode/server/database.lua b/gamemode/server/database.lua index 9c4a827..b736bfb 100644 --- a/gamemode/server/database.lua +++ b/gamemode/server/database.lua @@ -61,6 +61,10 @@ local function convertTableStatic(tbl) end +local function convertTableCompressed(tbl) + +end + local function parseStaticTable(tbl) end diff --git a/gmsurvival.txt b/gmstranded.txt index 307e1dc..196f3a6 100644 --- a/gmsurvival.txt +++ b/gmstranded.txt @@ -1,6 +1,6 @@ -"gmsurvival" { +"gmstranded" { "base" "sandbox" - "title" "Garry's Mod Survival" + "title" "Garrys Mod Stranded" "maps" "^gms_" "menusystem" "1" -} +}
\ No newline at end of file |