| 
						
					 | 
					
						
						
						
						
							
						
						
							fe1a85caec
							
						
					 | 
					
						
						
							
							mag a e s t h e t i c s
						
						
						
						
						
						
					 | 
					
						2020-11-14 15:30:37 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							82c4c2a445
							
						
					 | 
					
						
						
							
							Merge pull request 'get_the_web_ui_working' (#251) from get_the_web_ui_working into master
						
						
						
						
						
						
					 | 
					
						2020-11-12 22:16:33 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c384b13453
							
						
					 | 
					
						
						
							
							actually save new character stuff
						
						
						
						
						
						
					 | 
					
						2020-11-12 19:05:46 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b34deba17f
							
						
					 | 
					
						
						
							
							update sqlx
						
						
						
						
						
						
					 | 
					
						2020-11-12 19:05:30 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4954dcb789
							
						
					 | 
					
						
						
							
							should probably split this since theres already live data
						
						
						
						
						
						
					 | 
					
						2020-11-12 17:13:42 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ceb632aec8
							
						
					 | 
					
						
						
							
							make equippedentity serializeable
						
						
						
						
						
						
					 | 
					
						2020-11-11 19:26:12 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9de04ad87b
							
						
					 | 
					
						
						
							
							Merge pull request 'item_refactor' (#250) from item_refactor into master
						
						
						
						
						
						
					 | 
					
						2020-11-09 19:59:06 -05: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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8ebbbb272a
							
						
					 | 
					
						
						
							
							update some deps, remove unused ones
						
						
						
						
						
						
					 | 
					
						2020-11-09 15:00:48 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							87fa74ac1a
							
						
					 | 
					
						
						
							
							Merge pull request 'bank_meseta' (#247) from bank_meseta into master
						
						
						
						
						
						
					 | 
					
						2020-11-02 02:04:26 -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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							73c24a5d20
							
						
					 | 
					
						
						
							
							cleanup
						
						
						
						
						
						
					 | 
					
						2020-11-01 18:06:00 -07: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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							83e6c9cf30
							
						
					 | 
					
						
						
							
							remove unused files
						
						
						
						
						
						
					 | 
					
						2020-11-01 18:06:00 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							29c5f88427
							
						
					 | 
					
						
						
							
							Merge pull request 'sorting_items' (#245) from sorting_items into master
						
						
						
						
						
						
					 | 
					
						2020-11-01 19:41:51 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							34cf660cbd
							
						
					 | 
					
						
						
							
							dont make new inventory
						
						
						
						
						
						
					 | 
					
						2020-11-01 19:54:50 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e08c582f17
							
						
					 | 
					
						
						
							
							fix test after rebase
						
						
						
						
						
						
					 | 
					
						2020-10-31 23:53:06 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ead1752978
							
						
					 | 
					
						
						
							
							rebase and remove unneeded function
						
						
						
						
						
						
					 | 
					
						2020-10-31 23:14:15 -03: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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fd1e3697fc
							
						
					 | 
					
						
						
							
							sorting test. need to rename the test file
						
						
						
						
						
						
					 | 
					
						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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1b9eafeaa9
							
						
					 | 
					
						
						
							
							Merge pull request 'split_bins' (#243) from split_bins into master
						
						
						
						
						
						
					 | 
					
						2020-10-31 00:15:08 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							586eb28c49
							
						
					 | 
					
						
						
							
							fix tests
						
						
						
						
						
						
					 | 
					
						2020-10-30 21:43:54 -06: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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							164a8a1ad8
							
						
					 | 
					
						
						
							
							disable duplicate account checking since its super bugged
						
						
						
						
						
						
					 | 
					
						2020-10-30 21:25:29 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bacf309978
							
						
					 | 
					
						
						
							
							on_connect/on_disconnect return results
						
						
						
						
						
						
					 | 
					
						2020-10-30 21:25:29 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							99cc651fd9
							
						
					 | 
					
						
						
							
							add enumiter to item types
						
						
						
						
						
						
					 | 
					
						2020-10-30 21:25:29 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							66d25ed155
							
						
					 | 
					
						
						
							
							fix name shadowing
						
						
						
						
						
						
					 | 
					
						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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							01fe0931b1
							
						
					 | 
					
						
						
							
							make itementity serializable
						
						
						
						
						
						
					 | 
					
						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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a02cb57825
							
						
					 | 
					
						
						
							
							remove ship from shiplist when it disconnects
						
						
						
						
						
						
					 | 
					
						2020-10-30 21:25:29 -06:00 | 
					
					
						
						
							
							
							
						
					 |