| 
						
					 | 
					
						
						
						
						
							
						
						
							b92b118fc4
							
						
					 | 
					
						
						
							
							Merge pull request 'weapon_bytes' (#102) from weapon_bytes into master
						
						
						
						
						
						
						
						Reviewed-by: jake <jake@sharnoth.com> 
						
						
					 | 
					
						2020-04-10 15:33:51 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							332f22f34e
							
						
					 | 
					
						
						
							
							weapon % fix v2 and give the level 199 guy a 100h hell gun
						
						
						
						
						
						
					 | 
					
						2020-04-10 02:04:37 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							895891fabc
							
						
					 | 
					
						
						
							
							oops forgot to handle missing specials
						
						
						
						
						
						
					 | 
					
						2020-04-08 20:02:06 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a2dca1d5fe
							
						
					 | 
					
						
						
							
							send all the weapon bytes
						
						
						
						
						
						
					 | 
					
						2020-04-08 19:41:12 -03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							806aab7d21
							
						
					 | 
					
						
						
							
							Merge pull request 'misc refactorings to make things easier' (#100) from refactor_some_things into master
						
						
						
						
						
						
					 | 
					
						2020-04-08 15:41:06 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a6c8c959fc
							
						
					 | 
					
						
						
							
							foreshadowing
						
						
						
						
						
						
					 | 
					
						2020-04-06 23:42:38 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9c643e2aae
							
						
					 | 
					
						
						
							
							use ClientLocation refactor
						
						
						
						
						
						
					 | 
					
						2020-04-06 23:40:39 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c846bca599
							
						
					 | 
					
						
						
							
							ClientLocation refactor
						
						
						
						
						
						
					 | 
					
						2020-04-05 22:56:48 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0cf0022bf9
							
						
					 | 
					
						
						
							
							StackedItem -> ItemInstance, add Meseta
						
						
						
						
						
						
					 | 
					
						2020-04-04 10:49:37 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1279fedfee
							
						
					 | 
					
						
						
							
							MapVariantType -> MapArea
						
						
						
						
						
						
					 | 
					
						2020-04-04 10:49:27 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c24161bfd4
							
						
					 | 
					
						
						
							
							Merge pull request 'mag feeding charts' (#99) from mag_feed into master
						
						
						
						
						
						
					 | 
					
						2020-04-01 00:18:23 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8d86cf3088
							
						
					 | 
					
						
						
							
							mag naming
						
						
						
						
						
						
					 | 
					
						2020-03-31 21:15:01 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7e7920d1f5
							
						
					 | 
					
						
						
							
							remove weird non-mags
						
						
						
						
						
						
					 | 
					
						2020-03-31 21:00:16 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b21603c1d7
							
						
					 | 
					
						
						
							
							mag feeding charts
						
						
						
						
						
						
					 | 
					
						2020-03-31 20:47:49 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ae9fdce663
							
						
					 | 
					
						
						
							
							apparently theres only 5 forest1s
						
						
						
						
						
						
					 | 
					
						2020-03-30 19:51:57 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f0f125822f
							
						
					 | 
					
						
						
							
							Merge pull request 'use New variants of entities for creation' (#98) from new_entities into master
						
						
						
						
						
						
					 | 
					
						2020-03-30 22:50:53 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d9f88d55a2
							
						
					 | 
					
						
						
							
							use New variants of entities for creation
						
						
						
						
						
						
					 | 
					
						2020-03-30 19:28:49 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							eb2cefa868
							
						
					 | 
					
						
						
							
							Merge pull request 'changes to entities' (#97) from entity_renaming into master
						
						
						
						
						
						
					 | 
					
						2020-03-30 01:16:26 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b39ee6c0f3
							
						
					 | 
					
						
						
							
							use Option for entity primary keys
						
						
						
						
						
						
					 | 
					
						2020-03-29 22:00:07 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6b1ef41bd0
							
						
					 | 
					
						
						
							
							UserAccount/UserSettings/GuildCardData -> *Entities
						
						
						
						
						
						
					 | 
					
						2020-03-29 16:11:14 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							44c35f350d
							
						
					 | 
					
						
						
							
							Item -> ItemEntity
						
						
						
						
						
						
					 | 
					
						2020-03-29 14:53:51 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0954d85e5a
							
						
					 | 
					
						
						
							
							CharacterEntityId
						
						
						
						
						
						
					 | 
					
						2020-03-29 14:50:43 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							de8f44f269
							
						
					 | 
					
						
						
							
							andy what were you doing
						
						
						
						
						
						
						
						make guild card sending much more sane 
						
						
					 | 
					
						2020-03-29 13:27:23 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bf595f9693
							
						
					 | 
					
						
						
							
							Character -> CharacterEntity
						
						
						
						
						
						
					 | 
					
						2020-03-29 12:43:20 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2c74dad53d
							
						
					 | 
					
						
						
							
							Merge pull request 'finish up item handling to get ready for drops' (#91) from active_item into master
						
						
						
						
						
						
					 | 
					
						2020-03-29 15:09:48 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							620bcade7b
							
						
					 | 
					
						
						
							
							itemdetail -> itemdroptype for drops
						
						
						
						
						
						
					 | 
					
						2020-03-29 12:06:32 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a7434346db
							
						
					 | 
					
						
						
							
							move equipped flag to itemlocation::inventory
						
						
						
						
						
						
					 | 
					
						2020-03-29 12:06:32 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ed3048840e
							
						
					 | 
					
						
						
							
							add box drop config files
						
						
						
						
						
						
					 | 
					
						2020-03-29 12:06:32 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0d42c0ede0
							
						
					 | 
					
						
						
							
							add box drops
						
						
						
						
						
						
					 | 
					
						2020-03-29 12:06:32 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							89aab63f86
							
						
					 | 
					
						
						
							
							fix tool table config loading
						
						
						
						
						
						
					 | 
					
						2020-03-29 12:06:32 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							979636a4c4
							
						
					 | 
					
						
						
							
							load map object files
						
						
						
						
						
						
					 | 
					
						2020-03-29 12:06:32 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2f2e9e5c5c
							
						
					 | 
					
						
						
							
							add missing enemies
						
						
						
						
						
						
					 | 
					
						2020-03-29 12:06:32 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b69d732343
							
						
					 | 
					
						
						
							
							rare drop config files
						
						
						
						
						
						
					 | 
					
						2020-03-29 12:06:32 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3e9cf6677f
							
						
					 | 
					
						
						
							
							fix weapon names+extra spaces
						
						
						
						
						
						
					 | 
					
						2020-03-29 12:06:32 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3600197993
							
						
					 | 
					
						
						
							
							fix tool names
						
						
						
						
						
						
					 | 
					
						2020-03-29 12:06:32 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9cf2979777
							
						
					 | 
					
						
						
							
							fix case on unit names
						
						
						
						
						
						
					 | 
					
						2020-03-29 12:06:32 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							193cf72cdb
							
						
					 | 
					
						
						
							
							fix monster names in config files
						
						
						
						
						
						
					 | 
					
						2020-03-29 12:06:32 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cfa31736c6
							
						
					 | 
					
						
						
							
							rare drops
						
						
						
						
						
						
					 | 
					
						2020-03-29 12:06:31 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e41f79f41a
							
						
					 | 
					
						
						
							
							tech drops
						
						
						
						
						
						
					 | 
					
						2020-03-29 12:06:31 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9a1feb8836
							
						
					 | 
					
						
						
							
							mags!
						
						
						
						
						
						
					 | 
					
						2020-03-29 12:06:31 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6a27d1b639
							
						
					 | 
					
						
						
							
							switch fomar/ramarl
						
						
						
						
						
						
					 | 
					
						2020-03-29 12:06:31 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							359120de07
							
						
					 | 
					
						
						
							
							redo active item stuff
						
						
						
						
						
						
					 | 
					
						2020-03-29 12:06:23 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a0e82c644c
							
						
					 | 
					
						
						
							
							Merge pull request 'send_guildcard' (#94) from send_guildcard into master
						
						
						
						
						
						
						
						Reviewed-by: jake <jake@sharnoth.com> 
						
						
					 | 
					
						2020-03-25 20:15:13 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ee82f920b6
							
						
					 | 
					
						
						
							
							Merge pull request 'room_lists' (#88) from room_lists into master
						
						
						
						
						
						
						
						Reviewed-by: jake <jake@sharnoth.com> 
						
						
					 | 
					
						2020-03-23 01:33:19 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							648fdfc0ec
							
						
					 | 
					
						
						
							
							rename function
						
						
						
						
						
						
					 | 
					
						2020-03-22 22:20:46 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							38b0cac09b
							
						
					 | 
					
						
						
							
							get player counts for room lists
						
						
						
						
						
						
					 | 
					
						2020-03-22 22:20:46 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							eef2178df8
							
						
					 | 
					
						
						
							
							cleanup and fix errors. still need to get room player counts
						
						
						
						
						
						
					 | 
					
						2020-03-22 22:20:46 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7f95f7e793
							
						
					 | 
					
						
						
							
							room list req/resp functions
						
						
						
						
						
						
					 | 
					
						2020-03-22 22:20:46 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f11ee7f53f
							
						
					 | 
					
						
						
							
							wip. initial room list stuff
						
						
						
						
						
						
					 | 
					
						2020-03-22 22:20:46 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							be1574afff
							
						
					 | 
					
						
						
							
							HAHAHA WHAT AM I EVEN DOING RIGHT NOW
						
						
						
						
						
						
						
						This reverts commit 76b470cbb2673bac2a6e78ec641f96415583e1e1. 
						
						
					 | 
					
						2020-03-22 22:19:16 -07:00 | 
					
					
						
						
							
							
							
						
					 |