simon987/Much-Assembly-Required
1
0
Fork 0
mirror of https://github.com/simon987/Much-Assembly-Required.git synced 2025-04-10 14:26:45 +00:00
Code Issues Projects Releases Wiki Activity
243 Commits 5 Branches 5 Tags
Commit Graph

243 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
simon
10f088cb66 Updated gitattributes (again) 2018-05-11 21:19:36 -04:00
simon
159c217d59 Updated gitattributes 2018-05-11 21:18:25 -04:00
Simon Fortier
c5cb5df335
Merge pull request #153 from simon987/spark 
Moved frontend to main server application
 2018-05-11 21:13:01 -04:00
simon
854863ede9 Updated mongodb driver to 3.7.0 2018-05-11 21:06:18 -04:00
simon
e98575b23f Added vagrant support 2018-05-11 21:04:00 -04:00
simon
1a5d12a19f updated Docker support 2018-05-11 16:42:03 -04:00
simon
1678be25c5 Added UserStats and updated leaderboard page 2018-05-11 13:16:34 -04:00
simon
9c41c16079 Added debug command to save the game 2018-05-11 10:25:40 -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
2c856aae80 Editor upload & reload buttons are now working. Floppy upload & download working. 2018-04-29 14:00:50 -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
e3a650a4fc Reorganised debug info in account page and extracted user loading to UserManager 2018-04-27 21:59:07 -04:00
simon
113aa50d87 Websocket auth up and running 2018-04-27 21:28:46 -04:00
simon
dc034d1437 Users can change their password 2018-04-27 20:39:14 -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
simon
3c5bfdb30b Fixed build errors 2018-04-24 08:09:42 -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
e479d89375 Added Radioactive cloud plugin 2018-04-02 10:41:37 -04:00
simon987
41d674d74a Removed unused constant 2018-04-02 10:06:44 -04:00
Simon Fortier
227f7ce5aa
Merge pull request #144 from mlaga97/ram-corruption 
Implement RAM corruption effect
 2018-04-01 22:18:15 -04:00
Luc Lagarde
a091071d55 Implement RAM corruption effect 2018-03-31 17:50:51 -05:00
Simon Fortier
f1b8f3dc6d
Merge pull request #143 from mlaga97/lidar-vault-fix 
Make LiDAR work in Vaults (fixes #140)
 2018-03-29 20:10: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
1d780f7d9b Minor refactor 2018-03-11 13:34:10 -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
f8c5dac969 Added logging of vault clears for display in the leaderboard 2018-03-05 21:47:28 -05:00
simon
0a75cb557d Added objective vault world & its exit portal 2018-03-04 15:51:30 -05:00
simon
f35e6c5a9a Objects can enter & leave vaults 2018-03-04 14:56:02 -05:00
simon
0ada6c29d4 More work on vaults 2018-03-01 10:42:24 -05:00
simon
156deb8f4e NPCs decrement World.updatable on death. Fixes problem making Worlds stay loaded forever in RAM 2018-02-27 16:51:18 -05:00
simon
039088ac00 Added electric boxes, debug command to teleport objects across Worlds. 2018-02-27 16:49:32 -05:00
simon
f530dafdee Basic world generation for entire Vault dimension 2018-02-26 17:17:40 -05:00
simon
817dbcc6c4 Basic world generation for single Vault world 2018-02-26 13:29:08 -05:00
simon
62f1403cb3 Started working on Vault worlds generation 2018-02-26 10:04:06 -05:00
simon
8c6e580ea9 Added support for multiple dimensions 2018-02-25 14:15:03 -05:00
simon
6a1519d97d Added many debug commands 2018-02-25 11:55:53 -05:00
simon
a7d1a00ae8 Fixes #27 v1.4a 2018-02-25 08:51:03 -05:00