Fix

[CoderJoeW]

Correct database intergration(wont interrupt game if one is not present)

Includes code to log incorrect passwords

Theres probably some other stuff i added in here but i cant remember(i mean it took 4 months for the first commit to be accepted)

• [ ]  General Comment
• Please fix merge conflicts Also, you appear to have added your AWS credentials to config.json, probably should remove those
• And please for god's sake, squash it.
• Fixed conflicts//Added comments to config// Removed my auth vals
• :shipit:
• fixed
• [ ]  File: config.json:L32-44
• Comments are not valid JSON, please remove them
• [ ]  File: src/server/server.js:L6-25
• You should be using the config option here, not an environment variable

   

[abalabahaha]

Please fix merge conflicts

Also, you appear to have added your AWS credentials to config.json, probably should remove those

[Nikitaw99]

And please for god's sake, squash it.

[CoderJoeW]

Fixed conflicts//Added comments to config// Removed my auth vals

[CoderJoeW]

:shipit:

[CoderJoeW]

fixed

[CoderJoeW]

Resolved conflicts now ready to be deployed!!

[CoderJoeW]

Needs to be merged to fix database issues introduced in last pull request

[huytd]

And let's squash this pull request into a single commit :D

[CoderJoeW]

When I find some free time I will work on adding a level up system perhaps based on a timeAlive/avgMass?