20 Commits

Author SHA1 Message Date
simon
1a5d12a19f updated Docker support 2018-05-11 16:42:03 -04:00
simon
315e33055e Reorganised css files, some work on the home page design, console screen is now in a resizable panel 2018-04-29 11:17:54 -04:00
simon
e025b6d2da SSL now working and reorganised web server 2018-04-28 12:06:55 -04:00
simon
113aa50d87 Websocket auth up and running 2018-04-27 21:28:46 -04:00
simon
1d780f7d9b Minor refactor 2018-03-11 13:34:10 -04:00
simon
9cac665101 Debug commands are easier to add. Added comPortMsg command 2018-03-10 11:24:29 -05:00
simon
dc19176dc8 Merge branch 'master' into vaults
# Conflicts:
#	Server/src/main/java/net/simon987/server/game/GameObject.java
#	Server/src/main/java/net/simon987/server/game/World.java
#	Server/src/main/java/net/simon987/server/webserver/TerrainRequestHandler.java
2018-03-10 09:53:55 -05:00
Simon Fortier
d1a3cf9307
Merge pull request #110 from djsheehy/shield-hardware
Added Shield hardware
2018-03-05 22:18:44 -05:00
simon
039088ac00 Added electric boxes, debug command to teleport objects across Worlds. 2018-02-27 16:49:32 -05:00
simon
8c6e580ea9 Added support for multiple dimensions 2018-02-25 14:15:03 -05:00
simon
a7d1a00ae8 Fixes #27 2018-02-25 08:51:03 -05:00
sg495
46483b2bf8 Added a RandomString class from stackoverflow, to generate random alphanumeric strings (to be used as passwords).
Added some code to VaultDoor, including random password generation and code to encrypt/decrypt under a Vernam-like cypher.
Modified door opening policy to include the possibility of keeping the door open.
2018-01-08 20:40:50 +01:00
Dylan Sheehy
7e773699b6 Created Shield hardware 2018-01-05 11:04:05 -06:00
simon
9b908a5310 Biomass count on NPC death is loaded from config 2018-01-03 19:19:19 -05:00
simon
85548ec3cb CHanged default energy value for biomass to 4000 + code styling 2018-01-01 15:21:39 -05:00
Simon Fortier
0f7b40f3ae
Merge pull request #95 from djsheehy/master
Inventory hardware: clearing a biomass yields energy. Fixes #94
2018-01-01 15:19:50 -05:00
simon
ee60216784 Small adjustments for laser hw, Improved OffsetOverFlow handling, Increased maximum guest count 2018-01-01 15:17:24 -05:00
Dylan Sheehy
cd8d883134 Charging energy from biomass now looks up value in config.properties 2018-01-01 13:39:57 -06:00
Jesse Nieminen
ea3b06c54c
Fix typos
Fixed typos in comments.
2017-12-30 23:52:06 +02:00
Jacob Swehla
59e3e9430e Maven and file access
- Server config file is now accessed through the class loader
- Maven outputs server.jar, moves dependencys to adjacent /libs, and plugins to adjacent /plugins
2017-12-29 10:00:19 -06:00