Fabian Dill
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								8d47bc5425 
								
							 
						 
						
							
							
								
								Merge pull request  #112  from Berserker66/local_keys  
							
							 
							
							... 
							
							
							
							Add local_keys option to go in line with the *_shuffle options, and … 
							
						 
						
							2020-06-20 01:28:32 +02:00  
						
					 
				
					
						
							
							
								 
								caitsith2
							
						 
						
							 
							
							
							
							
								
							
							
								6beeb7934d 
								
							 
						 
						
							
							
								
								Add local_keys option to go in line with the *_shuffle options, and document both local_keys and l in easy.yaml  
							
							 
							
							
							
						 
						
							2020-06-19 16:10:22 -07:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								10f675a61e 
								
							 
						 
						
							
							
								
								Merge pull request  #111  from Berserker66/tweaks_and_fixes  
							
							 
							
							... 
							
							
							
							Tweaks and fixes 
							
						 
						
							2020-06-19 04:52:07 +02:00  
						
					 
				
					
						
							
							
								 
								caitsith2
							
						 
						
							 
							
							
							
							
								
							
							
								55a5812b6b 
								
							 
						 
						
							
							
								
								Remove list(map(int, x))  
							
							 
							
							
							
						 
						
							2020-06-18 19:21:52 -07:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								e82c4d7bf7 
								
							 
						 
						
							
							
								
								Update readme  
							
							 
							
							
							
						 
						
							2020-06-19 03:35:21 +02:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
							
							
								
							
							
								7af8a1b5aa 
								
							 
						 
						
							
							
								
								Set theme jekyll-theme-slate  
							
							 
							
							
							
						 
						
							2020-06-19 03:22:27 +02:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
							
							
								
							
							
								5d3e22a911 
								
							 
						 
						
							
							
								
								make "l" for local keysanity a thing in mystery  
							
							 
							
							
							
						 
						
							2020-06-19 03:17:54 +02:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
							
							
								
							
							
								f311d3a8b9 
								
							 
						 
						
							
							
								
								implement "crossover logic".  
							
							 
							
							... 
							
							
							
							Makes it impossible that logical progression for a logic-having player is placed inside a no-logic world. All other placements remain available. 
							
						 
						
							2020-06-19 03:01:23 +02:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
							
							
								
							
							
								cb1d4cc39e 
								
							 
						 
						
							
							
								
								apply local items in no_logic  
							
							 
							
							
							
						 
						
							2020-06-19 01:31:32 +02:00  
						
					 
				
					
						
							
							
								 
								caitsith2
							
						 
						
							 
							
							
							
							
								
							
							
								d7d7f32d0c 
								
							 
						 
						
							
							
								
								Clean up get_choice(x,weights) if x in weights else y code.  
							
							 
							
							
							
						 
						
							2020-06-18 08:55:15 -07:00  
						
					 
				
					
						
							
							
								 
								caitsith2
							
						 
						
							 
							
							
							
							
								
							
							
								f8ad83c86d 
								
							 
						 
						
							
							
								
								yaml descriptions are now optional  
							
							 
							
							
							
						 
						
							2020-06-18 08:52:31 -07:00  
						
					 
				
					
						
							
							
								 
								caitsith2
							
						 
						
							 
							
							
							
							
								
							
							
								75e185e437 
								
							 
						 
						
							
							
								
								Allow specififying returned default values.  Disallow ALL zero weights.  
							
							 
							
							
							
						 
						
							2020-06-18 08:51:38 -07:00  
						
					 
				
					
						
							
							
								 
								caitsith2
							
						 
						
							 
							
							
							
							
								
							
							
								be48f96f65 
								
							 
						 
						
							
							
								
								Actually make sure excess heart pieces/containers become 20 rupees, since the max is 20 hearts anyways.  
							
							 
							
							
							
						 
						
							2020-06-18 08:49:54 -07:00  
						
					 
				
					
						
							
							
								 
								caitsith2
							
						 
						
							 
							
							
							
							
								
							
							
								63eb0ffc7b 
								
							 
						 
						
							
							
								
								Max triforce pieces reduced to 90  
							
							 
							
							
							
						 
						
							2020-06-18 08:48:33 -07:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
							
							
								
							
							
								a584e14f47 
								
							 
						 
						
							
							
								
								no longer need webhost keep-alive with auto-shutdown  
							
							 
							
							
							
						 
						
							2020-06-18 14:48:28 +02:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								d6cccff2d7 
								
							 
						 
						
							
							
								
								Merge pull request  #109  from Berserker66/extended_triforce_hunt  
							
							 
							
							... 
							
							
							
							Change max triforce_pieces_required from 30 to 112. 
							
						 
						
							2020-06-17 10:34:59 +02:00  
						
					 
				
					
						
							
							
								 
								caitsith2
							
						 
						
							 
							
							
							
							
								
							
							
								d8bc5ca2a8 
								
							 
						 
						
							
							
								
								Set triforce pieces available to max of available and required.  
							
							 
							
							
							
						 
						
							2020-06-17 01:33:34 -07:00  
						
					 
				
					
						
							
							
								 
								caitsith2
							
						 
						
							 
							
							
							
							
								
							
							
								617312fd4b 
								
							 
						 
						
							
							
								
								add available_triforce_pieces  
							
							 
							
							
							
						 
						
							2020-06-17 01:02:54 -07:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
							
							
								
							
							
								29ee4fe307 
								
							 
						 
						
							
							
								
								rename baserom to basepatch to make it clearer what it is  
							
							 
							
							... 
							
							
							
							Also move actual baserom to root folder to make it harder to accidentally share it with others when copying stuff 
							
						 
						
							2020-06-17 08:59:50 +02:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
							
							
								
							
							
								facecdf487 
								
							 
						 
						
							
							
								
								implement --auto_shutdown <minutes>, shutting down a multiserver after that many minutes of inactivity  
							
							 
							
							... 
							
							
							
							and set WebHost to a default of 6 hours 
							
						 
						
							2020-06-16 11:26:54 +02:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
							
							
								
							
							
								bd1c9f896b 
								
							 
						 
						
							
							
								
								allow ghosted slots with same ID to be replaced  
							
							 
							
							
							
						 
						
							2020-06-16 01:05:32 +02:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
							
							
								
							
							
								3fbb959622 
								
							 
						 
						
							
							
								
								fix !missing for older clients  
							
							 
							
							
							
						 
						
							2020-06-15 22:15:04 +02:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
							
							
								
							
							
								7353b489ce 
								
							 
						 
						
							
							
								
								add available hint points to UI  
							
							 
							
							
							
						 
						
							2020-06-15 06:30:51 +02:00  
						
					 
				
					
						
							
							
								 
								Chris
							
						 
						
							 
							
							
							
							
								
							
							
								e11f33b589 
								
							 
						 
						
							
							
								
								Update WebUI to display server, check, and hint info. CURRENT HINT POINTS DO NOT WORK YET  
							
							 
							
							
							
						 
						
							2020-06-14 18:04:03 -04:00  
						
					 
				
					
						
							
							
								 
								Berserker66
							
						 
						
							 
							
							
							
							
								
							
							
								aa7fe2aa9d 
								
							 
						 
						
							
							
								
								barebones webhost  
							
							 
							
							... 
							
							
							
							includes linux compat 
							
						 
						
							2020-06-14 09:45:23 +02:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
							
							
								
							
							
								aebdf3b66e 
								
							 
						 
						
							
							
								
								add get public v6  
							
							 
							
							
							
						 
						
							2020-06-14 09:06:37 +02:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
							
							
								
							
							
								a5bb3e3f59 
								
							 
						 
						
							
							
								
								fix webhost pathing on linux  
							
							 
							
							
							
						 
						
							2020-06-14 08:18:31 +02:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
							
							
								
							
							
								48aff48740 
								
							 
						 
						
							
							
								
								logfile sanity check  
							
							 
							
							
							
						 
						
							2020-06-14 08:11:56 +02:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
							
							
								
							
							
								4e6f976e1d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master'  
							
							 
							
							
							
						 
						
							2020-06-14 07:45:07 +02:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
							
							
								
							
							
								03a6227eef 
								
							 
						 
						
							
							
								
								set up pony and waitress skeletons  
							
							 
							
							
							
						 
						
							2020-06-14 07:44:59 +02:00  
						
					 
				
					
						
							
							
								 
								caitsith2
							
						 
						
							 
							
							
							
							
								
							
							
								6141a4dddc 
								
							 
						 
						
							
							
								
								Fix the Localized Cross keys example  
							
							 
							
							
							
						 
						
							2020-06-13 21:27:32 -07:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
							
							
								
							
							
								c486cd77bb 
								
							 
						 
						
							
							
								
								fix missed rename  
							
							 
							
							
							
						 
						
							2020-06-14 04:12:38 +02:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
							
							
								
							
							
								fdaba7e28c 
								
							 
						 
						
							
							
								
								Merge branch 'bsdiff4_baserom'  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	Main.py 
							
						 
						
							2020-06-13 22:51:44 +02:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
							
							
								
							
							
								ddc7be0794 
								
							 
						 
						
							
							
								
								update webhost  
							
							 
							
							
							
						 
						
							2020-06-13 22:49:57 +02:00  
						
					 
				
					
						
							
							
								 
								Chris
							
						 
						
							 
							
							
							
							
								
							
							
								53744be44c 
								
							 
						 
						
							
							
								
								Remove useless code and rebuild bundle file  
							
							 
							
							
							
						 
						
							2020-06-13 15:24:28 -04:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								35933b88c4 
								
							 
						 
						
							
							
								
								Merge pull request  #110  from compiling/multiworld  
							
							 
							
							... 
							
							
							
							OWG mandatory exit rules 
							
						 
						
							2020-06-13 19:36:24 +02:00  
						
					 
				
					
						
							
							
								 
								compiling
							
						 
						
							 
							
							
							
							
								
							
							
								ca1740121e 
								
							 
						 
						
							
							
								
								Reduce mandatory exits for OWG logic to only those that cannot be reached by glitches  
							
							 
							
							
							
						 
						
							2020-06-13 19:12:01 +10:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
							
							
								
							
							
								7c5c32c49a 
								
							 
						 
						
							
							
								
								include web host for multiple multiworlds  
							
							 
							
							... 
							
							
							
							This is in proof of concept stage, but also as a how-to as I get about monthly asked how to run multiple MultiServer instances for Discord Bots. 
							
						 
						
							2020-06-13 10:16:29 +02:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
							
							
								
							
							
								5da5847805 
								
							 
						 
						
							
							
								
								allow multiserver to defer to embedded options  
							
							 
							
							
							
						 
						
							2020-06-13 08:37:05 +02:00  
						
					 
				
					
						
							
							
								 
								compiling
							
						 
						
							 
							
							
							
							
								
							
							
								2199f18f16 
								
							 
						 
						
							
							
								
								Split mirror glitches into clips and offsets, with different rules (offsets need boots).  
							
							 
							
							... 
							
							
							
							Fix inverted mirror rules - DM Descent is a mirror offset, East DM access is a mirror wrap (not in logic).
