Commit Graph

666 Commits

Author SHA1 Message Date
SeanWalsh95
7cd7133bc6
grammar 2022-07-12 15:42:57 -04:00
SeanWalsh95
333e5fc7ee
rm unneeded blocking 2022-07-12 15:40:54 -04:00
SeanWalsh95
d5ee238157
remove unneeded flag 2022-07-12 15:33:55 -04:00
SeanWalsh95
2a2a09caa9
prefer camelCase with JS 2022-07-12 15:28:47 -04:00
SeanWalsh95
83de2491ac
spelling fix 2022-07-12 15:11:38 -04:00
SeanWalsh95
a2e677c13c
formatting 2022-07-12 15:07:43 -04:00
SeanWalsh95
61a20ef972
allow for victim to be notified on TK 2022-07-12 15:06:03 -04:00
Thomas Smyth
77fbdd9c51
Update version number 2022-07-09 13:07:31 +01:00
Thomas Smyth
ce0b6c9305
Merge pull request #246 from werewolfboy13/patch-1
Update print-logo.js
2022-07-09 13:07:01 +01:00
Thomas Smyth
9c7bb4ec13
Merge pull request #247 from IgnisAlienus/master
Update Grafana dashboard template
2022-07-09 13:06:13 +01:00
IgnisAlienus
e080a8bbf5 Grafana Template Update 2022-06-30 08:42:35 -07:00
Marek
42597d7030
Update print-logo.js
A change for the new CBL that was missed in #245.
2022-06-28 15:06:34 -05:00
Thomas Smyth
82850f6276
Merge pull request #245 from IgnisAlienus/master
Replace SCBL integrations with CBL integrations
2022-06-28 20:45:57 +01:00
IgnisAlienus
39fad4bcd6 CBL v2 2022-06-28 11:03:41 -07:00
IgnisAlienus
1d685f17d3 CBL 2022-06-28 11:01:31 -07:00
IgnisAlienus
c40b24f9d5 Updating SCBL references to CBL - Community Ban List 2022-06-28 10:00:52 -07:00
Thomas Smyth
053e100b88
Merge pull request #240 from ect0s/killfeed-fix
Add default value for victim's name in the DiscordKillFeed plugin
2022-05-27 15:19:30 +01:00
ect0s
382563e659 Update discord-killfeed.js 2022-05-27 10:07:09 -04:00
ect0s
1b78b6cfce Merge remote-tracking branch 'upstream/master' into killfeed-fix 2022-05-27 10:05:51 -04:00
ect0s
846fa0d927 Revert "Add default value case victim is nullptr"
This reverts commit 4c9aef454d.
2022-05-27 10:01:15 -04:00
Thomas Smyth
6769cf7f90
Add light logo to README template 2022-05-27 14:46:08 +01:00
ect0s
4c9aef454d Add default value case victim is nullptr 2022-05-27 09:08:56 -04:00
Thomas Smyth
26a8d53f2e
Merge pull request #237 from ect0s/adminlist-fetch-update
Update admin list on layer changes
2022-05-18 09:06:35 +01:00
Thomas Smyth
3b2b7236ec
Merge pull request #239 from ect0s/AdminCamUnpossed-DurationFix
Fix error when an admin leaves admin camera without being on the list of admins in admin camera for whatever reason
2022-05-18 09:05:17 +01:00
ect0s
57b741fbc8 Guard for Duration.
We may miss admins going into camera in the case of RCON shutdowns/SquadJS restarts.

