| 
						
					 | 
					
						
						
						
						
							
						
						
							cae89cd2ac
							
						
					 | 
					
						
						
							
							get_items_by_character takes character id not character entity
						
						
						
						
						
						
					 | 
					
						2020-10-30 21:25:29 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c802bceb3c
							
						
					 | 
					
						
						
							
							prevent double logins
						
						
						
						
						
						
					 | 
					
						2020-10-30 21:25:29 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							05596cec4f
							
						
					 | 
					
						
						
							
							change serverstate on_connect and on_disconnect to async
						
						
						
						
						
						
					 | 
					
						2020-10-30 21:25:29 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a14aee4e29
							
						
					 | 
					
						
						
							
							handle unactivated accounts in the correct spot
						
						
						
						
						
						
					 | 
					
						2020-10-30 21:25:29 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b3e0674ca5
							
						
					 | 
					
						
						
							
							fix more tests + fix warnings
						
						
						
						
						
						
					 | 
					
						2020-10-30 21:25:27 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0db9a73849
							
						
					 | 
					
						
						
							
							check if an account is activated before allowing a login
						
						
						
						
						
						
					 | 
					
						2020-10-30 21:24:02 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2351b31125
							
						
					 | 
					
						
						
							
							entitygateway uses results for its functions now
						
						
						
						
						
						
					 | 
					
						2020-10-30 21:23:59 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a95bcf35c8
							
						
					 | 
					
						
						
							
							andypls
						
						
						
						
						
						
					 | 
					
						2020-10-28 20:15:00 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							67e96d33db
							
						
					 | 
					
						
						
							
							why did i shuffle this
						
						
						
						
						
						
					 | 
					
						2020-10-28 20:12:42 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f3e7599975
							
						
					 | 
					
						
						
							
							some comments and tests
						
						
						
						
						
						
					 | 
					
						2020-10-26 23:15:04 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e256423dfa
							
						
					 | 
					
						
						
							
							remove comments and don't be canadian
						
						
						
						
						
						
					 | 
					
						2020-10-26 23:15:04 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							790668f6f7
							
						
					 | 
					
						
						
							
							add unit armour slots. equip the unit into the right slot and save correctly
						
						
						
						
						
						
					 | 
					
						2020-10-26 23:15:03 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							555171d11d
							
						
					 | 
					
						
						
							
							server unequips units now. formatting and cleanup unuseds. fix merge conflict
						
						
						
						
						
						
					 | 
					
						2020-10-26 23:14:06 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6c33c7ec9b
							
						
					 | 
					
						
						
							
							dont delete items when unequipping
						
						
						
						
						
						
					 | 
					
						2020-10-26 23:05:25 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							48abf4533f
							
						
					 | 
					
						
						
							
							player can (un)equip things now
						
						
						
						
						
						
					 | 
					
						2020-10-26 23:05:25 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a148d96adc
							
						
					 | 
					
						
						
							
							slots need to be updated when an item leaves inventory
						
						
						
						
						
						
					 | 
					
						2020-10-07 19:24:46 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4989ecaa7c
							
						
					 | 
					
						
						
							
							formatting
						
						
						
						
						
						
					 | 
					
						2020-10-07 19:24:46 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d8c6dd817e
							
						
					 | 
					
						
						
							
							add derives to item structs, make some things public
						
						
						
						
						
						
					 | 
					
						2020-10-07 19:24:46 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							db23a9794e
							
						
					 | 
					
						
						
							
							options saved to character!
						
						
						
						
						
						
					 | 
					
						2020-10-02 22:41:53 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4434c42eaa
							
						
					 | 
					
						
						
							
							full char data packet
						
						
						
						
						
						
					 | 
					
						2020-10-01 16:58:16 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cebb6a5f31
							
						
					 | 
					
						
						
							
							handle case where items are removed from shop after buying
						
						
						
						
						
						
					 | 
					
						2020-09-27 20:30:37 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d08db622e2
							
						
					 | 
					
						
						
							
							shops!
						
						
						
						
						
						
					 | 
					
						2020-09-27 18:16:27 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							64040d55a2
							
						
					 | 
					
						
						
							
							and another!
						
						
						
						
						
						
					 | 
					
						2020-09-27 18:05:23 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							32d30d38ec
							
						
					 | 
					
						
						
							
							off by one errors sure are nice
						
						
						
						
						
						
						
						the item gets added to the vec before len is calculated, and since its
