branchrust_reboot/main/naval_updatecancel
                         
                     
             
         
     
    
        
70 Commits over 61 Days - 0.05cph!
    
    
    
        
        
        
        
        
            
            
            
                
                merge from naval_update/deep_sea
                
                
                
                
             
         
        
            
            
            
                
                merge from naval_update/deep_sea
                
                
                
                
             
         
        
            
            
            
                
                Partially reverted 
134856, causing some issues
                
                
                
                
             
         
        
            
            
            
                
                merge from naval_update/block_items_boats
                
                
                
                
             
         
        
        
            
            
            
                
                Restored cargoship global network behaviour to MainIsland
                
                
                
                
             
         
        
        
        
        
            
            
            
                
                Fixed floating island map marker text not marked as non static
                
                
                
                
             
         
        
        
            
            
            
                
                Revert cargo global network group to Default (from MainIsland)
                
                
                
                
             
         
        
            
            
            
                
                merge from naval_update/deep_sea
                
                
                
                
             
         
        
            
            
            
                
                merge from naval_update/deep_sea
                
                
                
                
             
         
        
            
            
            
                
                merge from naval_update/island_scenes
                
                
                
                
             
         
        
        
            
            
            
                
                ClientIOLine slackLevels and originalPositions actually need to be serialised, moved them out of #if CLIENT
                
                
                
                
             
         
        
            
            
            
                
                Fixed CLIENT SERVER serialized fields mismatch in
- DeepSeaManager
- SteeringWheel
- ClientIOLine (was causing all monument prefabs to reimport)
- PaintingFavouriteColorButton
- PaintingFavouriteColours
- RendererBatch
                
                
                
                
             
         
        
            
            
            
                
                merge from naval_update/floating_cities
                
                
                
                
             
         
        
            
            
            
                
                merge from naval_update/deep_sea
                
                
                
                
             
         
        
        
            
            
            
                
                merge from naval_update/island_scenes
                
                
                
                
             
         
        
            
            
            
                
                merge from naval_update/deep_sea
                
                
                
                
             
         
        
            
            
            
                
                merge from main (using main version of all the prefabs changed by a manifest update in naval)
                
                
                
                
             
         
        
            
            
            
                
                merge from naval_update/deep_sea
                
                
                
                
             
         
        
        
        
        
        
            
            
            
                
                merge from naval_update/deep_sea
                
                
                
                
             
         
        
        
            
            
            
                
                merge from naval_update/deep_sea
                
                
                
                
             
         
        
            
            
            
                
                merge from naval_update/deep_sea
                
                
                
                
             
         
        
            
            
            
                
                merge from naval_update/deep_sea
                
                
                
                
             
         
        
            
            
            
                
                merge from naval_update/floating_cities
                
                
                
                
             
         
        
        
            
            
            
                
                merge from naval_update/deep_sea
                
                
                
                
             
         
        
            
            
            
                
                merge from naval_update/deep_sea
                
                
                
                
             
         
        
        
            
            
            
                
                merge from naval_update/deep_sea
                
                
                
                
             
         
        
            
            
            
                
                merge from naval_update/floating_cities
                
                
                
                
             
         
        
        
            
            
            
                
                Removed monument info on floating city prefab. Its landmark was being added to TerrainPath and isn't cleaned up when the floating city is killed by the deep sea wipe, causing NREs later
Also added a null check in MapView.SetupMonuments
                
                
                
                
             
         
        
            
            
            
                
                merge from naval_update/deep_sea
                
                
                
                
             
         
        
        
            
            
            
                
                merge from naval_update/deep_sea