MagicBot
							
						 | 
						
							
							
							
							
								
							
								d70305b0b6
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'bugfix-siege-asset-placement' into post-wipe-merge
							
							
							
							
							
							
							
							# Conflicts:
#	src/engine/net/client/handlers/PlaceAssetMsgHandler.java 
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								0469754d5d
								
							
								
							
						 | 
						
							
							
								
								Bugfix: needs city parent not current zone to pick up siege bounds.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								7cb0e5f6b2
								
							
								
							
						 | 
						
							
							
								
								Retrieve Admin Log events from database as a map.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								cec70b3b64
								
							
								
							
						 | 
						
							
							
								
								Tweak of column names and Event Strings.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								21ff024bf8
								
							
								
							
						 | 
						
							
							
								
								Admin login events captured.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								3f700f57a7
								
							
								
							
						 | 
						
							
							
								
								Admin command usages logged to database.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								68294baae6
								
							
								
							
						 | 
						
							
							
								
								Cleanup of scope issue when creating city objects.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								526c078978
								
							
								
							
						 | 
						
							
							
								
								Collision check extracted to method.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								f3fee3140a
								
							
								
							
						 | 
						
							
							
								
								Move siege validation out of the generic ValidateBuildingPlacement method.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 FatBoy-DOTC
							
						 | 
						
							
							
							
							
								
							
								e0af139b24
								
							
								
							
						 | 
						
							
							
								
								deed no longer is taken after failed placement
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 FatBoy-DOTC
							
						 | 
						
							
							
							
							
								
							
								313c13c588
								
							
								
							
						 | 
						
							
							
								
								corrected error message ID numbers
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								8ef5cb4e22
								
							
								
							
						 | 
						
							
							
								
								Rework of validation checks.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								2643be456e
								
							
								
							
						 | 
						
							
							
								
								Moved validation check to before asset creation.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								29c6d6cd8e
								
							
								
							
						 | 
						
							
							
								
								Counter scope issue resolved.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								c84fb60177
								
							
								
							
						 | 
						
							
							
								
								Errant import removed.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								d8dad9f087
								
							
								
							
						 | 
						
							
							
								
								Extract siege limits validation method.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								45f94c736a
								
							
								
							
						 | 
						
							
							
								
								Excess whitespace.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								7a670ffdbf
								
							
								
							
						 | 
						
							
							
								
								Appropriate error messages for BOW limits.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 FatBoy-DOTC
							
						 | 
						
							
							
							
							
								
							
								325c8b8254
								
							
								
							
						 | 
						
							
							
								
								siege asset placement reliant on attcker/defender maximums
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								90335355b7
								
							
								
							
						 | 
						
							
							
								
								Less verbose error message
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								4c10e01539
								
							
								
							
						 | 
						
							
							
								
								Reset time calculation updated.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								a76534f0af
								
							
								
							
						 | 
						
							
							
								
								Mesh set properly when errant mine loaded.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								a06420eae3
								
							
								
							
						 | 
						
							
							
								
								Early exit for errant mines at bootstrap.  Wtb method extract.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								48d435f2c1
								
							
								
							
						 | 
						
							
							
								
								Early exit for errant mines.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								43380962cc
								
							
								
							
						 | 
						
							
							
								
								Early exit for errant mines.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								14247715fd
								
							
								
							
						 | 
						
							
							
								
								Removed unused EffectiveDate
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								7282868eac
								
							
								
							
						 | 
						
							
							
								
								Errant mines are errant.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								b30e35f465
								
							
								
							
						 | 
						
							
							
								
								Refresh mine when destroyed.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								d9352b6d34
								
							
								
							
						 | 
						
							
							
								
								Refresh mine when destroyed.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								26dcccad81
								
							
								
							
						 | 
						
							
							
								
								Errant mines now change owner in database.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								d0cf94dbf9
								
							
								
							
						 | 
						
							
							
								
								HandleEndMineWindow will bump the date for us.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								f61bb925f8
								
							
								
							
						 | 
						
							
							
								
								Cleanup of NextMindWindow logic.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								5929d5dd56
								
							
								
							
						 | 
						
							
							
								
								Cleanup of NextMindWindow logic.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								5a19507f53
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/refinement-fix' into post-wipe-merge
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								5c3ea2c4c3
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/world-announcements' into post-wipe-merge
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 FatBoy-DOTC
							
						 | 
						
							
							
							
							
								
							
								1fef5e7c05
								
							
								
							
						 | 
						
							
							
								
								refund points from lost spells
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 FatBoy-DOTC
							
						 | 
						
							
							
							
							
								
							
								743e1f150d
								
							
								
							
						 | 
						
							
							
								
								refund points from lost spells
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 FatBoy-DOTC
							
						 | 
						
							
							
							
							
								
							
								7c983d04a3
								
							
								
							
						 | 
						
							
							
								
								refine stat point check
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 FatBoy-DOTC
							
						 | 
						
							
							
							
							
								
							
								73edd8d932
								
							
								
							
						 | 
						
							
							
								
								discipline and godly drop messages added
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 FatBoy-DOTC
							
						 | 
						
							
							
							
							
								
							
								cd0e31f39d
								
							
								
							
						 | 
						
							
							
								
								discipline and godly drop messages added
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								9e6c96a487
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/refinement-fix' into post-wipe-merge
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 FatBoy-DOTC
							
						 | 
						
							
							
							
							
								
							
								523e83a49c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/post-wipe-merge' into refinement-fix
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 FatBoy-DOTC
							
						 | 
						
							
							
							
							
								
							
								c9972962d1
								
							
								
							
						 | 
						
							
							
								
								check for powers needing skill
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								4b8e0cb041
								
							
								
							
						 | 
						
							
							
								
								Bump old opendate during reboot to current +1 when mine window has passed.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								3ec985e3d9
								
							
								
							
						 | 
						
							
							
								
								bugfix: window should not end for a mine not opened.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								af7d801388
								
							
								
							
						 | 
						
							
							
								
								bugfix: not overriding mine open date on boot.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								98470d4b1a
								
							
								
							
						 | 
						
							
							
								
								Added help for #dev subcommands
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								81b7259423
								
							
								
							
						 | 
						
							
							
								
								Added remote console output.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								d6a505fd00
								
							
								
							
						 | 
						
							
							
								
								Added lastout sub command.
							
							
							
							
							
						 | 
						
							3 years ago | 
						
					
				
					
						
							
							
								
								 MagicBot
							
						 | 
						
							
							
							
							
								
							
								a71bf4330b
								
							
								
							
						 | 
						
							
							
								
								Redirecting output via the shell.
							
							
							
							
							
						 | 
						
							3 years ago |