{"push_id":565639413,"size":1,"distinct_size":1,"ref":"refs/heads/Development_main","head":"606772762b8e88e295b536f0a259dc60757db490","before":"d8facb9c4aa5cf703b12754adc9bfc29827b0f64","commits":[{"sha":"606772762b8e88e295b536f0a259dc60757db490","author":{"email":"5d4fc34da30bf50330701c36c30456e22dfe0503@gmail.com","name":"Lunchbox35"},"message":"Merge remote-tracking branch 'vanilla/Development_main' into Development_main\n\nConflicts:\n\taddons/Lootspawner/LSlootLists.sqf\n\taddons/R3F_ARTY_AND_LOG/R3F_LOG/config.sqf\n\taddons/R3F_ARTY_AND_LOG/R3F_LOG/heliporteur/heliporter.sqf\n\taddons/R3F_ARTY_AND_LOG/R3F_LOG/objet_deplacable/objectLockStateMachine.sqf\n\taddons/camera/functions.sqf\n\taddons/far_revive/FAR_HandleDamage_EH.sqf\n\taddons/far_revive/FAR_Player_Unconscious.sqf\n\taddons/far_revive/FAR_findKiller.sqf\n\taddons/far_revive/FAR_revive_funcs.sqf\n\taddons/fpsFix/vehicleManager.sqf\n\taddons/fpsFix/vehicleManagerHC.sqf\n\tbriefing.sqf\n\tclient/actions/gui.hpp\n\tclient/actions/notify.sqf\n\tclient/clientEvents/getInVehicle.sqf\n\tclient/clientEvents/onKeyPress.sqf\n\tclient/clientEvents/onKilled.sqf\n\tclient/clientEvents/onRespawn.sqf\n\tclient/functions/clientCompile.sqf\n\tclient/functions/createGeneralStoreMarkers.sqf\n\tclient/functions/createGunStoreMarkers.sqf\n\tclient/functions/createVehicleStoreMarkers.sqf\n\tclient/functions/drawPlayerIcons.sqf\n\tclient/functions/drawPlayerMarkers.sqf\n\tclient/functions/evalManagedActions.sqf\n\tclient/functions/firstSpawn.sqf\n\tclient/functions/fn_fitsInventory.sqf\n\tclient/functions/fn_forceAddItem.sqf\n\tclient/functions/getItemInfo.sqf\n\tclient/functions/initSurvival.sqf\n\tclient/functions/placePurchasedCrate.sqf\n\tclient/functions/playerActions.sqf\n\tclient/functions/playerEventServer.sqf\n\tclient/functions/playerSetupEnd.sqf\n\tclient/functions/playerSetupStart.sqf\n\tclient/functions/playerSpawn.sqf\n\tclient/functions/setupClientPVars.sqf\n\tclient/functions/spawnAction.sqf\n\tclient/functions/spawnInTown.sqf\n\tclient/functions/spawnOnBeacon.sqf\n\tclient/functions/spawnRandom.sqf\n\tclient/functions/uniformConverter.sqf\n\tclient/functions/unitHandleDamage.sqf\n\tclient/gui_base.hpp\n\tclient/icons/briefcase.paa\n\tclient/icons/cannedfood.paa\n\tclient/icons/jerrycan.paa\n\tclient/init.sqf\n\tclient/inventory/create.sqf\n\tclient/inventory/list.sqf\n\tclient/items/beacon/can_use.sqf\n\tclient/items/beacon/deploy.sqf\n\tclient/items/beacon/init.sqf\n\tclient/items/beacon/pack.sqf\n\tclient/items/beacon/toggle_spawn_permissions.sqf\n\tclient/items/camonet/init.sqf\n\tclient/items/cratemoney/access.sqf\n\tclient/items/cratemoney/deposit.sqf\n\tclient/items/cratemoney/refresh.sqf\n\tclient/items/cratemoney/withdraw.sqf\n\tclient/items/init.sqf\n\tclient/items/jerrycan/can_syphon.sqf\n\tclient/items/jerrycan/init.sqf\n\tclient/items/jerrycan/syphon.sqf\n\tclient/items/misc/can_repair.sqf\n\tclient/items/misc/init.sqf\n\tclient/items/survival/energy_drink.sqf\n\tclient/items/survival/init.sqf\n\tclient/items/warchest/access.sqf\n\tclient/items/warchest/can_access.sqf\n\tclient/items/warchest/can_hack.sqf\n\tclient/items/warchest/can_pack.sqf\n\tclient/items/warchest/defines.sqf\n\tclient/items/warchest/deploy.sqf\n\tclient/items/warchest/deposit.sqf\n\tclient/items/warchest/dialog.hpp\n\tclient/items/warchest/hack.sqf\n\tclient/items/warchest/init.sqf\n\tclient/items/warchest/mutex.sqf\n\tclient/items/warchest/nearest.sqf\n\tclient/items/warchest/pack.sqf\n\tclient/items/warchest/refresh.sqf\n\tclient/items/warchest/withdraw.sqf\n\tclient/systems/adminPanel/dialog/adminMenu.hpp\n\tclient/systems/adminPanel/dialog/debugMenu.hpp\n\tclient/systems/adminPanel/dialog/modMenu.hpp\n\tclient/systems/adminPanel/dialog/playerMenu.hpp\n\tclient/systems/adminPanel/dialog/serverAdminMenu.hpp\n\tclient/systems/adminPanel/dialog/vehicleManagement.hpp\n\tclient/systems/adminPanel/loadDebugMenu.sqf\n\tclient/systems/adminPanel/loadServerAdministratorMenu.sqf\n\tclient/systems/adminPanel/optionSelect.sqf\n\tclient/systems/adminPanel/playerSelect.sqf\n\tclient/systems/adminPanel/toggleGodMode.sqf\n\tclient/systems/common.hpp\n\tclient/systems/generalStore/buysellSwitch.sqf\n\tclient/systems/generalStore/dialog/genstoreDefines.sqf\n\tclient/systems/generalStore/dialog/genstore_settings.hpp\n\tclient/systems/generalStore/getInventory.sqf\n\tclient/systems/generalStore/loadGenStore.sqf\n\tclient/systems/generalStore/populateGenStore.sqf\n\tclient/systems/generalStore/populateSwitch.sqf\n\tclient/systems/generalStore/sellItems.sqf\n\tclient/systems/generalStore/switchMode.sqf\n\tclient/systems/groups/dialog/groupManagement.hpp\n\tclient/systems/groups/leaveGroup.sqf\n\tclient/systems/gunStore/buyAmmo.sqf\n\tclient/systems/gunStore/dialog/gunshop_settings.hpp\n\tclient/systems/gunStore/loadGunStore.sqf\n\tclient/systems/gunStore/populateGunStore.sqf\n\tclient/systems/hud/dialog/hud.hpp\n\tclient/systems/hud/playerHud.sqf\n\tclient/systems/playerMenu/closePlayerMenu.sqf\n\tclient/systems/playerMenu/dialog/groupManagement.hpp\n\tclient/systems/playerMenu/dialog/loadRespawnDialog.sqf\n\tclient/systems/playerMenu/dialog/player_settings.hpp\n\tclient/systems/playerMenu/dialog/player_sys.sqf\n\tclient/systems/playerMenu/dialog/respawn_dialog.hpp\n\tclient/systems/playerMenu/dialog/teamkill_dialog.hpp\n\tclient/systems/playerMenu/dropMoney.sqf\n\tclient/systems/scoreboard/loadScoreboard.sqf\n\tclient/systems/scoreboard/score_gui.hpp\n\tclient/systems/selling/sellWeapon.sqf\n\tclient/systems/vehicleStore/applyVehicleTexture.sqf\n\tclient/systems/vehicleStore/buyVehicles.sqf\n\tclient/systems/vehicleStore/dialog/vehiclestore_settings.hpp\n\tclient/systems/vehicleStore/loadVehicleStore.sqf\n\tclient/systems/vehicleStore/populateVehicleStore.sqf\n\tclient/systems/vehicleStore/vehicleInfo.sqf\n\tconfig.sqf\n\tdescription.ext\n\tglobalCompile.sqf\n\tinit.sqf\n\tinitPlayerLocal.sqf\n\tinitServer.sqf\n\tmapConfig/Loading.jpg\n\tmapConfig/storeOwners.sqf\n\tmapConfig/territories.sqf\n\tmission.sqm\n\tserver/CfgFunctions.hpp\n\tserver/antihack/adminMenuLog.sqf\n\tserver/antihack/compileFuncs.sqf\n\tserver/antihack/createUnit.sqf\n\tserver/antihack/flagHandler.sqf\n\tserver/antihack/manageUnit.sqf\n\tserver/antihack/payload.sqf\n\tserver/antihack/setup.sqf\n\tserver/default_config.sqf\n\tserver/functions/fn_addScore.sqf\n\tserver/functions/fn_enableSimulationGlobal.sqf\n\tserver/functions/fn_magazineAmmoCargo.sqf\n\tserver/functions/fn_numToStr.sqf\n\tserver/functions/fn_numbersText.sqf\n\tserver/functions/fn_onPlayerDisconnected.sqf\n\tserver/functions/serverCompile.sqf\n\tserver/functions/serverPlayerDied.sqf\n\tserver/functions/serverTimeSync.sqf\n\tserver/functions/setMissionSkill.sqf\n\tserver/functions/setupServerPVars.sqf\n\tserver/functions/spawnStoreObject.sqf\n\tserver/functions/teamKillUnlock.sqf\n\tserver/functions/vehicle.sqf\n\tserver/functions/vehicleHandleDamage.sqf\n\tserver/functions/vehicleSetup.sqf\n\tserver/init.sqf\n\tserver/missions/factoryMethods/createOutpost.sqf\n\tserver/missions/factoryMethods/createUnits/customGroup.sqf\n\tserver/missions/factoryMethods/createUnits/customGroup2.sqf\n\tserver/missions/factoryMethods/moveIntoBuildings.sqf\n\tserver/missions/mainMissions/mission_CivHeli.sqf\n\tserver/missions/mainMissions/mission_HostileHeliFormation.sqf\n\tserver/missions/masterController.sqf\n\tserver/missions/missionProcessor.sqf\n\tserver/missions/setupMissionArrays.sqf\n\tserver/missions/sideMissions/mission_HostileHelicopter.sqf\n\tserver/missions/sideMissions/mission_WepCache.sqf\n\tserver/spawning/boatCreation.sqf\n\tserver/spawning/objectCreation.sqf\n\tserver/spawning/staticHeliCreation.sqf\n\tserver/spawning/vehicleCreation.sqf\n\tstoreConfig.sqf\n\tstringtable.xml\n\tterritory/client/setupCaptureTriggers.sqf\n\tterritory/client/territoryActivityHandler.sqf\n\tterritory/server/createCaptureTriggers.sqf\n\tterritory/server/monitorTerritories.sqf","distinct":true,"url":"https://api.github.com/repos/Spackler/ArmA3_WastelandPublic.Altis/commits/606772762b8e88e295b536f0a259dc60757db490"}]}