| 
						
					 | 
					
						
						
						
						
							
						
						
							c7a310391f
							
						
					 | 
					
						
						
							
							make inv mod pub
						
						
						
						
						
						
					 | 
					
						2020-11-09 19:07:41 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2d5f83fab6
							
						
					 | 
					
						
						
							
							make inv item stuff serializable
						
						
						
						
						
						
					 | 
					
						2020-11-09 19:03:03 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8fae8d11af
							
						
					 | 
					
						
						
							
							fix equipping bought weapon
						
						
						
						
						
						
					 | 
					
						2020-11-09 16:47:35 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6e2fab31f0
							
						
					 | 
					
						
						
							
							e q u i p r e f a c t o r
						
						
						
						
						
						
					 | 
					
						2020-11-09 16:47:19 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							10458baea0
							
						
					 | 
					
						
						
							
							shrink some structures, remove async from functions that didn't need it
						
						
						
						
						
						
					 | 
					
						2020-11-09 16:25:15 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7ae8976c10
							
						
					 | 
					
						
						
							
							i t e m r e f a c t o r
						
						
						
						
						
						
					 | 
					
						2020-11-05 16:36:39 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							898cb9064d
							
						
					 | 
					
						
						
							
							Merge pull request 'misc shit' (#246) from cleaning_up into master
						
						
						
						
						
						
					 | 
					
						2020-11-02 14:36:37 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3dd25c3222
							
						
					 | 
					
						
						
							
							merge conflict
						
						
						
						
						
						
					 | 
					
						2020-11-02 00:03:22 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7157074419
							
						
					 | 
					
						
						
							
							remove comments
						
						
						
						
						
						
					 | 
					
						2020-11-01 23:27:47 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e1360e4958
							
						
					 | 
					
						
						
							
							bank doesn't spawn infinite money!
						
						
						
						
						
						
					 | 
					
						2020-11-01 23:14:38 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8717024694
							
						
					 | 
					
						
						
							
							move errors to anyhow to get backtraces
						
						
						
						
						
						
					 | 
					
						2020-11-01 18:06:00 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a3413083b6
							
						
					 | 
					
						
						
							
							add auth for interserver connections
						
						
						
						
						
						
					 | 
					
						2020-11-01 18:06:00 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3a095a928d
							
						
					 | 
					
						
						
							
							fix item ids not being set correctly
						
						
						
						
						
						
					 | 
					
						2020-11-01 18:06:00 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5e9a94081c
							
						
					 | 
					
						
						
							
							remove unwrap
						
						
						
						
						
						
					 | 
					
						2020-11-01 18:06:00 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							72141ace2c
							
						
					 | 
					
						
						
							
							remove unneeded warnings
						
						
						
						
						
						
					 | 
					
						2020-11-01 18:06:00 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e8fd37e32d
							
						
					 | 
					
						
						
							
							save_item -> change_item, impl for postgres
						
						
						
						
						
						
					 | 
					
						2020-11-01 18:06:00 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ce3e58d459
							
						
					 | 
					
						
						
							
							remove unwraps in ship on_disconnect
						
						
						
						
						
						
					 | 
					
						2020-11-01 18:06:00 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							498cf4ef43
							
						
					 | 
					
						
						
							
							remove panic when failing to load a battle param
						
						
						
						
						
						
					 | 
					
						2020-11-01 18:06:00 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							34cf660cbd
							
						
					 | 
					
						
						
							
							dont make new inventory
						
						
						
						
						
						
					 | 
					
						2020-11-01 19:54:50 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							51240a31e3
							
						
					 | 
					
						
						
							
							rename test file
						
						
						
						
						
						
					 | 
					
						2020-10-31 23:11:46 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6d4f5ae8f6
							
						
					 | 
					
						
						
							
							enumerate after filtering and add test
						
						
						
						
						
						
					 | 
					
						2020-10-31 23:11:45 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								andy
							
						 
					 | 
					
						
						
						
						
							
						
						
							45d9b82598
							
						
					 | 
					
						
						
							
							sort items packets and dont equip multiple items in main it's confusing
						
						
						
						
						
						
					 | 
					
						2020-10-31 23:11:45 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ad612615c7
							
						
					 | 
					
						
						
							
							rebases are hard
						
						
						
						
						
						
					 | 
					
						2020-10-30 21:27:00 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b517fb561c
							
						
					 | 
					
						
						
							
							fix some things
						
						
						
						
						
						
					 | 
					
						2020-10-30 21:25:29 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bacf309978
							
						
					 | 
					
						
						
							
							on_connect/on_disconnect return results
						
						
						
						
						
						
					 | 
					
						2020-10-30 21:25:29 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 |