Skip to content

1.2 wip #19

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
TovarischPootis merged 30 commits into from
Feb 15, 2021
Merged

1.2 wip #19

Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
7bca867
Add persistence plugin
zoephix Feb 14, 2021
2d1c281
lua consistency
TovarischPootis Feb 14, 2021
10a1caf
Removed restrictions plugin alliances
zoephix Feb 14, 2021
b85c570
Update sv_database.lua
zoephix Feb 14, 2021
807d3b1
Merge pull request #7 from TovarischPootis/1.2-wip
zoephix Feb 14, 2021
f774059
Merge pull request #2 from NutScript/1.2-wip
TovarischPootis Feb 14, 2021
6b8d706
Merge pull request #3 from NutScript/1.2-wip
zoephix Feb 14, 2021
026bb68
Merge pull request #5 from Zoephix/1.2-wip
zoephix Feb 14, 2021
cbf0c42
whitespace
TovarischPootis Feb 14, 2021
55b7f54
Merge pull request #9 from TovarischPootis/1.2-wip
TovarischPootis Feb 14, 2021
e1df0db
Merge pull request #4 from NutScript/1.2-wip
zoephix Feb 14, 2021
57cc63e
Update sh_plugin.lua
zoephix Feb 14, 2021
944229f
Merge pull request #10 from Zoephix/1.2-wip
zoephix Feb 14, 2021
c89281d
Revert "Merge pull request #10 from Zoephix/1.2-wip"
zoephix Feb 14, 2021
af829eb
Revert "Update sh_plugin.lua"
zoephix Feb 14, 2021
d038366
Merge pull request #11 from Zoephix/1.2-wip
zoephix Feb 14, 2021
d1856ec
yet another date modification, this time, lightweight
TovarischPootis Feb 14, 2021
e19701e
Removed already defined starting time
zoephix Feb 14, 2021
aeec8d8
Merge pull request #13 from TovarischPootis/1.2-wip
zoephix Feb 14, 2021
6ac649a
Update database configuration loading
zoephix Feb 14, 2021
49d3d0d
Added date migrations
zoephix Feb 14, 2021
37586c4
Added date migrations
zoephix Feb 14, 2021
5855737
Update chatbox icons
zoephix Feb 14, 2021
cd7616b
As suggested, timer runs only on day change rather than every 5 minutes
TovarischPootis Feb 15, 2021
5351bda
Merge pull request #16 from Zoephix/patch-1
TovarischPootis Feb 15, 2021
4a18b06
Merge pull request #17 from Zoephix/patch-2
TovarischPootis Feb 15, 2021
febb183
Merge branch '1.2-wip' into 1.2-wip
TovarischPootis Feb 15, 2021
6c139fc
Merge pull request #15 from Zoephix/1.2-wip
zoephix Feb 15, 2021
2524180
Merge pull request #18 from TovarischPootis/1.2-wip
zoephix Feb 15, 2021
3c92847
Update README.md
zoephix Feb 15, 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
Prev Previous commit
Next Next commit
whitespace
  • Loading branch information
@TovarischPootis
TovarischPootis committed Feb 14, 2021
commit cbf0c42e85ccf9233e4ae70625c8a0ef2fb042a1
2 changes: 1 addition & 1 deletion gamemode/core/libs/sh_character.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if (SERVER) then
if (not nut.db) then
include("sv_database.lua")
end

-- Fetches all the character names and stores
-- them into a table so they only have to be fetched once
if (#nut.char.names < 1) then
Expand Down