ensl/ensl_gathers
0
0
Fork 0
mirror of https://github.com/ENSL/ensl_gathers.git synced 2024-11-29 15:42:18 +00:00
Code Issues Projects Releases Packages Wiki Activity
537 commits 58 branches 3 tags 8.4 MiB
Commit graph

537 commits

This branch
This branch
All branches
Author SHA1 Message Date
Absurdon
9af3466bc9
Merge pull request #144 from AngelRionCervi/master 
replaced ts with dc
 2019-06-21 15:42:31 +02:00
AngelRionCervi
7402dbcdd0 replaced all teamspeak with all discord 2019-06-18 23:31:16 +02:00
AngelRionCervi
d8300cbbfa gerge branch 'master' of https://github.com/cblanc/sws_gathers 2019-06-17 19:51:27 +02:00
AngelRionCervi
d9540a460e Added graphic to show the picking pattern (#143) 
* renamed pickingPattern -> getPickingPattern
 2019-06-10 10:07:21 +02:00
AngelRionCervi
669235846a fixed conflicts 2019-06-10 10:02:50 +02:00
AngelRionCervi
a9e8d0848a renamed pickingPattern -> getPickingPattern 2019-06-10 09:50:43 +02:00
AngelRionCervi
3c253a7c4b Added graphic element to show the picking pattern (#142) 
* added picking pattern

* removed all changes to helpers
 2019-06-10 08:55:46 +02:00
AngelRionCervi
e50025de6d removed all changes to helpers 2019-06-09 22:30:28 +02:00
AngelRionCervi
eb1c4e7c6d added picking pattern 2019-06-09 16:14:19 +02:00
AngelRionCervi
4fb3d7e22d disabled prog mod gather (#141) 2019-06-06 20:35:31 +02:00
AngelRionCervi
0c40591118 disabled prog mod gather 2019-06-04 18:58:08 +02:00
ArturPhilibin
e7e93121c6 Changed picking system back to 1-2-2-... eventually theyll realise theres no such thing as balanced teams... until then :) (#140) 
Also removed empty socket.on('disconnect' callback
 2019-05-28 22:45:03 +02:00
AngelRionCervi
a7c9072048 reworked and fix minimized drawer (#137) 
* added icons imgs for minimized drawer

* added 1 css class for imgs in minimized drawer

* rework minimized drawer a bit

* remove some console.log i forgot about

* modified sources of icons for when the drawer is minimized and so removed the function to get them

* added the icons path to the json representing the gather instance

i dont even know what im doing

* setup icons path

* linked icons from gather_pool.js to the front end ..?

i'm kinda lost here
 2019-03-25 08:42:15 +01:00
HystesGitHub
99a40bfc40 fixing join server link #2 (#132) 
* Update gather.js

Didn't test in the app, but this should make you join the server and not only the game :).

* Update gather.js
 2019-02-14 21:22:33 +01:00
ArturPhilibin
a6a945281a New picking system (#133) 
* Changed picking system to 1-1-1-2-1-1-2-1

* removed code committed by accident from customizable picking system branch

* changes picking order logic to handle cases where teams are larger than 6v6

* add a safety check on the picking logic to prevent a team ever growing beyond the team size limit regardless of the picking order defined

* add a safety check on the picking logic to prevent a team ever growing beyond the team size limit regardless of the picking order defined
 2019-02-14 21:22:03 +01:00
ArturPhilibin
3d3323fe13 Refactored approach to showing offline users (#131) 2019-02-14 21:21:29 +01:00
HystesGitHub
8fe13a0629 Update gather.js (#129) 
Didn't test in the app, but this should make you join the server and not only the game :).
 2019-01-14 07:25:55 +01:00
ArturPhilibin
4553d8aee0 Styled gatherer names with italics if they are no longer on the gather (#127) 
page.
Displays a somewhat inaccurate (but in the afk gatherers favour) idle
timer in the gatherer info panel.
 2019-01-10 18:15:14 +01:00
ArturPhilibin
39c64072c0 Removed all references on the FrontEnd to a global server list, its gone now, also made the FrontEnd gracefully handle archived gathers with no servers (#125) 2018-12-29 16:28:15 +01:00
ArturPhilibin
4b2d67f524 Adding progmod gathers (#124) 
* basic implementation of filtered servers and progmod gathers, need to refactor the changes ive done to servers, want to add them to the gather object instead of that ugly copy on the frontend

* refactored server list by attaching them to the gather object allowing them to be filtered by gather type rather than a global list

* fixed issue where page would crash if there were fewer than 2 server options
 2018-12-29 14:43:05 +01:00
ArturPhilibin
23c96196f8 Changed gather kick method to log only the kicked user's id instead of their username, username not immediately available and too lazy to figure out where to find it (#122) 2018-12-15 15:44:44 +01:00
Absurdon
efaa7ae94f Added logging for admin removal 2018-12-01 12:21:56 +01:00
Absurdon
2531d82221
Removing references to discordBot 2018-11-20 20:22:53 +01:00
Absurdon
ea0ae11af6 Disconnect socket on error so it doesn't spam with retries 2018-11-19 00:25:43 +01:00
Absurdon
62bc539cd2 put socket back in component and added some error logging 2018-11-18 23:32:55 +01:00
Absurdon
30af1ecfe6 Removing the discord bot 2018-11-18 22:32:11 +01:00
Absurdon
5d69f56d7a open socket when main component mounts 2018-11-18 22:13:47 +01:00
Absurdon
7a8518caf6 removing http replacement in protocol 2018-11-18 21:19:19 +01:00
Absurdon
c8fb59cfcf Gather-Bot notifies chanel on restart 2018-11-18 21:00:36 +01:00
Absurdon
c688568b46 try explicitly stating the port 2018-11-18 20:43:47 +01:00
Absurdon
60653e12af Changing socket-protocol to ws(s) instead of http(s) 2018-11-18 20:09:48 +01:00
Absurdon
1de9c655c5 Decouple socket from React App-component 2018-11-18 18:37:06 +01:00
Absurdon
247557202c Trying to force heroku to run on lts nodejs 2018-11-18 17:52:43 +01:00
Absurdon
01351c8d8b Fixing issues after upgrading socket.io version 2018-11-18 17:36:56 +01:00
Absurdon
cd648d6c6c Updating dependencies and reresolving dependency tree 2018-11-18 16:38:21 +01:00
Absurdon
9746b46380 Updating node version in package.json 2018-11-18 15:37:47 +01:00
Absurdon
ec17c604b9 Changed picking rotation 
* Teams are now picked 1-2-1-1-1-1-1-1-1-1
 2018-11-18 15:11:23 +01:00
Chris Blanchard
422b87d18a
Merge pull request #119 from cblanc/snyk-fix-zc7rb3 
[Snyk] Fix for 1 vulnerable dependencies
 2018-10-24 10:17:06 +02:00
snyk-bot
722e0247fa fix: package.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/npm:fresh:20170908
 2018-10-24 05:25:10 +00:00
Absurdon
a7da403571 Fixing steamId not beeing set properly so hive id could not be retrieved 2018-04-14 13:24:05 +02:00
Absurdon
0a956b80bd Replace non working Hive-Url with link to observatory profile 2018-03-18 18:23:09 +01:00
Chris Blanchard
b68556465a
Merge pull request #111 from cblanc/snyk-fix-fedb9aa4 
[Snyk Update] New fixes for 4 vulnerable dependency paths
 2018-02-19 11:22:09 +00:00
snyk-bot
4e72f90543 fix: package.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/npm:hoek:20180212

Latest report for cblanc/sws_gathers:
https://snyk.io/test/github/cblanc/sws_gathers
 2018-02-16 23:05:32 +00:00
Chris Blanchard
b20b7d6abb
Merge pull request #110 from cblanc/snyk-fix-7d5d37d4 
[Snyk Update] New fixes for 3 vulnerable dependency paths
 2018-02-15 11:10:46 +00:00
snyk-bot
1694c2e4a1 fix: package.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/npm:lodash:20180130
- https://snyk.io/vuln/npm:lodash:20180130

Latest report for cblanc/sws_gathers:
https://snyk.io/test/github/cblanc/sws_gathers
 2018-02-14 23:04:35 +00:00
snyk-bot
a029ea1979 fix: package.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/npm:uglify-js:20151024

Latest report for cblanc/sws_gathers:
https://snyk.io/test/github/cblanc/sws_gathers
 2018-01-27 11:31:15 +01:00
Absurdon
48d3582107 Hopefully preventing application from crashing should hive not respond properly 2017-11-23 21:47:07 +01:00
Absurdon
18619214f3 Merge pull request #107 from myxious/master 
Fix the hamburger menu on mobile devices
 2017-09-16 18:48:41 +02:00
Myx
a16fbbf202 fix the hamburger menu on mobile devices 2017-09-09 20:35:00 +05:00
Absurdon
74c64121cf Added new flags to public folder 2017-08-24 07:50:05 +02:00