This code should guard a promise rejection in the case an admin is not in the current tracking list.
2022-05-15 11:22:06 -04:00
Thomas Smyth
6d008ffa79
Show logo based on GitHub theme 2022-04-28 09:17:59 +01:00
ect0s
46ab36624a Added regular Adminlist update to newgame 2022-04-23 11:10:00 -04:00
Thomas Smyth
cdf3a1e36d
Merge pull request #234 from Team-Silver-Sphere/update-github-repo-url
Update other urls dependent on GitHub repo owner
2022-04-15 13:25:44 +01:00
Thomas Smyth
5454715bcf
Update other urls dependent on GitHub repo owner 2022-04-15 13:25:16 +01:00
Thomas Smyth
baa66b1c99
Merge pull request #233 from Team-Silver-Sphere/update-github-repo-url
Update SquadJS repository url
2022-04-15 13:15:58 +01:00
Thomas Smyth
3cd34e1d3c
Update SquadJS repository url 2022-04-15 13:15:21 +01:00
Thomas Smyth
813aca1bc0
Merge pull request #228 from ect0s/JSON-FIX
Attempt Fix vehicle filtering for maps with 0 tanks or helicopters
2022-02-13 08:32:27 +00:00
Thomas Smyth
170175f353
Merge pull request #229 from werewolfboy13/patch-1
Added VS to .gitignore
2022-02-13 08:31:47 +00:00
Marek
ff7a2f089d
Added VS to .gitignore
This will prevent the files the Visual Studio creates when editing the repo.
2022-02-12 14:37:26 -06:00
ect0s
5964b37769 Attempt Fix vehicle filtering for maps with 0 tanks or helicopters
2.12 Squad, some layers have no vehicles, so when reading JSON from the wiki team we reject a promise because no data[t].vehicles property, this sets to empty array before we attempt a filter.

Should stop promise rejection during startup
2022-02-12 13:59:11 -05:00
Thomas Smyth
f34426d61f
Merge pull request #221 from ect0s/NEW_GAME-Regex
Improve regular expression used to detect new games
2021-11-26 21:58:56 +00:00
ect0s
a2348c6bd1 Squad Commits, Robust new Game Regex
Attempt at more Robust Regex

This regex searches for all the current information we get via the NewGame event, but with a few patterns that search deeper/different folder structures.

Appears to work on all base game content and mods that I have tested, however, mods may capture garbage information inside of mapClassname.

This will also fail if a modder puts no folders between the root of their project and their layers

/mymod/mymap

vs

/mymod/afolder/mymap

afolder would end up being the mapClassname.

https://regex101.com/r/e0Ui0K/1
2021-11-26 15:01:10 -05:00
Thomas Smyth
d6c0edf37e
Bump version 2021-10-30 11:13:53 +01:00
Thomas Smyth
f2a2b49c55
Merge pull request #216 from Shanomac99/main
Changer layer image URL to new hosting location.
2021-10-30 11:12:48 +01:00
Shanomac99
fad74b19f6 Changed layer images to new hosting location.
Added rawName data type so images uses the correct data.
2021-10-29 21:44:21 -04:00
Thomas Smyth
19e3e753c8
Merge pull request #215 from 11TStudio/patch-6
Add SQUAD_CREATED to list of events emitted by Socket.io
2021-10-27 09:06:09 +01:00
11T Studio
dbbb708e3b
Add event SQUAD_CREATED
To be utilized via the SocketIO. (mainly SquadStatsJSPRO tbh)
2021-10-26 23:12:04 +02:00
Thomas Smyth
f825b4a65b
Merge pull request #209 from 11TStudio/patch-4
Add warn, kick and ban events to SocketIOAPI
2021-08-13 22:26:11 +01:00
11T Studio
e2ec5ee9bb
Kick, warn and ban added to emits 2021-08-13 23:18:08 +02:00
11T Studio
94bb989a83
Add DiscordKillFeed plugin 2021-08-12 20:49:59 +01:00
ect0s
4ca8839675
Add data to UPDATED_A2S_INFORMATION event 2021-08-07 22:44:29 +01:00
Thomas Smyth
ae19534404
Merge pull request #202 from 11TStudio/patch-2
Add link to README for socket.io plugin guide
2021-08-06 21:43:51 +01:00
Levent007
8daabbe801 Added the socket.IO guide link
Sorry >.<
2021-08-06 23:39:02 +03:00
11T Studio
ed0883c858
Adding the guide link to the documentation
This guide will be updated by me from time to time and will be kept up to date with the latest SquadJS versions.
2021-08-06 22:28:18 +02:00
Thomas Smyth
833b227c6f
Merge pull request #201 from 11TStudio/patch-1
Add PLAYER_AUTO_KICKED event to the broadcast-able socket.io messages
2021-08-06 19:40:11 +01:00