simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-04-18 02:06:43 +00:00
Code Issues Projects Releases Wiki Activity
245 Commits 5 Branches 5 Tags
Commit Graph

74 Commits

Author SHA1 Message Date
simon
4cd58c86a5 Refactor: changed the way game objects and cpu hardware are saved/loaded from the database #151 2018-05-12 15:32:42 -04:00
simon
854863ede9 Updated mongodb driver to 3.7.0 2018-05-11 21:06:18 -04:00
simon
e97ecbe380 Added javadocs 2018-05-01 15:41:51 -04:00
simon
083af31b84 Fixed websocket problem by upgrading spark version. Also fixed z-index problem with console 2018-04-29 17:00:42 -04:00
simon
3492e133e1 login/register working and Websocket partially implemented 2018-04-27 19:42:53 -04:00
simon
bd5f8573e8 Added web server and partly integrated frontend 2018-04-27 16:58:50 -04:00
simon987
9349ae108b Removed some unnecessary unit tests 2018-04-02 10:58:24 -04:00
simon987
292adb5483 Updated maven version numbers. Removed .iml files 2018-04-02 10:52:36 -04:00
simon987
41d674d74a Removed unused constant 2018-04-02 10:06:44 -04:00
Luc Lagarde
e62a51ee2e Modify LIDAR_GET_MAP to write to a given memory address 2018-03-28 23:37:05 -05:00
Luc Lagarde
217c997788 Add action to get world size from LiDAR 2018-03-28 23:34:23 -05:00
simon
ff61433c4b Fixed typo 2018-03-11 16:09:28 -04:00
simon
cbde2450fa Bug fixes: maxShield is now set on user creation and vault objectId is set on world generation 2018-03-11 16:06:15 -04:00
simon
cbb07891fc Cubot respawns on death. ElectricBox damages near objects 2018-03-10 15:22:11 -05:00
simon
2565d3338c Implemented shield hardware. Added heal, damage and charge shield debug commands. 2018-03-10 13:54:43 -05:00
simon
e4269b83c4 Fixed hardware deserialization issues 2018-03-10 11:51:31 -05: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
8ed192f8d0 Cubot implements Attackable (untested) 2018-03-10 09:49:34 -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
0ada6c29d4 More work on vaults 2018-03-01 10:42:24 -05:00
simon
8c6e580ea9 Added support for multiple dimensions 2018-02-25 14:15:03 -05:00
simon
3d10e4306b Merge branch 'master' into vaults 
# Conflicts:
#	Server/src/main/java/net/simon987/server/GameServer.java
#	Server/src/main/java/net/simon987/server/game/World.java
 2018-01-17 20:29:37 -05:00
simon
4293fc0315 Support for variable World size 2018-01-14 12:02:32 -05:00
simon
54b72e89b3 Fixes #121 + Saner thread safety 2018-01-09 22:10:55 -05:00
simon
735a231767 Moved tests to appropriate directory 2018-01-07 13:55:42 -05:00
simon
24d81d194e Fixes #107 2018-01-05 22:08:53 -05:00
simon
c7b9df0690 Fixes #91 2018-01-05 21:51:47 -05:00
simon
0bd25df977 Fixes #114 2018-01-05 21:35:35 -05:00
simon
9bb0dc9034 Boilerplate code for Vault Door 2018-01-05 20:42:24 -05:00
Dylan Sheehy
1da894959e fixed serialization code for CubotShield 2018-01-05 11:20:52 -06:00
Dylan Sheehy
7e773699b6 Created Shield hardware 2018-01-05 11:04:05 -06: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
7bb5f68ff2
Edited for style conformance 2018-01-03 22:24:32 +11:00
Josh
5a994fe437
Update to address issue #101 2018-01-03 18:36:18 +11: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
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
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
Luc Lagarde
b31c187ad5 Allow NPCs to be damaged and killed 2017-12-31 18:26:44 -06:00
Arthur Paulino
04374e6e0a aligning action labels with documented examples 2017-12-31 09:34:43 -03:00
simon
83f05efff6 Support for color in hologram. Renamed classes: fixes #72 2017-12-30 19:58:47 -05:00
simon
55d4c19fe1 Added Console output, Cubots can receive data from ComPort, Fixed BOM being added to string literals, Fixed legs changing direction for free when energy < 100, Changed some log levels. 2017-12-30 15:30:44 -05:00
simon
70a55dce59 Added features to Hologram hardware - Fixes #63 and #67 2017-12-30 11:03:09 -05:00
simon
fd73a47796 Fixes #65 2017-12-30 10:30:18 -05:00
simon
ef7f573256 Added basic Radio Tower functionality #32 
Keypress buffer is cleared on code upload
 2017-12-29 21:49:42 -05:00