Compare commits
merge into: BTH/axyz:Dirtybit
BTH/axyz:master
BTH/axyz:LiveTexturing
BTH/axyz:AnimationBlendDemo
BTH/axyz:ShieldFix
BTH/axyz:Recording
BTH/axyz:AndersTest
BTH/axyz:Anderstestmaster
BTH/axyz:DDS
BTH/axyz:DeathAnimation
BTH/axyz:Importer
BTH/axyz:PerfectSoundForRelease
BTH/axyz:Movement
BTH/axyz:FixAssaultWeaponReload
BTH/axyz:revert-216-ShadowOptimization
BTH/axyz:MSAA
BTH/axyz:ShadowOptimization
BTH/axyz:RestartMap
BTH/axyz:Dirtybit
BTH/axyz:MemoryOptimization
BTH/axyz:Kill-streak-sounds
BTH/axyz:Dirtybit-imon
BTH/axyz:Menu
BTH/axyz:ExplosionEffectV2
BTH/axyz:SplitSnapshots
BTH/axyz:CapturePointFixBranch
BTH/axyz:FriendlyHost/Join
BTH/axyz:TextFix
BTH/axyz:EntitiesWithoutTransform
BTH/axyz:RendererBugFixes
BTH/axyz:EmergencyOptimizations
BTH/axyz:Weapons
BTH/axyz:CapturePointTake
BTH/axyz:SpectatorCamera
BTH/axyz:SpawnerRespawn
BTH/axyz:AnimationPickingFixes
BTH/axyz:BoxModelCollision
BTH/axyz:TextColor
BTH/axyz:Shadows
BTH/axyz:TeamPickCamera
BTH/axyz:DamageIndicator
BTH/axyz:Dirtybit-WTFDIDIBREAK
BTH/axyz:AmmoPickup
BTH/axyz:AndersFixBranch
BTH/axyz:NetworkComponent
BTH/axyz:PlayerHUD
BTH/axyz:ScoreBoard
BTH/axyz:IconsForPlaytest
BTH/axyz:SniperSprintBranch
BTH/axyz:MiniDump
BTH/axyz:Animations
BTH/axyz:Playtest2-Fallback
BTH/axyz:DeathEventUsesPlayerID
BTH/axyz:FixNetworkBugs
BTH/axyz:AssaultBoost
BTH/axyz:revert-145-Shadows
BTH/axyz:HUD-Timers
BTH/axyz:EditorUsefulness
BTH/axyz:EntityFileCaching
BTH/axyz:SniperSprint
BTH/axyz:RenderSetingsV2
BTH/axyz:Defender-v2
BTH/axyz:DashFixBranch
BTH/axyz:EditorKeyboardFix
BTH/axyz:RenderSettings
BTH/axyz:TempBranchSak
BTH/axyz:Render_Optimization
BTH/axyz:EditorUndo
BTH/axyz:AndersTestNetwork
BTH/axyz:Defender
BTH/axyz:SeeTeamMates
BTH/axyz:SSAO
BTH/axyz:CubeMap
BTH/axyz:GameMode
BTH/axyz:ResizeWindowFixFromSSAOMerge
BTH/axyz:SmallFixes-Tobias
BTH/axyz:DynamicPacketBuffer
BTH/axyz:FixNetworkFul-Hacks
BTH/axyz:HealthPickup
BTH/axyz:AssaultDash
BTH/axyz:FixNetworkToPlayTest
BTH/axyz:Sound
BTH/axyz:TCPConnections
BTH/axyz:CapturePointColorFix
BTH/axyz:Transparancyfix
BTH/axyz:PickingFix
BTH/axyz:DoubleJumpEffect
BTH/axyz:FrustumCulling
BTH/axyz:BloomImprovement
BTH/axyz:Warnings-Tobias
BTH/axyz:AssetSorting
BTH/axyz:NormalSpecularMapping
BTH/axyz:DoubleJump
BTH/axyz:Warnings
BTH/axyz:Networking
BTH/axyz:Transparency
BTH/axyz:CoolDeathAnimation
BTH/axyz:Cleanup
BTH/axyz:AirJumpEffect
BTH/axyz:ShootRays
BTH/axyz:PlayerMovement
BTH/axyz:Forward+
BTH/axyz:AdvancedPlayerMovement
BTH/axyz:NormalMaps
BTH/axyz:CapturePointCrashFixBranch
BTH/axyz:ShootEvent
BTH/axyz:SpawnMiniBranch
BTH/axyz:OctTree
BTH/axyz:DisableMemoryPool
BTH/axyz:MayaExporter
BTH/axyz:ecs-reference
BTH/axyz:DeveloperConsole
BTH/axyz:OrderedSystemPipeline
BTH/axyz:RendererDecoupling
BTH/axyz:Editor
BTH/axyz:Input-XboxController
BTH/axyz:SteamController
...
pull from: BTH/axyz:DynamicPacketBuffer
BTH/axyz:master
BTH/axyz:LiveTexturing
BTH/axyz:AnimationBlendDemo
BTH/axyz:ShieldFix
BTH/axyz:Recording
BTH/axyz:AndersTest
BTH/axyz:Anderstestmaster
BTH/axyz:DDS
BTH/axyz:DeathAnimation
BTH/axyz:Importer
BTH/axyz:PerfectSoundForRelease
BTH/axyz:Movement
BTH/axyz:FixAssaultWeaponReload
BTH/axyz:revert-216-ShadowOptimization
BTH/axyz:MSAA
BTH/axyz:ShadowOptimization
BTH/axyz:RestartMap
BTH/axyz:Dirtybit
BTH/axyz:MemoryOptimization
BTH/axyz:Kill-streak-sounds
BTH/axyz:Dirtybit-imon
BTH/axyz:Menu
BTH/axyz:ExplosionEffectV2
BTH/axyz:SplitSnapshots
BTH/axyz:CapturePointFixBranch
BTH/axyz:FriendlyHost/Join
BTH/axyz:TextFix
BTH/axyz:EntitiesWithoutTransform
BTH/axyz:RendererBugFixes
BTH/axyz:EmergencyOptimizations
BTH/axyz:Weapons
BTH/axyz:CapturePointTake
BTH/axyz:SpectatorCamera
BTH/axyz:SpawnerRespawn
BTH/axyz:AnimationPickingFixes
BTH/axyz:BoxModelCollision
BTH/axyz:TextColor
BTH/axyz:Shadows
BTH/axyz:TeamPickCamera
BTH/axyz:DamageIndicator
BTH/axyz:Dirtybit-WTFDIDIBREAK
BTH/axyz:AmmoPickup
BTH/axyz:AndersFixBranch
BTH/axyz:NetworkComponent
BTH/axyz:PlayerHUD
BTH/axyz:ScoreBoard
BTH/axyz:IconsForPlaytest
BTH/axyz:SniperSprintBranch
BTH/axyz:MiniDump
BTH/axyz:Animations
BTH/axyz:Playtest2-Fallback
BTH/axyz:DeathEventUsesPlayerID
BTH/axyz:FixNetworkBugs
BTH/axyz:AssaultBoost
BTH/axyz:revert-145-Shadows
BTH/axyz:HUD-Timers
BTH/axyz:EditorUsefulness
BTH/axyz:EntityFileCaching
BTH/axyz:SniperSprint
BTH/axyz:RenderSetingsV2
BTH/axyz:Defender-v2
BTH/axyz:DashFixBranch
BTH/axyz:EditorKeyboardFix
BTH/axyz:RenderSettings
BTH/axyz:TempBranchSak
BTH/axyz:Render_Optimization
BTH/axyz:EditorUndo
BTH/axyz:AndersTestNetwork
BTH/axyz:Defender
BTH/axyz:SeeTeamMates
BTH/axyz:SSAO
BTH/axyz:CubeMap
BTH/axyz:GameMode
BTH/axyz:ResizeWindowFixFromSSAOMerge
BTH/axyz:SmallFixes-Tobias
BTH/axyz:DynamicPacketBuffer
BTH/axyz:FixNetworkFul-Hacks
BTH/axyz:HealthPickup
BTH/axyz:AssaultDash
BTH/axyz:FixNetworkToPlayTest
BTH/axyz:Sound
BTH/axyz:TCPConnections
BTH/axyz:CapturePointColorFix
BTH/axyz:Transparancyfix
BTH/axyz:PickingFix
BTH/axyz:DoubleJumpEffect
BTH/axyz:FrustumCulling
BTH/axyz:BloomImprovement
BTH/axyz:Warnings-Tobias
BTH/axyz:AssetSorting
BTH/axyz:NormalSpecularMapping
BTH/axyz:DoubleJump
BTH/axyz:Warnings
BTH/axyz:Networking
BTH/axyz:Transparency
BTH/axyz:CoolDeathAnimation
BTH/axyz:Cleanup
BTH/axyz:AirJumpEffect
BTH/axyz:ShootRays
BTH/axyz:PlayerMovement
BTH/axyz:Forward+
BTH/axyz:AdvancedPlayerMovement
BTH/axyz:NormalMaps
BTH/axyz:CapturePointCrashFixBranch
BTH/axyz:ShootEvent
BTH/axyz:SpawnMiniBranch
BTH/axyz:OctTree
BTH/axyz:DisableMemoryPool
BTH/axyz:MayaExporter
BTH/axyz:ecs-reference
BTH/axyz:DeveloperConsole
BTH/axyz:OrderedSystemPipeline
BTH/axyz:RendererDecoupling
BTH/axyz:Editor
BTH/axyz:Input-XboxController
BTH/axyz:SteamController
These branches are equal.