0-indexed we want to subtract 1 
						
						
					 | 
					
						2020-09-27 17:47:21 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b94dcb62d0
							
						
					 | 
					
						
						
							
							tool shop pricing
						
						
						
						
						
						
					 | 
					
						2020-09-23 21:49:33 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1e18d5729b
							
						
					 | 
					
						
						
							
							default to high price rather than zero
						
						
						
						
						
						
					 | 
					
						2020-09-23 21:41:15 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8a9ced09ea
							
						
					 | 
					
						
						
							
							armor shop pricing
						
						
						
						
						
						
					 | 
					
						2020-09-23 20:54:39 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							52d4fe8495
							
						
					 | 
					
						
						
							
							weapon shop prices
						
						
						
						
						
						
					 | 
					
						2020-09-23 19:14:11 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c13c071946
							
						
					 | 
					
						
						
							
							weapon stats
						
						
						
						
						
						
					 | 
					
						2020-09-23 19:13:45 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							514e18fff3
							
						
					 | 
					
						
						
							
							armor shop
						
						
						
						
						
						
					 | 
					
						2020-09-22 22:39:28 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							80f50c49cc
							
						
					 | 
					
						
						
							
							small fixes in weapon shop
						
						
						
						
						
						
					 | 
					
						2020-09-21 00:38:12 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							991a71e1ca
							
						
					 | 
					
						
						
							
							tool shop
						
						
						
						
						
						
					 | 
					
						2020-09-21 00:37:50 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							65208cddba
							
						
					 | 
					
						
						
							
							weapon shop
						
						
						
						
						
						
					 | 
					
						2020-09-18 07:55:48 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b0be92cb50
							
						
					 | 
					
						
						
							
							Merge pull request 'mag feeding!' (#207) from mag_feeding into master
						
						
						
						
						
						
					 | 
					
						2020-09-08 00:00:21 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							acd4e57d1d
							
						
					 | 
					
						
						
							
							implement rest of mag cells
						
						
						
						
						
						
					 | 
					
						2020-09-07 21:14:17 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d567c50216
							
						
					 | 
					
						
						
							
							mag cells
						
						
						
						
						
						
					 | 
					
						2020-09-07 08:02:12 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							27a87ffe96
							
						
					 | 
					
						
						
							
							fix esweap type + special numbering. add to other files and tests
						
						
						
						
						
						
					 | 
					
						2020-09-07 00:39:23 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ebdd4b28de
							
						
					 | 
					
						
						
							
							actually this makes more sense
						
						
						
						
						
						
					 | 
					
						2020-09-05 22:06:39 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							23bc39b5bf
							
						
					 | 
					
						
						
							
							move tool usage logic into own file
						
						
						
						
						
						
					 | 
					
						2020-09-05 21:10:12 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							50c5699f34
							
						
					 | 
					
						
						
							
							handle mags changing owners
						
						
						
						
						
						
					 | 
					
						2020-09-02 22:28:21 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2dde4d5716
							
						
					 | 
					
						
						
							
							mag feeding
						
						
						
						
						
						
					 | 
					
						2020-08-31 23:46:15 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							15b4732981
							
						
					 | 
					
						
						
							
							item helper methods
						
						
						
						
						
						
					 | 
					
						2020-08-31 23:45:40 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f583b25176
							
						
					 | 
					
						
						
							
							hide mag struct internals
						
						
						
						
						
						
					 | 
					
						2020-08-20 22:59:40 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							031f3bba23
							
						
					 | 
					
						
						
							
							add modifiers to weapon+armor+mag
						
						
						
						
						
						
					 | 
					
						2020-08-20 20:19:46 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							431752cbf7
							
						
					 | 
					
						
						
							
							Merge pull request 'interserver communication' (#202) from interserver_communication into master
						
						
						
						
						
						
					 | 
					
						2020-08-20 14:59:35 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							982966e679
							
						
					 | 
					
						
						
							
							fix tests
						
						
						
						
						
						
					 | 
					
						2020-08-20 11:52:12 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c8059edb42
							
						
					 | 
					
						
						
							
							move interserver handler from login -> character and handle new ship messages
						
						
						
						
						
						
					 | 
					
						2020-08-19 23:18:04 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2926938201
							
						
					 | 
					
						
						
							
							add InterserverActor trait for cross-server communication
						
						
						
						
						
						
					 | 
					
						2020-08-19 21:21:09 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							92bc0f2466
							
						
					 | 
					
						
						
							
							handle hospital visits
						
						
						
						
						
						
					 | 
					
						2020-08-11 17:17:24 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1d78f3dd08
							
						
					 | 
					
						
						
							
							rename dumb thing to something slightly less dumb
						
						
						
						
						
						
					 | 
					
						2020-08-04 20:43:02 -06:00 | 
					
					
						
						
							
							
							
						
					 |