128,907 Commits over 4,232 Days - 1.27cph!
    
    
    
        
            
            
            
                
                Merge from main -> fix_npc_death_icon
 
                
                
                
                
                
             
         
        
            
            
            
                
                merge from fix_map_zoom_numbers -> main
 
                
                
                
                
                
             
         
        
            
            
            
                
                Fix map grid text labels not rendering properly depending on zoom & map size
- this changes map grids to be slightly different sizes depending on map size (146.3 target, 152m on 3500, 150m on 4500)
- however the grid is now is correctly centered on the map
- number of grids = Floor(MapSize * 7 / 1024)
- size per grid = MapSize / number of grids
This also fixes teleport2grid not working on certain map sizes (like 3500)
- this was due to the map rendering 24 grids (breaking at different zoom levels too) instead of 23 grids (3500 map size = 23.92 grids)
 
                
                
                
                
                
             
         
        
            
            
            
                
                Battering ram cabin detailed colliders
 
                
                
                
                
                
             
         
        
            
            
            
                
                Tweaked terrain blend settings on small arctic rock formations
 
                
                
                
                
                
             
         
        
            
            
            
                
                Add debug convar for fire melee, fix some events being dropped
 
                
                
                
                
                
             
         
        
        
            
            
            
                
                Fix error caused by adding already present key to dictionary, fix distance check being inverted
 
                
                
                
                
                
             
         
        
            
            
            
                
                Restored battering ram placeholder animations
Steering wheel IK
Better colliders
 
                
                
                
                
                
             
         
        
            
            
            
                
                Fix NRE caused by dictionary trying to add an already present key
 
                
                
                
                
                
             
         
        
            
            
            
                
                Fix wolf circling corpse for a long time sometimes when moving to eat
 
                
                
                
                
                
             
         
        
            
            
            
                
                Prevent wolf walking underwater, it'll give up thechase if the player starts swimming
 
                
                
                
                
                
             
         
        
            
            
            
                
                Reduce odds of wolf attacking animal when it's likely it'll lose
 
                
                
                
                
                
             
         
        
            
            
            
                
                Fixed LOD issues in rock_formation_huge_e
 
                
                
                
                
                
             
         
        
            
            
            
                
                Merge from fix_get_building_priv -> main
 
                
                
                
                
                
             
         
        
            
            
            
                
                Fixed paddling pool water being invisible inside canyons
 
                
                
                
                
                
             
         
        
            
            
            
                
                updated attachment targets, also turned viewmodel renderer back on
 
                
                
                
                
                
             
         
        
            
            
            
                
                Raised steering wheel for animation test
 
                
                
                
                
                
             
         
        
        
        
            
            
            
                
                Fixed pivots on driver cabin items
 
                
                
                
                
                
             
         
        
            
            
            
                
                Script auto updates / compile fixes
 
                
                
                
                
                
             
         
        
            
            
            
                
                Separated assets for placeholder animation
 
                
                
                
                
                
             
         
        
            
            
            
                
                Moved battering ram hardware out of placeholder folder
 
                
                
                
                
                
             
         
        
        
            
            
            
                
                Added battering ram hardware to entity, updated models and materials
 
                
                
                
                
                
             
         
        
            
            
            
                
                Battering ram door wip settings
 
                
                
                
                
                
             
         
        
            
            
            
                
                - Siege tower raising now works, but not as clean as i'd like it to be yet
- Code cleanup
 
                
                
                
                
                
             
         
        
            
            
            
                
                - Added raise command when siege tower has flipped onto the ground
- Fixed bugs with IsTipping not being registered properly
 
                
                
                
                
                
             
         
        
        
        
        
            
            
            
                
                manifest.json and packages-lock.json
 
                
                
                
                
                
             
         
        
        
        
            
            
            
                
                Add ProjectSettings/MultiplayerManager.asset to SCM
 
                
                
                
                
                
             
         
        
        
        
        
            
            
            
                
                 disabled_halloween24 -> main
 
                
                
                
                
                
             
         
        
            
            
            
                
                Disable Scarecrowpopulation
Updated collectables
Removed bone collectable
Frank default table craftable disabled
Disabled portals
 
                
                
                
                
                
             
         
        
        
            
            
            
                
                Update: Invoking of profiler method annotation filter works
- Instead of hooking in we rely on Unity's assembly initialization to invoke us first - seems to be early enough, but we'll see
- Store profiler callbacks to avoid GC cleaning them up and crashes in mono
- Add compile guards (for now allowing to run editor to test)
Tests: launched in editor, no crashes and a lot(112k) of debug logs indicating what gets annotated.
 
                
                
                
                
                
             
         
        
            
            
            
                
                Fix regression from HBHF fixes that causes building blocks with no TC attached to use TC of nearby but unattached building blocks
 
                
                
                
                
                
             
         
        
        
            
            
            
                
                IsTipping wont be called if tipped
 
                
                
                
                
                
             
         
        
        
            
            
            
                
                Split off IsTipping and IsTipped flags
Only enable is tipping if we are starting to tip and not when we are on the ground