Simon
							
						 
					 | 
					
						
						
						
						
							
						
						
							07160138aa
							
						
					 | 
					
						
						
							
							Fixed exception showing when tick-based broadcast happens exactly when a user is connected but not authenticated
						
						
						
						
						
						
					 | 
					
						2018-06-04 10:46:55 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Simon
							
						 
					 | 
					
						
						
						
						
							
						
						
							b6a206f3c7
							
						
					 | 
					
						
						
							
							Added basic Cubot.toString() and fixed account page debug info
						
						
						
						
						
						
					 | 
					
						2018-05-31 22:33:56 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Simon
							
						 
					 | 
					
						
						
						
						
							
						
						
							a005e2b163
							
						
					 | 
					
						
						
							
							Reverted accidental change caused by search and replace
						
						
						
						
						
						
					 | 
					
						2018-05-31 22:21:33 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Simon
							
						 
					 | 
					
						
						
						
						
							
						
						
							a7bdbd2513
							
						
					 | 
					
						
						
							
							I broke everything pt. 1: Moved helditem into CubotInventory, added debug commands for CubotInventory, Added vault complete GameEvent, moved CPU to Cubot, renamed CpuHardware to HardwareModule, moved HardwareModule to Cubot & added HardwareHost interface, removed getParent() in ControllableUnit, moved items to the Item class, started moving tiles to Tile classes, renamed Programmable to MessageReceiver
						
						
						
						
						
						
					 | 
					
						2018-05-31 22:13:07 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								simon
							
						 
					 | 
					
						
						
						
						
							
						
						
							ee9eeeef55
							
						
					 | 
					
						
						
							
							Reverted value of factory_spawn_rate that was accidentally changed
						
						
						
						
						
						
					 | 
					
						2018-05-12 20:33:41 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								simon
							
						 
					 | 
					
						
						
						
						
							
						
						
							4b67798180
							
						
					 | 
					
						
						
							
							Added structure class #145 and moved many constants to config.properties
						
						
						
						
						
						
					 | 
					
						2018-05-12 20:32:10 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								simon
							
						 
					 | 
					
						
						
						
						
							
						
						
							be8dd14d36
							
						
					 | 
					
						
						
							
							Added method to find objects of particular type in a world
						
						
						
						
						
						
					 | 
					
						2018-05-12 19:09:00 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								simon
							
						 
					 | 
					
						
						
						
						
							
						
						
							80f45f1eb0
							
						
					 | 
					
						
						
							
							Added catch clause to prevent crash when socket is not opened
						
						
						
						
						
						
					 | 
					
						2018-05-12 19:07:55 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								simon
							
						 
					 | 
					
						
						
						
						
							
						
						
							3368268924
							
						
					 | 
					
						
						
							
							Cubot object id is no longer stored inside every CpuHardware in the database. Renamed some fields in the database to make them more readable
						
						
						
						
						
						
					 | 
					
						2018-05-12 16:16:24 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Luc Lagarde
							
						 
					 | 
					
						
						
						
						
							
						
						
							a091071d55
							
						
					 | 
					
						
						
							
							Implement RAM corruption effect
						
						
						
						
						
						
					 | 
					
						2018-03-31 17:50:51 -05: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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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
							
						 
					 | 
					
						
						
						
						
							
						
						
							039088ac00
							
						
					 | 
					
						
						
							
							Added electric boxes, debug command to teleport objects across Worlds.
						
						
						
						
						
						
					 | 
					
						2018-02-27 16:49:32 -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
						
						
						
						
						
						
					 | 
					
						2018-02-25 08:51:03 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								simon
							
						 
					 | 
					
						
						
						
						
							
						
						
							95a14ad1ab
							
						
					 | 
					
						
						
							
							Added basic functionality for debug commands
						
						
						
						
						
						
					 | 
					
						2018-02-17 10:05:53 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								simon
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d961ce572
							
						
					 | 
					
						
						
							
							Added JA and JNA Instructions
						
						
						
						
						
						
					 | 
					
						2018-01-20 14:18:44 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								simon
							
						 
					 | 
					
						
						
						
						
							
						
						
							c772abe0bf
							
						
					 | 
					
						
						
							
							Fixed opcode clash for PUSHF instruction
						
						
						
						
						
						
					 | 
					
						2018-01-20 12:33:01 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								simon
							
						 
					 | 
					
						
						
						
						
							
						
						
							187a828c79
							
						
					 | 
					
						
						
							
							Fixed opcode clash for PUSHF instruction
						
						
						
						
						
						
					 | 
					
						2018-01-20 09:40:23 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								simon
							
						 
					 | 
					
						
						
						
						
							
						
						
							ffca185fe5
							
						
					 | 
					
						
						
							
							Vault Door generation
						
						
						
						
						
						
					 | 
					
						2018-01-17 22:01:59 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								simon
							
						 
					 | 
					
						
						
						
						
							
						
						
							815f3de234
							
						
					 | 
					
						
						
							
							Changed the walking function to enable interaction with Enterable objects
						
						
						
						
						
						
					 | 
					
						2018-01-17 21:11:16 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								simon
							
						 
					 | 
					
						
						
						
						
							
						
						
							3505a466bb
							
						
					 | 
					
						
						
							
							Fixed compilation errors
						
						
						
						
						
						
					 | 
					
						2018-01-17 20:31:35 -05:00 | 
					
					
						
						
							
							
							
						
					 |