Skip to content

1.2.1 update #45

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.

Sign up for GitHub

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

Merged
zoephix merged 63 commits into from
Apr 2, 2021
Merged

1.2.1 update #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
5b04f40
Area timer optimizations
zoephix Feb 16, 2021
4a28c58
Update database configuration loading (again) (#21)
zoephix Feb 17, 2021
ac68492
Create database.example
zoephix Feb 17, 2021
c2da573
Added persistence plugin (#23)
zoephix Feb 17, 2021
8767578
snip
zoephix Feb 17, 2021
f863518
1.2 wip (#24)
zoephix Feb 17, 2021
7e48bb8
snip
zoephix Feb 17, 2021
a8b9a74
Fixed devName error
zoephix Feb 17, 2021
3fe5eba
Author name fetching via Steam ID (#27)
zoephix Feb 17, 2021
3f5a36e
Fixed admin delay
zoephix Feb 28, 2021
84db2da
Fixed admin chat delay
zoephix Feb 28, 2021
ddc3f66
Added chat icons
zoephix Feb 28, 2021
6c65114
Return the disconnected player's Steam ID
zoephix Mar 3, 2021
edc8445
Lua consistency
zoephix Mar 3, 2021
9386baf
Whitespaces + Deprecated Cleanup
raecyst Mar 4, 2021
c64e719
Key fix for 1.2-wip
raecyst Mar 4, 2021
bcb381a
Optimizations
zoephix Mar 4, 2021
cf3ddaa
Merge pull request #32 from SeamusMcGowan/1.2-wip
TovarischPootis Mar 6, 2021
c0d12cb
Added hook for chat text add
zoephix Mar 8, 2021
967c042
Added chat timestamps (#34)
zoephix Mar 8, 2021
de88a73
Added chat size difference plugin
zoephix Mar 8, 2021
da3202d
Update chatsizediff.lua
zoephix Mar 8, 2021
d2f4c12
Update chatsizediff.lua
zoephix Mar 8, 2021
5b171f1
tweaked font sizes
zoephix Mar 8, 2021
4532414
Support added for actions
zoephix Mar 8, 2021
cb68ea3
Fixed invalid chat mode returning nil
zoephix Mar 8, 2021
b4f087f
Increased font weight
zoephix Mar 8, 2021
01a7b12
1.2 wip Date/Time. != vs ~=, small fix when spawning bots (#33)
TovarischPootis Mar 14, 2021
217599e
Added Hook
raecyst Mar 20, 2021
198ce0c
Update chatsizediff.lua
zoephix Mar 20, 2021
31769a3
Update cl_plugin.lua
zoephix Mar 20, 2021
4187b71
Fix Item Descs
TovarischPootis Mar 20, 2021
365c8aa
Deprication/whitespaces/consistency
TovarischPootis Mar 20, 2021
714ff75
Ability to use @ and ^ when a chat command needs a character's name i…
TovarischPootis Mar 20, 2021
c8dcbd5
Updated Russian localization
TovarischPootis Mar 20, 2021
4273847
Merge pull request #36 from Zoephix/1.2-wip
TovarischPootis Mar 20, 2021
9864a50
Merge pull request #39 from SeamusMcGowan/1.2-wip
TovarischPootis Mar 20, 2021
f5d03c7
1.2 wip (#40)
TovarischPootis Mar 20, 2021
91f685f
Return default text
zoephix Mar 21, 2021
c98e7f9
Alteration to salary
raecyst Mar 29, 2021
54589ad
Fixed class commit
raecyst Mar 29, 2021
6c6d297
Another quick fix
raecyst Mar 29, 2021
e2ddc9c
Update gamemode/core/hooks/sv_hooks.lua
raecyst Mar 29, 2021
dd44cd0
Update gamemode/core/hooks/sv_hooks.lua
raecyst Mar 29, 2021
c0dcc47
Update gamemode/core/hooks/sv_hooks.lua
raecyst Mar 29, 2021
5345385
Hook to hide players in Scoreboard
raecyst Mar 31, 2021
d15e50a
Merge branch '1.2-wip' of https://github.com/SeamusMcGowan/NutScript-…
raecyst Mar 31, 2021
cf3733d
Optimization
raecyst Mar 31, 2021
844532b
Update cl_scoreboard.lua
raecyst Mar 31, 2021
1b24b74
Update sv_hooks.lua
zoephix Mar 31, 2021
03c8139
Update cl_scoreboard.lua
zoephix Mar 31, 2021
e92ca59
Remade Credits. Added surfaceGetURL. Added comments to ease to explai…
TovarischPootis Apr 1, 2021
b4bda2e
Merge remote-tracking branch 'upstream/1.2-wip' into 1.2-wip
TovarischPootis Apr 1, 2021
3da6614
Update cl_helps.lua
TovarischPootis Apr 1, 2021
84f2809
Update nscredits.lua
TovarischPootis Apr 1, 2021
5787df0
Fixed the autoname for plugin/schema authors
TovarischPootis Apr 1, 2021
2b0b60b
Made the logo of the ns logo in credits pulse a little
TovarischPootis Apr 1, 2021
ccdff98
Update plugins/scoreboard/derma/cl_scoreboard.lua
raecyst Apr 1, 2021
64f8647
Lead/Head, added discord invite button
TovarischPootis Apr 1, 2021
0846cf9
Update plugins/scoreboard/derma/cl_scoreboard.lua
raecyst Apr 2, 2021
27da3fc
Merge pull request #42 from SeamusMcGowan/1.2-wip
TovarischPootis Apr 2, 2021
639e0ce
Remade Credits. Added surfaceGetURL. Added comments to ease to explai…
TovarischPootis Apr 2, 2021
34b6e9b
Resolve conflict because the commit was done to the 1.2 branch, not 1…
TovarischPootis Apr 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
gamemode/config/sv_database.lua
.editorconfig
.vscode/*
.vscode/*
8 changes: 8 additions & 0 deletions database.example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"module": "sqlite",
"hostname": "127.0.0.1",
"username": "",
"password": "",
"database": "",
"port": 3306
}
5 changes: 3 additions & 2 deletions entities/entities/nut_item.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ if (SERVER) then
self:PhysicsInit(SOLID_VPHYSICS)
self:SetSolid(SOLID_VPHYSICS)
self:setNetVar("id", itemTable.uniqueID)
self:setNetVar("instanceID", itemTable:getID())
self.nutItemID = itemID

if (table.Count(itemTable.data) > 0) then
Expand Down Expand Up @@ -192,11 +193,11 @@ else
end

function ENT:getItemID()
return self:getNetVar("id", "")
return self:getNetVar("instanceID", "")
end

function ENT:getItemTable()
return nut.item.list[self:getItemID()]
return nut.item.instances[self:getItemID()]
end

function ENT:getData(key, default)
Expand Down
Loading