AsgardEternal/SquadJS
1
0
Fork 0
mirror of https://github.com/AsgardEternal/SquadJS.git synced 2024-09-28 16:24:25 -05:00
Code Issues Packages Projects Releases Wiki Activity
727 Commits 9 Branches 0 Tags 1.8 MiB
ee8bbf5ccc
Commit Graph

352 Commits

Author SHA1 Message Date
Thomas Smyth
5fce1ae2f2 Add layer image to Discord server status embed 2021-03-08 22:03:18 +00:00
Thomas Smyth
0aaea4e5ed
Merge pull request #172 from 11TStudio/rconWarnKickBan 
Fix kick and ban RCON regular expressions
 2021-03-08 21:03:37 +00:00
Levent007
381637387d changing \d to [0-9], for sake of code ethics 2021-03-08 21:54:25 +01:00
Levent007
db4808b531 Fixing regex yet again... 2021-03-08 21:45:42 +01:00
Levent007
ccac5a9917 Fixing regex + adding playerID in match for kicks 2021-03-08 21:39:52 +01:00
Thomas Smyth
f84d154d1c
Merge pull request #171 from 11TStudio/rconWarnKickBan 
Add new events for admins warning, kicking and banning players
 2021-03-08 20:32:16 +00:00
Levent007
347b8182b9 reorder the code 2021-03-08 21:31:46 +01:00
Levent007
10be536c7b New RCON event emit for BAN, KICK, WARN + rcon.ban method 2021-03-08 21:26:22 +01:00
Thomas Smyth
1bb68ceba9 Fix typo in DiscordFOBHABExplosionDamage plugin 2021-03-08 19:13:54 +00:00
Thomas Smyth
308e29b00c Add plugin to log FOB/HAB explosion damage 2021-03-08 18:51:08 +00:00
Thomas Smyth
7e0f414376 Fix nextMapToBeVoted assignment 2021-03-08 15:07:18 +00:00
Levent007
19087e93dd Making the code more efficient and light 2021-03-08 12:54:45 +01:00
Levent007
2fd278e4cd fixing the PR 2021-03-08 12:36:38 +01:00
Levent007
c5bd408b02 fixing init of this.players where it was throwing undefined on first time 2021-03-08 12:34:32 +01:00
Levent007
c83bcfb8ae modify of debug condition + turning string to int + making them default active 2021-03-08 11:33:49 +01:00
Levent007
6f4b592df6 Adding waitOnNewGames and waitTimeOnNewGame to seeding-mode plugin 2021-03-08 11:31:32 +01:00
Levent007
30475da013 Adding Event Broadcast To The Plugin SocketIOAPI 2021-03-07 23:45:53 +01:00
Levent007
31fb8a4f5d changing the init for this.players after the for loop 2021-03-07 21:32:44 +01:00
Levent007
425df2725f Forget to add getSquadByID method 2021-03-07 20:43:45 +01:00
Levent007
d646329efc players methos now have squad and team names + new method getSquad 2021-03-07 20:38:46 +01:00
Thomas Smyth
b9dcfb8b62 Add notice regarding v3.0.0 version bump 2021-03-07 17:43:12 +00:00
Thomas Smyth
b2b4ca65a2 Various README Improvements 2021-03-07 17:33:20 +00:00
Thomas Smyth
3c5ac9bfee Add Squad Wiki Team to credits 2021-03-07 16:23:43 +00:00
Thomas Smyth
cae18761ba Update version checking system 2021-03-07 15:15:34 +00:00
Thomas Smyth
2367ed89e4 Tidy PLAYER_DISCONNECTED event 2021-03-07 14:29:57 +00:00
Thomas Smyth
996418052d ESLint & README Generation 2021-03-05 17:32:31 +00:00
Thomas Smyth
1108b71589
Merge pull request #160 from milutinke/master 
Fixed bug #148. Added PLAYER_DISCONNECTED event
 2021-03-05 17:31:48 +00:00
