Skip to content

Conversation

@TovarischPootis
Copy link
Contributor

There are many old commits that do not change any files since those were already committed in advance. They are relics. Removing them from the pull would revert their changes which isn't what we want.

zoephix and others added 30 commits February 14, 2021 12:02
newlines and || vs or
Fixed invalid database calling
Date library update (wip)
yet another date modification, this time, lightweight
Update database configuration loading
As suggested, timer runs only on day change rather than every 5 minutes
zoephix and others added 27 commits February 15, 2021 11:33
…name updates

Now SCHEMA/PLUGIN creators can add their SteamID's to the .author instead of a static name, which will display their current Steam name.
TLDR: Supported options:
PLUGIN.author = "Tov" This will always display Tov
PLUGIN.author = "STEAM_0:1:55088012" Will display my current Steam Name ([TOV UNTOLD]"
PLUGIN.author = 76561198070441753 Will display my current Steam Name ([TOV UNTOLD]"
* Update README.md

* Fix some items acting as uninteractable watermelons

The issue is that upon item entity spawn, the entity is always set to watermelon as a default. Then, in ENT:setItem, that code is run again, this time with the proper item model. Most of the time that's fine, however some models have funky physics that dont update, causing the model to stay with the watermelon physics, and not not traceable. Here we just set the correct model right away, avoiding that issue

* Update nut_item.lua

* Revert date library

* Revert "Revert date library"

* Update README.md

* Removed unneeded for-loop

* Area timer optimizations

* Update database configuration loading (again) (#21)

* Create database.example

* Added persistence plugin (#23)

* snip

* 1.2 wip (#24)

* Add persistence plugin

* lua consistency

newlines and || vs or

* Removed restrictions plugin alliances

* Update sv_database.lua

* whitespace

* Update sh_plugin.lua

* Revert "Merge pull request #10 from Zoephix/1.2-wip"

This reverts commit 944229f.

* Revert "Update sh_plugin.lua"

This reverts commit 57cc63e.

* yet another date modification, this time, lightweight

* Removed already defined starting time

* Update database configuration loading

* Added date migrations

* Added date migrations

* Update chatbox icons

* As suggested, timer runs only on day change rather than every 5 minutes

* Update README.md

* doesnt exist anymore

* Added more valid config locations

* Update config loading

* Update config loading

* Update config loading

* Added example database configuration

* Added credits tab

* Added hover sound

* whitespace

* Credits tab (WIP)

* Added contributors to the credits

* Increased spacing, extra polishing

* Increased font size

Co-authored-by: TovarischPootis <54110479+TovarischPootis@users.noreply.github.com>

* snip

* Fixed devName error

* Author name fetching via Steam ID (#27)

* Author name fetching via Steam ID

* string.match

* Fixed admin delay

* Fixed admin chat delay

* Added chat icons

* Return the disconnected player's Steam ID

* Lua consistency

Co-authored-by: Zoephix <heijmanszep@gmail.com>
* Update README.md

* Fix some items acting as uninteractable watermelons

The issue is that upon item entity spawn, the entity is always set to watermelon as a default. Then, in ENT:setItem, that code is run again, this time with the proper item model. Most of the time that's fine, however some models have funky physics that dont update, causing the model to stay with the watermelon physics, and not not traceable. Here we just set the correct model right away, avoiding that issue

* Update nut_item.lua

* Revert date library

* Revert "Revert date library"

* Update README.md

* Removed unneeded for-loop

* Area timer optimizations

* Update database configuration loading (again) (#21)

* Create database.example

* Added persistence plugin (#23)

* snip

* 1.2 wip (#24)

* Add persistence plugin

* lua consistency

newlines and || vs or

* Removed restrictions plugin alliances

* Update sv_database.lua

* whitespace

* Update sh_plugin.lua

* Revert "Merge pull request #10 from Zoephix/1.2-wip"

This reverts commit 944229f.

* Revert "Update sh_plugin.lua"

This reverts commit 57cc63e.

* yet another date modification, this time, lightweight

* Removed already defined starting time

* Update database configuration loading

* Added date migrations

* Added date migrations

* Update chatbox icons

* As suggested, timer runs only on day change rather than every 5 minutes

* Update README.md

* doesnt exist anymore

* Added more valid config locations

* Update config loading

* Update config loading

* Update config loading

* Added example database configuration

* Added credits tab

* Added hover sound

* whitespace

* Credits tab (WIP)

* Added contributors to the credits

* Increased spacing, extra polishing

* Increased font size

Co-authored-by: TovarischPootis <54110479+TovarischPootis@users.noreply.github.com>

* snip

* Fixed devName error

* Author name fetching via Steam ID (#27)

* Author name fetching via Steam ID

* string.match

* Fixed admin delay

* Fixed admin chat delay

* Added chat icons

* Return the disconnected player's Steam ID

* Lua consistency

Co-authored-by: Zoephix <heijmanszep@gmail.com>
(mysqloonot, lmao)
@TovarischPootis TovarischPootis merged commit 01a7b12 into NutScript:1.2-wip Mar 14, 2021
zoephix added a commit that referenced this pull request Apr 2, 2021
* Area timer optimizations

* Update database configuration loading (again) (#21)

* Create database.example

* Added persistence plugin (#23)

* snip

* 1.2 wip (#24)

* Add persistence plugin

* lua consistency

newlines and || vs or

* Removed restrictions plugin alliances

* Update sv_database.lua

* whitespace

* Update sh_plugin.lua

* Revert "Merge pull request #10 from Zoephix/1.2-wip"

This reverts commit 944229f.

* Revert "Update sh_plugin.lua"

This reverts commit 57cc63e.

* yet another date modification, this time, lightweight

* Removed already defined starting time

* Update database configuration loading

* Added date migrations

* Added date migrations

* Update chatbox icons

* As suggested, timer runs only on day change rather than every 5 minutes

* Update README.md

* doesnt exist anymore

* Added more valid config locations

* Update config loading

* Update config loading

* Update config loading

* Added example database configuration

* Added credits tab

* Added hover sound

* whitespace

* Credits tab (WIP)

* Added contributors to the credits

* Increased spacing, extra polishing

* Increased font size

Co-authored-by: TovarischPootis <54110479+TovarischPootis@users.noreply.github.com>

* snip

* Fixed devName error

* Author name fetching via Steam ID (#27)

* Author name fetching via Steam ID

* string.match

* Fixed admin delay

* Fixed admin chat delay

* Added chat icons

* Return the disconnected player's Steam ID

* Lua consistency

* Whitespaces + Deprecated Cleanup

Whitespaces and deprecated code cleanup.

* Key fix for 1.2-wip

Added the key fix for 1.2-wip

* Optimizations

* Added hook for chat text add

* Added chat timestamps (#34)

* Added chat size difference plugin

* Update chatsizediff.lua

* Update chatsizediff.lua

* tweaked font sizes

* Support added for actions

* Fixed invalid chat mode returning nil

* Increased font weight

* 1.2 wip Date/Time. != vs ~=, small fix when spawning bots (#33)

* Added Hook

CanDrawDoorInfo gets parsed the entity so that it can be done in specific circumstances

* Update chatsizediff.lua

* Update cl_plugin.lua

* Fix Item Descs

Fixes to items to display proper updated descriptions, rather than the default meta desc (stuff like getData in getDesc works properly now)

* Deprication/whitespaces/consistency

* Ability to use @ and ^ when a chat command needs a character's name input

* Updated Russian localization

* 1.2 wip (#40)

* Fix Item Descs

Fixes to items to display proper updated descriptions, rather than the default meta desc (stuff like getData in getDesc works properly now)

* Deprication/whitespaces/consistency

* Ability to use @ and ^ when a chat command needs a character's name input

* Updated Russian localization

* Return default text

* Alteration to salary

Allows classes to have salaries, as per suggestion by Misfit. Feel this can be useful for different ranks/divisions being paid differently.

* Fixed class commit

Fixed class salary commit

* Another quick fix

Simplifies the return if there's no money to give.

* Update gamemode/core/hooks/sv_hooks.lua

Works better in the long run.

Co-authored-by: TovarischPootis <54110479+TovarischPootis@users.noreply.github.com>

* Update gamemode/core/hooks/sv_hooks.lua

Co-authored-by: TovarischPootis <54110479+TovarischPootis@users.noreply.github.com>

* Update gamemode/core/hooks/sv_hooks.lua

Co-authored-by: TovarischPootis <54110479+TovarischPootis@users.noreply.github.com>

* Hook to hide players in Scoreboard

A very simple hook that hides certain factions in the scoreboard if conditions are met. Good for hiding admin factions or event factions.

* Optimization

Figured out how to optimize the hiding code.

* Update cl_scoreboard.lua

Another small fix to the code, prevents faction appearing if amount is 0

* Update sv_hooks.lua

* Update cl_scoreboard.lua

* Remade Credits. Added surfaceGetURL. Added comments to ease to explain how to use.

* Update cl_helps.lua

* Update nscredits.lua

* Fixed the autoname for plugin/schema authors

* Made the logo of the ns logo in credits pulse a little

* Update plugins/scoreboard/derma/cl_scoreboard.lua

Co-authored-by: TovarischPootis <54110479+TovarischPootis@users.noreply.github.com>

* Lead/Head, added discord invite button

* Update plugins/scoreboard/derma/cl_scoreboard.lua

Co-authored-by: TovarischPootis <54110479+TovarischPootis@users.noreply.github.com>

* Resolve conflict because the commit was done to the 1.2 branch, not 1.2-wip

Co-authored-by: Zoephix <heijmanszep@gmail.com>
Co-authored-by: VindoesCompooter <100soundsystem32@gmail.com>
TovarischPootis added a commit that referenced this pull request Apr 2, 2021
* Area timer optimizations

* Update database configuration loading (again) (#21)

* Create database.example

* Added persistence plugin (#23)

* snip

* 1.2 wip (#24)

* Add persistence plugin

* lua consistency

newlines and || vs or

* Removed restrictions plugin alliances

* Update sv_database.lua

* whitespace

* Update sh_plugin.lua

* Revert "Merge pull request #10 from Zoephix/1.2-wip"

This reverts commit 944229f.

* Revert "Update sh_plugin.lua"

This reverts commit 57cc63e.

* yet another date modification, this time, lightweight

* Removed already defined starting time

* Update database configuration loading

* Added date migrations

* Added date migrations

* Update chatbox icons

* As suggested, timer runs only on day change rather than every 5 minutes

* Update README.md

* doesnt exist anymore

* Added more valid config locations

* Update config loading

* Update config loading

* Update config loading

* Added example database configuration

* Added credits tab

* Added hover sound

* whitespace

* Credits tab (WIP)

* Added contributors to the credits

* Increased spacing, extra polishing

* Increased font size

Co-authored-by: TovarischPootis <54110479+TovarischPootis@users.noreply.github.com>

* snip

* Fixed devName error

* Author name fetching via Steam ID (#27)

* Author name fetching via Steam ID

* string.match

* Fixed admin delay

* Fixed admin chat delay

* Added chat icons

* Return the disconnected player's Steam ID

* Lua consistency

* Whitespaces + Deprecated Cleanup

Whitespaces and deprecated code cleanup.

* Key fix for 1.2-wip

Added the key fix for 1.2-wip

* Optimizations

* Added hook for chat text add

* Added chat timestamps (#34)

* Added chat size difference plugin

* Update chatsizediff.lua

* Update chatsizediff.lua

* tweaked font sizes

* Support added for actions

* Fixed invalid chat mode returning nil

* Increased font weight

* 1.2 wip Date/Time. != vs ~=, small fix when spawning bots (#33)

* Added Hook

CanDrawDoorInfo gets parsed the entity so that it can be done in specific circumstances

* Update chatsizediff.lua

* Update cl_plugin.lua

* Fix Item Descs

Fixes to items to display proper updated descriptions, rather than the default meta desc (stuff like getData in getDesc works properly now)

* Deprication/whitespaces/consistency

* Ability to use @ and ^ when a chat command needs a character's name input

* Updated Russian localization

* 1.2 wip (#40)

* Fix Item Descs

Fixes to items to display proper updated descriptions, rather than the default meta desc (stuff like getData in getDesc works properly now)

* Deprication/whitespaces/consistency

* Ability to use @ and ^ when a chat command needs a character's name input

* Updated Russian localization

* Return default text

* Alteration to salary

Allows classes to have salaries, as per suggestion by Misfit. Feel this can be useful for different ranks/divisions being paid differently.

* Fixed class commit

Fixed class salary commit

* Another quick fix

Simplifies the return if there's no money to give.

* Update gamemode/core/hooks/sv_hooks.lua

Works better in the long run.

Co-authored-by: TovarischPootis <54110479+TovarischPootis@users.noreply.github.com>

* Update gamemode/core/hooks/sv_hooks.lua

Co-authored-by: TovarischPootis <54110479+TovarischPootis@users.noreply.github.com>

* Update gamemode/core/hooks/sv_hooks.lua

Co-authored-by: TovarischPootis <54110479+TovarischPootis@users.noreply.github.com>

* Hook to hide players in Scoreboard

A very simple hook that hides certain factions in the scoreboard if conditions are met. Good for hiding admin factions or event factions.

* Optimization

Figured out how to optimize the hiding code.

* Update cl_scoreboard.lua

Another small fix to the code, prevents faction appearing if amount is 0

* Update sv_hooks.lua

* Update cl_scoreboard.lua

* Remade Credits. Added surfaceGetURL. Added comments to ease to explain how to use.

* Update cl_helps.lua

* Update nscredits.lua

* Fixed the autoname for plugin/schema authors

* Made the logo of the ns logo in credits pulse a little

* Update plugins/scoreboard/derma/cl_scoreboard.lua

Co-authored-by: TovarischPootis <54110479+TovarischPootis@users.noreply.github.com>

* Lead/Head, added discord invite button

* Update plugins/scoreboard/derma/cl_scoreboard.lua

Co-authored-by: TovarischPootis <54110479+TovarischPootis@users.noreply.github.com>

* Resolve conflict because the commit was done to the 1.2 branch, not 1.2-wip

* 1.2 wip (#46)

Co-authored-by: Zoephix <heijmanszep@gmail.com>
Co-authored-by: VindoesCompooter <100soundsystem32@gmail.com>
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.

3 participants