simon
947deea784
Merge remote-tracking branch 'origin/vaults' into vaults
2018-01-14 12:04:04 -05:00
simon
4293fc0315
Support for variable World size
2018-01-14 12:02:32 -05:00
Simon Fortier
f1c1f8f807
Merge pull request #120 from sg495/vaults
...
New additional code for Vault doors
2018-01-09 19:22:42 -05:00
sg495
a04207b5e0
Added some cyphers for use in vault doors.
...
1. Created net.simon987.server.crypto package and moved RandomStringGenerator there.
2. Created CryptoProvider class, added a global instance to GameServer for use by game entities.
3. Created interface for cyphers, abstract class for shift substitution cyphers, classes for no cypher, Caesar cypher, Vigenere cypher and autokey cypher.
4. Created some Crypto exceptions.
5. Removed static encryption/decryption methods from VaultDoor, and moved getRandomPassword() to the global CryptoProvider instance.
2018-01-09 17:14:31 +01: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
simon
9bb0dc9034
Boilerplate code for Vault Door
2018-01-05 20:42:24 -05:00
simon
ce0584a49f
Merge remote-tracking branch 'origin/master'
2018-01-05 19:46:01 -05:00
simon
0dc4ddca0f
Fixes de-syncing problem with Factory and their NPCs
2018-01-05 19:45:51 -05:00
Simon Fortier
811a443a4e
Merge pull request #106 from meet-mrmaker/master
...
Removed gather_slow. Fixes #10
2018-01-04 17:17:10 -05:00
Josh
17359161fd
Update for issue #10
...
Removes slow and fast gather and retains gather for 1 tick.
2018-01-04 17:49:02 +11:00
Josh
afbbce215e
Merge pull request #2 from simon987/master
...
Update
2018-01-04 12:14:03 +11:00
Simon Fortier
1a39cf8454
Create CONTRIBUTING.md
2018-01-03 20:07:48 -05:00
simon
9bc3cbf4ce
Remove NPC reference to Factory on death
2018-01-03 19:22:45 -05:00
simon
9b908a5310
Biomass count on NPC death is loaded from config
2018-01-03 19:19:19 -05:00
Simon Fortier
8ceeca564a
Merge pull request #66 from jtara1/master
...
HarvesterNPC should spawn a biomass in-place after they die. Fixes #33
2018-01-03 19:00:55 -05:00
Simon Fortier
d4fcf22550
Merge pull request #105 from sg495/master
...
Windows instructions added
2018-01-03 17:09:23 -05:00
Simon Fortier
d25d42534a
Merge pull request #104 from meet-mrmaker/meet-mrmaker-patch-1
...
Update to address issue #101
2018-01-03 17:08:10 -05:00
sg495
58a378d77f
Updated instructions for Windows installation and running.
2018-01-03 20:14:31 +01:00
sg495
cfaf46ad52
Added installation instructions for Windows (tested on Windows 10).
2018-01-03 17:59:46 +01:00
sg495
ba53212986
Merge pull request #1 from simon987/master
...
getting up to date
2018-01-03 13:04:59 +01:00
Josh
7bb5f68ff2
Edited for style conformance
2018-01-03 22:24:32 +11:00
Josh
65ec6a2102
Merge pull request #1 from meet-mrmaker/meet-mrmaker-patch-1
...
Update to address issue #101
2018-01-03 18:36:52 +11:00
Josh
5a994fe437
Update to address issue #101
2018-01-03 18:36:18 +11:00
Simon Fortier
415500faa9
Merge pull request #103 from simon987/mongo
...
Loading & Saving support for MongoDB
2018-01-02 20:36:29 -05:00
James T
3ded64cb16
Update #66 : add newest Server/Server.iml file
2018-01-02 15:29:14 -08:00
simon
1a0291d517
New players are now scattered around the spawn point
2018-01-02 18:11:24 -05:00
simon
4e76d57ef9
Loading & Saving support for MongoDB
2018-01-02 17:45:58 -05:00
Simon Fortier
2a5d6b5a13
Fixes #99
2018-01-01 16:12:42 -05:00
simon
e2763faeee
Fixes #97
2018-01-01 15:58:42 -05:00
simon
2a8658c598
Fixes #90
2018-01-01 15:28:12 -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
Simon Fortier
c3a0d1bd4d
Merge pull request #93 from ChartreuseK/bug-80
...
Added handling of offset overflow and DUP factor overflow
2018-01-01 15:12:01 -05:00
Dylan Sheehy
cd8d883134
Charging energy from biomass now looks up value in config.properties
2018-01-01 13:39:57 -06:00
Simon Fortier
c7946a6356
Merge pull request #87 from ChartreuseK/bug-81
...
Added minimum length check to 'DW' parsing
2018-01-01 14:36:38 -05:00
Dylan Sheehy
7ee361b0bc
Inventory hardware: Now clearing a biomass gains 4000 kJ.
2018-01-01 13:15:14 -06:00
simon
1e26c63358
Boolean result of ComPort actions are stored in B register
2018-01-01 12:03:36 -05:00
Simon Fortier
d832f65535
Merge pull request #84 from mlaga97/npc-combat
...
Allow ability to damage NPCs with Laser. Fixes #34
2018-01-01 11:07:04 -05:00
Hayden Kroepfl
e47e573b61
Added handling of offset overflow and DUP factor overflow, added new exception type.
2018-01-01 08:30:39 -07:00
Simon Fortier
93786d92cb
Merge pull request #83 from Francessco121/feature/pushf-popf
...
Add PUSHF and POPF instructions
2018-01-01 10:20:27 -05:00
Hayden Kroepfl
34178016b1
Added minimum length check to 'DW' parseing, fixes indexoutofboundsexception
2018-01-01 05:17:37 -07:00
Luc Lagarde
b31c187ad5
Allow NPCs to be damaged and killed
2017-12-31 18:26:44 -06:00
Ethan Lafrenais
deb3859dff
Add PUSHF and POPF instructions
2017-12-31 18:25:46 -05:00
Simon Fortier
b21e33601e
Added links to VS code extensions
2017-12-31 11:44:09 -05:00
Simon Fortier
b2474494cc
Merge pull request #75 from sgerrand/dockerize
...
Add a Docker image definition for the application and a Docker Compose configuration file
2017-12-31 09:56:07 -05:00
Simon Fortier
6b2e3c17ed
Merge branch 'master' into dockerize
2017-12-31 09:54:41 -05:00
Simon Fortier
079a63e39c
Merge branch 'master' into dockerize
2017-12-31 09:52:45 -05:00
Simon Fortier
347dc2bce0
Merge pull request #76 from arthurpaulino/renaming-action-labels
...
Aligning action labels with documented examples
2017-12-31 09:42:20 -05:00
Simon Fortier
90ad8e82eb
Merge pull request #74 from mlaga97/patch-1
...
Add Linux build instructions to README.md
2017-12-31 09:38:39 -05:00