Levent007
ce53d33b1e Fix for the placeholder plugin 2021-03-05 17:45:45 +01:00
Levent007
68b44c7431 Shorten the example aswell the server socket init 2021-03-05 17:12:39 +01:00
Levent007
7166615b3b Renaming the plugin cz why not? 2021-03-05 17:04:18 +01:00
Levent007
7771376a26 Replacing githubraw with CDN(jsDelivr) 2021-03-05 17:00:38 +01:00
Levent007
456b7e08fc Fix typo 2021-03-05 10:19:21 +01:00
Levent007
d718148775 Richment of the documentation 2021-03-05 10:18:03 +01:00
Levent007
e37f6aad08 Squad IO API Plugin 2021-03-04 23:36:57 +01:00
Levent007
d2c2844755 adding failover for pull layer (Fixing issues with Chinese firewall) 2021-03-04 15:55:36 +01:00
Dusan Milutinovic
1a9f1b04da
Update player-connected.js 2021-03-02 20:30:22 +01:00
Dusan Milutinovic
ef02ec76ba
Update player-disconnected.js 2021-03-02 20:30:09 +01:00
Dusan Milutinovic
0e7bc2fc91 Fixed bug #148. Added PLAYER_DISCONNECTED event 2021-03-02 00:05:46 +01:00
werewolfboy13
9d67d042f0 Updated node version with template. 2021-02-27 19:49:15 -06:00
Thomas Smyth
a16edebdf2 Update credits 2021-02-28 01:09:51 +00:00
Thomas Smyth
503b21e38e Add back DiscordPlaceholder plugin 2021-02-28 00:45:21 +00:00
got2bhockey
82586a970a Ported Grafana dashboard to v2 format 2021-02-27 19:03:10 -05:00
Thomas Smyth
b6cbea325e Use current layer and not history in status 2021-02-27 10:24:44 +00:00
Thomas Smyth
62d925b4fd Add queue length to player count in API ping 2021-02-26 15:53:01 +00:00
Thomas Smyth
89ee15de3f Use A2S player count in API ping 2021-02-26 15:48:45 +00:00
Thomas Smyth
2704b099de Tidy SquadJS API ping error message 2021-02-26 10:56:26 +00:00
Thomas Smyth
0a495b0fa4
npm install warning 2021-02-26 10:38:53 +00:00
Shanomac99
4008075fba Corrected Squad Wiki Data. 
- Changed layer classname to use level name
- Updated github link to a more permanent folder location.
 2021-02-26 02:17:34 -05:00
Thomas Smyth
27d71f0672
Merge pull request #145 from SeanWalsh95/patch-1 
Patch 1
 2021-02-25 22:03:45 +00:00
got2bhockey
62ed62830c Added toLowerCase to address case sensitive config 2021-02-25 16:53:54 -05:00
SeanWalsh95
a2c043ef4c prefer throwing error to catch 
- rm try/catch
prefer to throw error on failure to fetch layer information as it is critical to the apps operation

+add log line to indicate a force update

+increase verboseness of already pulled log as it is not critical info
 2021-02-25 15:50:18 -05:00
Thomas Smyth
c8a26544de
Merge pull request #142 from milutinke/master 
Intervalled Broadcasts plugin causes a crash
 2021-02-25 20:32:20 +00:00
Dusan Milutinovic
7f050e1909 Intervalled Broadcasts on the line 47 causes a crash because of undefined. The code should have been this.options.broadcasts instead of this.broadcasts 2021-02-25 21:26:40 +01:00
SeanWalsh95
2b565eb965 ESLint & README Generation 2021-02-25 17:38:00 +00:00
SeanWalsh95
6cd99f8bc9
try/catch axios request + set pulled flag 
Wraps axios request with try/catch for cases where we do not get a response or get an error

sets `this.pulled` flag after receiving and parsing response
 2021-02-25 12:37:20 -05:00
