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
235 Commits 5 Branches 5 Tags
Commit Graph

31 Commits

Author SHA1 Message Date
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
292adb5483 Updated maven version numbers. Removed .iml files 2018-04-02 10:52:36 -04:00
simon
039088ac00 Added electric boxes, debug command to teleport objects across Worlds. 2018-02-27 16:49:32 -05:00
simon
3505a466bb Fixed compilation errors 2018-01-17 20:31:35 -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
6b91251b4e Should fix #125 2018-01-14 11:01:13 -05:00
simon
54b72e89b3 Fixes #121 + Saner thread safety 2018-01-09 22:10:55 -05:00
simon
24d81d194e Fixes #107 2018-01-05 22:08:53 -05:00
simon
9bb0dc9034 Boilerplate code for Vault Door 2018-01-05 20:42:24 -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
4e76d57ef9 Loading & Saving support for MongoDB 2018-01-02 17:45:58 -05:00
James T
2398219fab Update #66: rm npc plugin dependency from plant.event plugin 2017-12-30 11:08:43 -08:00
James T
81767ed5cf Updates for #66: reorganize and relocate some methods and calls 2017-12-30 09:01:58 -08:00
simon
fd73a47796 Fixes #65 2017-12-30 10:30:18 -05:00
James T
eea9420192 HarvesterNPC should spawn a biomass in-place after they die (#33) 2017-12-29 22:35:02 -08:00
Jacob Swehla
3158dd75ea Fixed Maven 
Maven now builds correctly, may need further refinement.
 2017-12-27 15:36:08 -06:00
simon
2e9248ea2e Factory Integration, NPC improvements. #19 & #31. 2017-12-24 14:26:19 -05:00
simon
3548928218 Improved World update performance. Decreased save file size. Added Harvester NPC #19. 2017-12-16 15:40:03 -05:00
simon
be45979ed0 Added biomass respawn feature #22 2017-12-02 10:26:59 -05:00
simon
29cac77e79 Changed maven artifactID names 2017-11-22 17:05:50 -05:00
simon
6be2a496c6 Added maven framework support. Started working on NPCs #19 2017-11-21 20:22:11 -05:00
simon
a3fa3c4c09 Added Battery Hardware. #2 2017-11-12 10:27:07 -05:00
simon
98b0c480b9 Various bug fixes 2017-11-05 14:13:53 -05:00
simon
626c55bcce Logs cleanup 2017-11-05 10:20:38 -05:00
simon
cdfdab09f8 Newly registered users can now login on the game server, 2017-11-04 10:41:57 -04:00
simon
b76a1adea2 Initial commit 2017-11-02 21:51:22 -04:00