Add mirror clip to Desert East entrance (from east Mire Shed).
Add inverted mirror offset to hyrule castle ledge (placing a portal on the houlihan exit). 
							
						 
						
							2020-06-13 15:39:58 +10:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
							
							
								
							
							
								898a0b7a8f 
								
							 
						 
						
							
							
								
								adjuster no longer needs to work with other basepatches, so it should not overwrite other basepatches.  
							
							 
							
							
							
						 
						
							2020-06-12 21:50:10 +02:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
							
							
								
							
							
								a77424d66a 
								
							 
						 
						
							
							
								
								missed a rename  
							
							 
							
							
							
						 
						
							2020-06-11 22:19:46 +02:00  
						
					 
				
					
						
							
							
								 
								caitsith2
							
						 
						
							 
							
							
							
							
								
							
							
								233d12be30 
								
							 
						 
						
							
							
								
								Change max triforce_pieces_required from 30 to 112.  
							
							 
							
							
							
						 
						
							2020-06-11 11:53:10 -07:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
							
							
								
							
							
								5692041a5b 
								
							 
						 
						
							
							
								
								call enemizer with binary rom data  
							
							 
							
							
							
						 
						
							2020-06-11 04:56:47 +02:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								403732e121 
								
							 
						 
						
							
							
								
								Merge pull request  #108  from Berserker66/regression_fix_2  
							
							 
							
							... 
							
							
							
							Place skull woods or universal key into generated item pools as appro… 
							
						 
						
							2020-06-10 22:48:37 +02:00  
						
					 
				
					
						
							
							
								 
								caitsith2
							
						 
						
							 
							
							
							
							
								
							
							
								fb0787a76d 
								
							 
						 
						
							
							
								
								Place skull woods or universal key into generated item pools as appropriate.  (and pop skull woods small key if explicitly placed in pinball chest).  (5 rupees instead of universal key on hard/expert pool)  
							
							 
							
							
							
						 
						
							2020-06-10 13:41:28 -07:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
							
							
								
							
							
								97af751010 
								
							 
						 
						
							
							
								
								beautify if tree  
							
							 
							
							
							
						 
						
							2020-06-10 21:29:42 +02:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
								
								
							
							
							
								
							
							
								5f78ae4b1d 
								
							 
						 
						
							
							
								
								Merge pull request  #107  from Berserker66/regression_fix  
							
							 
							
							... 
							
							
							
							Fix skull woods for Location / Item players. 
							
						 
						
							2020-06-10 21:26:13 +02:00  
						
					 
				
					
						
							
							
								 
								Fabian Dill
							
						 
						
							 
							
							
							
							
								
							
							
								4125995bdd 
								
							 
						 
						
							
							
								
								Adjust output to "BM" (Berserker's Multiworld) to differentiate spoiler logs, roms and server data at a glance  
							
							 
							
							... 
							
							
							
							Rename _multidata to .multidata and embed .multidata as MultiServer-openable file into windows registry 
							
						 
						
							2020-06-10 21:25:14 +02:00  
						
					 
				
					
						
							
							
								 
								caitsith2
							
						 
						
							 
							
							
							
							
								
							
							
								ec1c7601b4 
								
							 
						 
						
							
							
								
								Fix skull woods for Location / Item players.  
							
							 
							
							
							
						 
						
							2020-06-10 12:23:33 -07:00