Thomas Smyth
d8b9b09b72 Fix bug in seeding plugin 2021-02-25 17:26:26 +00:00
Thomas Smyth
2703afbd7d Add additional logging 2021-02-25 13:02:08 +00:00
Thomas Smyth
636282236f Fix Discord bot status 2021-02-25 11:59:34 +00:00
Thomas Smyth
19f5b8f879 Rename deployable take damage event 2021-02-03 23:30:54 +00:00
Thomas Smyth
28540fce26 Add deployable take damage event 2021-02-03 22:31:38 +00:00
Thomas Smyth
86a8b89ef9 Initial Squad v2 Layer Support Bug Fixes 2021-02-03 22:29:42 +00:00
Thomas Smyth
2ba79210f6 Fix round winner layer name 2021-02-03 20:44:55 +00:00
Thomas Smyth
476afc0688 Track admin cam usage over RCON instead of logs 2021-02-03 19:17:25 +00:00
Thomas Smyth
a289188dfa Initial Squad v2 Layer Support Bug Fixes 2021-02-03 18:41:35 +00:00
Thomas Smyth
b5a3f4c59b Initial Squad v2 Layer Support 2021-02-03 17:33:01 +00:00
Thomas Smyth
69096b00af ESLint & README Generation 2021-01-30 17:23:25 +00:00
Thomas Smyth
9b5603d2b7
Merge pull request #135 from 11TStudio/patch-4 
Update scbl-info.js
 2021-01-30 17:21:50 +00:00
Thomas Smyth
2da73e58d2 Sort plugins alphabetically 2021-01-30 17:01:52 +00:00
11T Studio
3d464cb4c7
Update scbl-info.js 
if we have no info about the user than it should stop the code there.
 2021-01-30 16:38:14 +01:00
Thomas Smyth
95b8baf560 Dynamically load plugins 2021-01-30 14:39:56 +00:00
Thomas Smyth
90540f0e09 Fix error in auto-tk-warn 2021-01-28 20:13:53 +00:00
Thomas Smyth
b5fb12e739
Merge pull request #134 from SeanWalsh95/admin-list-edits 
Admin list edits
 2021-01-28 18:18:19 +00:00
SeanWalsh95
6a1cce8720 prefer for loop for readability 2021-01-28 12:47:08 -05:00
SeanWalsh95
b965e4a1d6 admin list parse improvements 2021-01-28 12:41:13 -05:00
Thomas Smyth
f2717e0f62 Wrap SCBL API call in try catch 2021-01-15 10:27:58 +00:00
Thomas Smyth
a5f35d5915 Fix SCBL Info plugin's threshold option 2021-01-15 09:55:10 +00:00
Thomas Smyth
6f2c9507e3 Fix template literals for copyright message 2021-01-14 21:43:51 +00:00
Marek
dad56897f6
fixed terminology 2021-01-15 02:23:37 +06:00
werewolfboy13
8ea54b9f4f Updated Year For Copyright Message 2021-01-14 14:09:21 -06:00
SeanWalsh95
0937c528b3 ESLint & README Generation 2021-01-12 23:31:59 +00:00
SeanWalsh95
b51c100f55 fix for issue #124 
lists use .includes not in
 2021-01-12 18:30:02 -05:00
SeanWalsh95
0457464113 simplify tracking conditions 2021-01-12 16:21:33 -05:00
Thomas Smyth
b604ab9195
Merge pull request #125 from SeanWalsh95/kick-unassigned-patch 
Auto-Kick-Unassigned patch
 2021-01-12 17:08:58 +00:00
SeanWalsh95
c29d924524 fix refrence change per f67a8bb 2021-01-12 12:09:09 -05:00
SeanWalsh95
76129078c3 rm async/await on non asynchronous functions and calls 2021-01-12 12:02:38 -05:00
SeanWalsh95
4aa0412ee5 move adminList logic to pulling from server instead of storing copy on init 
changes per https://github.com/Thomas-Smyth/SquadJS/pull/125#issuecomment-758783309
 2021-01-12 11:59:08 -05:00
