| 
						
					 | 
					
						
						
						
						
							
						
						
							d64528d679
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.sharnoth.com/jake/elseware
						
						
						
						
						
						
					 | 
					
						2020-04-29 01:03:16 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2e46567987
							
						
					 | 
					
						
						
							
							Merge pull request 'add room password handling' (#115) from room_password into master
						
						
						
						
						
						
					 | 
					
						2020-04-28 23:59:03 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							36ee49d28e
							
						
					 | 
					
						
						
							
							remove unwrap
						
						
						
						
						
						
					 | 
					
						2020-04-29 00:45:48 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8174da0154
							
						
					 | 
					
						
						
							
							Merge pull request 'changinglobbies' (#116) from changinglobbies into master
						
						
						
						
						
						
					 | 
					
						2020-04-28 23:04:02 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6f83db4441
							
						
					 | 
					
						
						
							
							Merge branch 'master' of http://git.sharnoth.com/jake/elseware
						
						
						
						
						
						
					 | 
					
						2020-04-28 19:54:54 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mht8355
							
						 
					 | 
					
						
						
						
						
							
						
						
							7c6cdd30cc
							
						
					 | 
					
						
						
							
							better code
						
						
						
						
						
						
					 | 
					
						2020-04-28 01:41:32 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mht8355
							
						 
					 | 
					
						
						
						
						
							
						
						
							880bfc620a
							
						
					 | 
					
						
						
							
							added some error handling
						
						
						
						
						
						
					 | 
					
						2020-04-28 01:25:50 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d1ec1d7359
							
						
					 | 
					
						
						
							
							Merge pull request 'don't rely on map file data to have monster area' (#117) from fix_monster_area_gaps into master
						
						
						
						
						
						
					 | 
					
						2020-04-28 01:09:37 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							68e75a55f0
							
						
					 | 
					
						
						
							
							don't rely on map file data to have monster area
						
						
						
						
						
						
					 | 
					
						2020-04-27 22:53:05 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mht8355
							
						 
					 | 
					
						
						
						
						
							
						
						
							a24381bc66
							
						
					 | 
					
						
						
							
							sends the client a message when selected lobby = current lobby
						
						
						
						
						
						
					 | 
					
						2020-04-27 22:58:43 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a83aa2d9df
							
						
					 | 
					
						
						
							
							and i oop braces
						
						
						
						
						
						
					 | 
					
						2020-04-27 22:57:08 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mht8355
							
						 
					 | 
					
						
						
						
						
							
						
						
							062fed231a
							
						
					 | 
					
						
						
							
							change_lobby added for changing lobbies and leaving a room
						
						
						
						
						
						
					 | 
					
						2020-04-27 21:22:12 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							906a2dcd16
							
						
					 | 
					
						
						
							
							add room password handling
						
						
						
						
						
						
					 | 
					
						2020-04-27 21:59:15 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mht8355
							
						 
					 | 
					
						
						
						
						
							
						
						
							d206814394
							
						
					 | 
					
						
						
							
							added change_lobby
						
						
						
						
						
						
					 | 
					
						2020-04-27 20:17:35 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c28adcd7e5
							
						
					 | 
					
						
						
							
							Merge pull request 'item drops' (#112) from itemdropsforreal into master
						
						
						
						
						
						
					 | 
					
						2020-04-27 09:14:41 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6458fad89f
							
						
					 | 
					
						
						
							
							fix tech drop tests
						
						
						
						
						
						
					 | 
					
						2020-04-27 07:07:51 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b22ce086f7
							
						
					 | 
					
						
						
							
							guess I needed this PartialEq for the tests
						
						
						
						
						
						
					 | 
					
						2020-04-27 07:07:09 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a32a7130f4
							
						
					 | 
					
						
						
							
							cleanup
						
						
						
						
						
						
					 | 
					
						2020-04-27 06:55:37 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							02c9cdc276
							
						
					 | 
					
						
						
							
							drop techs
						
						
						
						
						
						
					 | 
					
						2020-04-27 06:55:18 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							91c44628ea
							
						
					 | 
					
						
						
							
							fix meseta drops
						
						
						
						
						
						
					 | 
					
						2020-04-26 22:51:09 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bd195a2ffd
							
						
					 | 
					
						
						
							
							remove unwrap
						
						
						
						
						
						
					 | 
					
						2020-04-26 22:23:59 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4a526e7673
							
						
					 | 
					
						
						
							
							basic item drop logic
						
						
						
						
						
						
					 | 
					
						2020-04-26 22:01:05 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							663797e55b
							
						
					 | 
					
						
						
							
							remove unneeded PartialEq derive
						
						
						
						
						
						
					 | 
					
						2020-04-26 21:58:43 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							375c97c95d
							
						
					 | 
					
						
						
							
							add MapsError to ShipError
						
						
						
						
						
						
					 | 
					
						2020-04-26 21:57:19 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							160fc7f10b
							
						
					 | 
					
						
						
							
							pub ItemDrop
						
						
						
						
						
						
					 | 
					
						2020-04-26 21:55:12 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0eb9035bad
							
						
					 | 
					
						
						
							
							make TechniqueDisk and Tool Copy
						
						
						
						
						
						
					 | 
					
						2020-04-26 21:54:01 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0e3b305f95
							
						
					 | 
					
						
						
							
							add some vars to MapEnemy, error types to misc map functions, and MapArea -> u8
						
						
						
						
						
						
					 | 
					
						2020-04-26 21:53:11 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d773002eaa
							
						
					 | 
					
						
						
							
							rawmapenemy unknown3 -> map_area
						
						
						
						
						
						
					 | 
					
						2020-04-26 21:50:34 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dcef56dcac
							
						
					 | 
					
						
						
							
							add get_room/get_lobby to ClientLocation
						
						
						
						
						
						
					 | 
					
						2020-04-26 20:39:23 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c7c9cd0bec
							
						
					 | 
					
						
						
							
							Merge pull request 'use thiserror' (#111) from thiserror into master
						
						
						
						
						
						
					 | 
					
						2020-04-26 00:27:03 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9f4a9a4f2c
							
						
					 | 
					
						
						
							
							use thiserror
						
						
						
						
						
						
					 | 
					
						2020-04-25 22:16:40 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							008e8ebebc
							
						
					 | 
					
						
						
							
							Merge pull request 'refactor_packety_things' (#109) from refactor_packety_things into master
						
						
						
						
						
						
					 | 
					
						2020-04-25 00:27:20 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2886f537ba
							
						
					 | 
					
						
						
							
							simplify leaving lobby packet sending
						
						
						
						
						
						
					 | 
					
						2020-04-24 22:22:19 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							628ad056b4
							
						
					 | 
					
						
						
							
							functions to create room joining packets
						
						
						
						
						
						
					 | 
					
						2020-04-24 20:38:56 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a8b7e4fa4e
							
						
					 | 
					
						
						
							
							HashMap<ClientId, ClientState> -> Clients
						
						
						
						
						
						
					 | 
					
						2020-04-22 23:49:49 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							728ac715c0
							
						
					 | 
					
						
						
							
							move lobby joining packet creations to their own functions
						
						
						
						
						
						
					 | 
					
						2020-04-22 22:59:01 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							07403fe815
							
						
					 | 
					
						
						
							
							move block_selected
						
						
						
						
						
						
					 | 
					
						2020-04-22 07:30:59 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0b04701156
							
						
					 | 
					
						
						
							
							move message packet handlers
						
						
						
						
						
						
					 | 
					
						2020-04-22 07:14:59 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							832a53821d
							
						
					 | 
					
						
						
							
							move settings
						
						
						
						
						
						
					 | 
					
						2020-04-21 23:45:40 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							90d0af87a4
							
						
					 | 
					
						
						
							
							move chat functionality
						
						
						
						
						
						
					 | 
					
						2020-04-21 23:40:44 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f38e3357f4
							
						
					 | 
					
						
						
							
							move room packet handlers to own file
						
						
						
						
						
						
					 | 
					
						2020-04-21 23:15:11 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4a01beb9e8
							
						
					 | 
					
						
						
							
							move validate_login
						
						
						
						
						
						
					 | 
					
						2020-04-21 22:18:57 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							881b7c8e46
							
						
					 | 
					
						
						
							
							begin moving packet handlers to own module, send_player_to_lobby
						
						
						
						
						
						
					 | 
					
						2020-04-21 21:47:41 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b4399c7e7e
							
						
					 | 
					
						
						
							
							Merge pull request 'new_char_configs' (#106) from new_char_configs into master
						
						
						
						
						
						
					 | 
					
						2020-04-21 22:42:39 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ffd782ccce
							
						
					 | 
					
						
						
							
							use skin, not costume, for mag colors
						
						
						
						
						
						
					 | 
					
						2020-04-21 18:59:03 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d978d671a2
							
						
					 | 
					
						
						
							
							dont build huge things we aren't bob the builder
						
						
						
						
						
						
					 | 
					
						2020-04-21 18:59:03 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							37b19ef3ad
							
						
					 | 
					
						
						
							
							make quick tech menu not all foie
						
						
						
						
						
						
					 | 
					
						2020-04-21 18:59:03 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ff2ae85299
							
						
					 | 
					
						
						
							
							add mag colors
						
						
						
						
						
						
					 | 
					
						2020-04-21 18:59:03 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4fae76928d
							
						
					 | 
					
						
						
							
							add default palette and symbol chats
						
						
						
						
						
						
					 | 
					
						2020-04-21 18:59:03 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f499cc20dc
							
						
					 | 
					
						
						
							
							Merge pull request 'join_room' (#107) from join_room into master
						
						
						
						
						
						
					 | 
					
						2020-04-21 20:57:57 -04:00 | 
					
					
						
						
							
							
							
						
					 |