SeanWalsh95
5c5be9295c Fix bug whre getAdmin returns perms instead of S64IDs 2021-01-12 11:33:28 -05:00
SeanWalsh95
b17a411f8d move adminList gets to mount() 2021-01-12 11:17:55 -05:00
Thomas Smyth
90795883fd Update dependencies 2021-01-09 15:16:00 +00:00
Thomas Smyth
8ca9c0b38b Update SquadJS API requests 2021-01-09 14:51:59 +00:00
Thomas Smyth
62b857c391 Fix identation 2021-01-08 15:41:51 +00:00
werewolfboy13
59f93c6e67 fixed placing 2021-01-08 09:38:22 -06:00
werewolfboy13
88975c3b4d added examples 2021-01-08 09:22:47 -06:00
werewolfboy13
47ee70eaa8 fixed templates 2021-01-07 17:45:56 -06:00
Thomas Smyth
23518b4d97 Add SCBL plugin 2021-01-07 20:52:55 +00:00
Thomas Smyth
f67a8bba93 Rename readme 2021-01-07 16:38:59 +00:00
Thomas Smyth
2ea2ec7484 Improve logo on startup 2021-01-07 16:37:27 +00:00
Thomas Smyth
92d77e3712 Update axios 2021-01-05 00:02:13 +00:00
Thomas Smyth
cb5088d88a Fix gradient error 2021-01-04 22:51:32 +00:00
11T Studio
34e5118ac8
Forget return after condition is ment 2021-01-01 19:40:52 +01:00
Thomas Smyth
4a9521a8f9 Merge branch 'beta' into pr/112 2020-12-26 17:58:20 +00:00
Thomas Smyth
dd0c751315
Merge pull request #113 from SeanWalsh95/unassigned-kick-patch 
Edits to auto-kick-unassigned docs
 2020-12-26 17:11:19 +00:00
11T Studio
203f357888
Check only via layerclassname 
This would fix the issues with showing the last played layer and not the current one.
 2020-12-22 23:25:42 +01:00
SeanWalsh95
1dc32cb4b6 Change config to always use Seconds 2020-12-22 17:12:30 -05:00
SeanWalsh95
d1a4bd276a alter auto-kick-unassigned docs to be more clear 2020-12-22 13:52:42 -05:00
SeanWalsh95
a2e8c37934 fix db-log 2020-12-16 15:24:35 -05:00
SeanWalsh95
3a2c67474b make plugin options an unorderd list 2020-12-16 15:17:55 -05:00
SeanWalsh95
dff68be6bc small spelling fixes 2020-12-16 14:28:55 -05:00
SeanWalsh95
35f874daf1 rm legacy flag from config 2020-12-16 14:22:01 -05:00
SeanWalsh95
ba8bc215fb prefer relitive links 2020-12-16 14:21:31 -05:00
SeanWalsh95
9ea999cb13 rm second br 2020-12-16 14:07:41 -05:00
SeanWalsh95
1a8eface18 better formatting for github 2020-12-16 14:05:25 -05:00
SeanWalsh95
683d91de1c rm redundant hz rule 2020-12-16 14:03:50 -05:00
SeanWalsh95
7d37369de9 alternate cfg for FTP + readme changes 
nested ftp config inside server cfg to pass entire cfg to LogParser, alterations are overridden as needed.

Formatted readme to be able to find relevent sections quicker by collapseing detailed content.

moved info about creating plugins to plugin folder and refrenced from main readme

Small changes to readme to support new formats in the cfg file
 2020-12-16 14:00:40 -05:00
Thomas Smyth
58c3521679 Merge branch 'beta' of https://github.com/Thomas-Smyth/SquadJS into beta 2020-12-14 17:29:28 +00:00
Thomas Smyth
2ae4490829 Import DiscordTeamkill 2020-12-14 17:29:07 +00:00
Levent007
c787aa3565 Adding support for multi-ip rcon 2020-12-12 21:47:06 +01:00
Thomas Smyth
baf07a79b6 Refactor log parser 2020-12-10 20:46:29 +00:00
Thomas Smyth
f434e94199 Refactor RCON 2020-12-10 18:51:32 +00:00
Thomas Smyth
f6134e0659 Fix sequelize connection string config 2020-12-09 14:33:56 +00:00
SeanWalsh95
465a281828
I hate the web editor 2020-12-08 16:43:00 -05:00
SeanWalsh95
b9d18c690e
Update config-template.json 2020-12-08 16:40:26 -05:00
SeanWalsh95
f55df738cf
add nested logger settings to template 2020-12-08 16:36:34 -05:00
SeanWalsh95
238fcc79f4
update config references 2020-12-08 15:27:17 -05:00
Thomas Smyth
879a20a87a
Merge pull request #107 from SeanWalsh95/patch-1 
SquadJS logging for MySQL
 2020-12-08 20:20:51 +00:00
SeanWalsh95
2d70653609
Update factory.js 2020-12-08 15:01:21 -05:00
Thomas Smyth
fc904d37ca Correct reviver name type 2020-12-08 18:28:07 +00:00
Thomas Smyth
daee6f50db Add match to TickRate and PlayerCount 2020-12-08 17:58:31 +00:00
SeanWalsh95
362468c252
Log MySQL to logger 
Sends Sequelize logging to Logger.verbose so that it is toggleable via SquadJS configs
 2020-12-08 12:39:34 -05:00
Thomas Smyth
c350d767e6 Fix typo 2020-12-08 17:32:43 +00:00
Thomas Smyth
491c31ef56 Update readme with logDir info 2020-12-08 17:32:26 +00:00
Thomas Smyth
b156772cf0 Update readme with FTP info 2020-12-08 17:30:49 +00:00
Thomas Smyth
cef5e0d337 Replace loc with source 2020-12-08 17:26:31 +00:00
Thomas Smyth
09a919a328 Update readme 2020-12-08 17:22:36 +00:00
Thomas Smyth
8a29ad043f Fix out of date version system 2020-12-08 17:16:32 +00:00
Thomas Smyth
fb7ba533a9 Throw error on missing plugin 2020-12-08 16:52:44 +00:00
Thomas Smyth
255e9c7968 Convert AutoKickUnassigned & Tidy Code 2020-12-08 16:40:56 +00:00
Thomas Smyth
fae5dd4efa
Merge branch 'v2' into auto-kick-afk 2020-12-08 12:17:02 +00:00
Thomas Smyth
fc629ebc77 DBLog Plugin 2020-12-08 12:13:53 +00:00
SeanWalsh95
83fb25737e format object passed in event 2020-12-07 21:59:45 -05:00
Thomas Smyth
e02a5417f6 Add matches to DBLog 2020-12-06 23:09:33 +00:00
Thomas Smyth
3fb00b6dd1 Add player counts to DBLog 2020-12-06 21:45:06 +00:00
Thomas Smyth
915ec298f3 Lint 2020-12-06 21:23:05 +00:00
Thomas Smyth
6107612fb2 DBLog Plugin WIP 2020-12-06 21:21:41 +00:00
Thomas Smyth
ea72cd0666 Merge branch 'v2' of https://github.com/Thomas-Smyth/SquadJS into v2 2020-12-03 14:16:43 +00:00
Thomas Smyth
dd685ecd80 Rewrite of plugin system 2020-12-03 14:16:07 +00:00
SeanWalsh95
88edf5ca5b
small discord-rcon fix 2020-11-17 15:23:45 -05:00
SeanWalsh95
c7b2763cc7 AdminList suport for local files 2020-11-10 11:31:24 -05:00
Thomas Smyth
86d0878174 Add verbose shortcut to plugins 2020-11-10 13:04:38 +00:00
Thomas Smyth
3daf73de86 Add more logging from SquadServer 2020-11-09 21:10:32 +00:00