d#92

Open

tonnic wants to merge 775 commits intomicovery:Development_mainfrom A3Armory:Development_main

+24,048-11,376

This pull request is big! We're only showing the most recent 250 commits

Commits on Jan 22, 2015

Refine the boomerang player/vehicle interactions
micovery
committed
Add configs for boomerang
micovery
committed
Enable LCD on boomerang
micovery
committed
Enable saving of boomerang devices
micovery
committed
Remove fired near event handler after closing hud
micovery
committed
Merge pull request #79 from micovery/Development_main_addons+Boomerang
micovery
committed
Forgot to remove extra debug log call
micovery
committed
Merge remote-tracking branch 'upstream/Development_main' into Development_main
micovery
committed
Merge branch 'Development_main' into Development_main_addons
micovery
committed
Merge remote-tracking branch 'upstream/Development_main_addons' into Development_main
Gigatek
committed
Updated boomerang config.
Gigatek
committed
Reduced falling and vehicle collision player damage.
Gigatek
committed
Removed one repair kit and nvg. Added 3 chem lights.
Gigatek
committed
Added UAVs to towing.
Gigatek
committed
Added UAVs and UGVs to saved vehicles.
Gigatek
committed
Added TS address to server credits.
Gigatek
committed

Commits on Jan 23, 2015

Revamp resupply to work with UAVs, and Statics
micovery
committed
Only remove the resupply action
micovery
committed
Add the vehicle name to the resupply action
micovery
committed
Restrict resupply to driver/gunner
micovery
committed
Possible 1.38 shake fix.
Gigatek
committed
Hack to prevent UAVs from blowing up
micovery
committed
Merge branch 'Development_main' of https://github.com/A3Armory/ArmA3_Wasteland.Altis into Development_main
micovery
committed
Resupply only 2 missiles to UAVs.
Gigatek
committed
Enabled thermal equipment on loaded vehicles for UAVs and UGVs
Gigatek
committed
Updated locked vehicles.
Gigatek
committed
More reliable fix for UAV explosions
micovery
committed
Updated sell vehicles.
Gigatek
committed
Updated sell vehicles.
Gigatek
committed
Merge remote-tracking branch 'upstream/Development_main' into Development_main
micovery
committed
Merge branch 'Development_main' into Development_main_addons
micovery
committed
More reliable fix for UAV explosions
micovery
committed

Commits on Jan 25, 2015

Offload player list saving to HC if available
micovery
committed
Adjusted some spacing.

Gigatek
authored and
micovery
committed
Normalize config only on server side
micovery
committed
Remove debug message
micovery
committed
Merge pull request #83 from micovery/Development_main+HC_Offload
micovery
committed
Merge branch 'Development_main' into Development_main_addons
micovery
committed
Fix wrong check
micovery
committed
Merge remote-tracking branch 'micovery/Development_main_addons' into Development_main
Gigatek
committed
Refine unflip logic
micovery
committed
Updated MagRepack info.
Gigatek
committed
Merge remote-tracking branch 'micovery/Development_main_addons' into Development_main
Gigatek
committed
Offload object saving to HC if available
micovery
committed
Merge branch 'Development_main' into Development_main_addons
micovery
committed
Broadcast lifetime variables
micovery
committed
Broadcast lifetime variables
micovery
committed
Merge branch 'Development_main' into Development_main_addons
micovery
committed
Load default config on HC as well
micovery
committed
Refactor mine saving a bit to work with HC
micovery
committed
Merge branch 'Development_main' into Development_main_addons
micovery
committed
Cleanup arrays before offloading to HC
micovery
committed
Merge branch 'Development_main' into Development_main_addons
micovery
committed
Merge remote-tracking branch 'micovery/Development_main_addons' into Development_main
Gigatek
committed
Added food and water to town invasion.
Gigatek
committed
Updated class names.
Gigatek
committed
Optimize syncing between server, and HC
micovery
committed
Merge branch 'Development_main' into Development_main_addons
micovery
committed
Merge remote-tracking branch 'upstream/Development_main' into Development_main
micovery
committed
Merge branch 'Development_main' into Development_main_addons
micovery
committed
Clean object cache also when offloading to HC
micovery
committed
Merge branch 'Development_main' into Development_main_addons
micovery
committed
Merge remote-tracking branch 'micovery/Development_main_addons' into Development_main
Gigatek
committed

Commits on Jan 26, 2015

Revert UGV thermal.
Gigatek
committed
Updated mission.sqm
Gigatek
committed
Updated mission.sqm
Gigatek
committed
Merge remote-tracking branch 'upstream/Development_main' into Development_main
micovery
committed
Merge branch 'Development_main' into Development_main_addons
micovery
committed
Merge remote-tracking branch 'micovery/Development_main_addons' into Development_main
Gigatek
committed
Updated mission.sqm
Gigatek
committed
Offload vehicle saving to HC if available
micovery
committed
Merge branch 'Development_main' into Development_main_addons
micovery
committed
Do not run 3rd party scripts on HC
micovery
committed
Merge branch 'Development_main' into Development_main_addons
micovery
committed
Redo of chem lights.
Gigatek
committed
Merge remote-tracking branch 'micovery/Development_main_addons' into Development_main
Gigatek
committed
Update init.sqf
Gigatek1
committed

Commits on Feb 5, 2015

Updated configs.
Gigatek
committed
Merge remote-tracking branch 'origin/Development_main' into Development_main
Gigatek
committed
Changed some spelling.
Gigatek
committed

Commits on Feb 13, 2015

Make sure allow damage is set to true on objects at restart.
Gigatek
committed
Team kill punish set to 1 kill.
Gigatek
committed
Changed some prices.
Gigatek
committed
Fix for team kill tweak.
Gigatek
committed

Commits on Feb 23, 2015

Money limits and removed titan compact lock
Gigatek
committed
Money limits and removed titan compact lock
Gigatek
committed
Tweaks
Gigatek
committed

Commits on Feb 24, 2015

Tweaks on Titan AT lock disable.
Gigatek
committed
Made pick lock only work with toolkit.
Gigatek
committed
Changed some spelling.
Gigatek
committed
Removed and replaced Titan AT compact with PCML on missions and ai.
Gigatek
committed

Commits on Feb 25, 2015

Reduced money on sunken treasure.
Gigatek
committed
Increased static resupply price.
Gigatek
committed

Commits on Mar 11, 2015

Possible fix for exploding vehicles when a player first gets in and removed player map icons when not in a group. This will affect UAVs and UGVs.
Gigatek
committed

Commits on Mar 12, 2015

Fixed Huron not saving, locking, or working with R3F and removed UAV and UGV auto buy lock.
Gigatek
committed
Tweak for group only icons and add UAV quad copters to group restrictions.
Gigatek
committed
Tweak for Huron fix.
Gigatek
committed
Added DLC's for all players.
Gigatek
committed
Oops
Gigatek
committed
Huron fix for DLC hack.
Gigatek
committed

Commits on Mar 18, 2015

Tweak for get in vehicle explosion fix.
Gigatek
committed

Commits on Mar 25, 2015

UAV resupply tweak.
Gigatek
committed

Commits on Mar 28, 2015

ATM dupe kludge.
Gigatek
committed
Revert 1.38 shake fix.
Gigatek
committed

Commits on Mar 29, 2015

Fix Repack exploit on incapacitated.
Gigatek
committed
Added sell vehicle to vehicle stores.
Gigatek
committed
Removed old sell vehicle points.
Gigatek
committed
Improved resupply.
Gigatek
committed
Tweaked main config and put max ATM money to $300,000.
Gigatek
committed

Commits on Apr 7, 2015

Merge remote-tracking branch 'ArmA3_Wasteland.Altis/Development_main' into Development_main
Gigatek
committed
Merge clean up.
Gigatek
committed
lil fix.
Gigatek
committed

Commits on Apr 8, 2015

lil fix.
Gigatek
committed
Added 50m object lock block to stores.
Gigatek
committed
Main config tweak.
Gigatek
committed
Marksmen update!
Gigatek
committed

Commits on Apr 9, 2015

Revert of improved spawning to prevent bugs.
Gigatek
committed

Commits on Apr 12, 2015

Tweak for get in vehicle explosion fix.
Gigatek
committed
Zafir LMG ammo fix.
Gigatek
committed
Vehicle store fix.
Gigatek
committed
Removed "Air" from A3W_fnc_setupAntiExplode.
Gigatek
committed
Removed UGV from A3W_fnc_setupAntiExplode.
Gigatek
committed

Commits on Apr 13, 2015

Revert and tweak of A3W_fnc_setupAntiExplode.
Gigatek
committed
Oops
Gigatek
committed
Manual merge to avoid conflicts.
Gigatek
committed
Merge fixes and minor fix attempt for player gear being reset after relogging.
Gigatek
committed
Merge fixes and minor fix attempt for player gear being reset after relogging.
Gigatek
committed

Commits on Apr 20, 2015

Merge remote-tracking branch 'ArmA3_Wasteland.Altis_main/Development_main' into Development_main
Gigatek
committed
Optimized UAV addon
Gigatek
committed
Removed static laser from save and tweaked store config.
Gigatek
committed

Commits on Apr 25, 2015

Revert of UAV addon.
Gigatek
committed

Commits on Apr 26, 2015

Commits on May 3, 2015

Merge remote-tracking branch 'ArmA3_Wasteland.Altis_main/Development_main' into Development_main
Gigatek
committed

Commits on May 6, 2015

Merge remote-tracking branch 'ArmA3_Wasteland.Altis_main/Development_main' into Development_main
Gigatek
committed
Fix for no font error for parking.
Gigatek
committed
JTS messenger 1.2 update.
Gigatek
committed
Added kill to FAR revive.
Gigatek
committed
Update FAR_revive_funcs.sqf
Gigatek1
committed

Commits on May 15, 2015

Added 20 more mission locations.
Gigatek
committed
Merge branch 'Development_main' of https://github.com/A3Armory/ArmA3_Wasteland.Altis into Development_main
Gigatek
committed
Added one more convoy route.
Gigatek
committed
Added 3 more missions.
Gigatek
committed
Quick fix for pull AI option on Darters.
Gigatek
committed
Temporary fix for bunny invasion.
Gigatek
committed
Added max spawn beacon and delete beacon.
Gigatek
committed
Tentative fix for unflip vehicle.
Gigatek
committed
Add fix for cctv camera's not lockable.
Gigatek
committed

Commits on May 16, 2015

Added cool down for town spawns.
Gigatek
committed
Remove UNCONSCIOUS players from friendly/enemy count.
Gigatek
committed
Another attempted fix for exploding vehicles.
Gigatek
committed
Fix for smuggler mission.
Gigatek
committed
Updated to latest UAV_Control.
Gigatek
committed

Commits on May 17, 2015

Enable spectator admin logging.
Gigatek
committed
Placed enableEnvironment option in player menu.
Gigatek
committed
Added more vehicle textures.
Gigatek
committed
Merge remote-tracking branch 'A3Wasteland/Development_main' into Development_main
Gigatek
committed
Fix.
Gigatek
committed

Commits on May 23, 2015

Added UID to spectate log.
Gigatek
committed
infiSTAR added.
Gigatek
committed

Commits on May 24, 2015

Updated admin panel.
Gigatek
committed
Fixes.
Gigatek
committed
Changed admin notified.
Gigatek
committed

Commits on May 26, 2015

Blinking hud fix caused by scripts.txt.
Gigatek
committed
Mission update and tweaks.
Gigatek
committed
Added remove money logging and tweaked missions.
Gigatek
committed

Commits on May 27, 2015

Update for FAR_Kill.
Gigatek
committed

Commits on May 31, 2015

Update for admin panel.
Gigatek
committed

Commits on Jun 1, 2015

AI and mission tweaks.
Gigatek
committed
Performance testing.
Gigatek
committed

Commits on Jun 2, 2015

Added R3F block to save actions.
Gigatek
committed
Removed military patrol.
Gigatek
committed

Commits on Jun 3, 2015

Removed military patrol. *Fix
Gigatek
committed

Commits on Jun 8, 2015

Mission description change.
Gigatek
committed
Merge remote-tracking branch 'A3Wasteland/Development_main' into Development_main
Gigatek
committed

Commits on Jun 10, 2015

Merge fixes.
Gigatek
committed
Merge fix.
Gigatek
committed
Added boxes to object load _allowDamage false.
Gigatek
committed
Fix.
Gigatek
committed

Commits on Jun 14, 2015

Made disable environment off by default.
Gigatek
committed

Commits on Jun 15, 2015

Fix.
Gigatek
committed

Commits on Jun 19, 2015

Server credits fix
Gigatek
committed

Commits on Jun 26, 2015

Added some jets back with limited weapons.
Gigatek
committed
Added some jets back with limited weapons. *Fix
Gigatek
committed
Reduced HE mortar ammo.
Gigatek
committed
Update fn_resupplytruck.sqf
Gigatek1
committed
Improved resupply and reduced HE mortar ammo fix.
Gigatek
committed
Oops.
Gigatek
committed
Update fn_resupplytruck.sqf
Gigatek1
committed
Removed addWeaponTurret because it wont save and add laser guided mortar rounds.
Gigatek
committed
Added A-143 Buzzard CAS.
Gigatek
committed
Change max view distance to 4000m for dogfights.
Gigatek
committed
Removed Titan AT compact lock block because of joystick bypass. Removed Titan_AT missile for compact launcher.
Gigatek
committed
Mortars now auto save when bought to avoid disassemble disappear bug. Store prices tweak.
Gigatek
committed
Mortars now auto save when bought to avoid disassemble disappear bug. *Fix
Gigatek
committed
Fix.
Gigatek
committed

Commits on Jun 30, 2015

Added hex orca and ind cas to weapon restrictions.
Gigatek
committed
Updated admin notify.
Gigatek
committed
Updated ind cas price.
Gigatek
committed
Fix O_Heli_Light_02_F weapon restriction for vehicle load.
Gigatek
committed
Update vFunctions.sqf
Gigatek1
committed
Expanded parking and storage. Reduced max wind speed.
Gigatek
committed
Expanded parking tweak.
Gigatek
committed
Added hex orca and ind cas to weapon restrictions. *Fix
Gigatek
committed
Map cleanup.
Gigatek
committed

Commits on Jul 1, 2015

Map cleanup, gun store warning fix.
Gigatek
committed
Update createGunStoreMarkers.sqf
Gigatek1
committed
Resupply fixes.
Gigatek
committed
Buzzard CAS tweaks.
Gigatek
committed

Commits on Jul 2, 2015

Renabled improved spawning.
Gigatek
committed
Update functions.sqf
Gigatek1
committed

Commits on Jul 9, 2015

Tweaks for weather and improved spawning.
Gigatek
committed
Tweaks for resupply.
Gigatek
committed
Tweaks for vehicle saving.
Gigatek
committed
Anti hack improvements.
Gigatek
committed
Block script injection exploit.
Gigatek
committed
Default config tweak.
Gigatek
committed
AH fix.
Gigatek
committed
Added new 1.2 vehicle textures.
Gigatek
committed

Commits on Jul 10, 2015

Added possibility to use external antihack payload.
Gigatek
committed
Added possibility to use external antihack payload.
Gigatek
committed
Changed weather.
Gigatek
committed

Commits on Jul 13, 2015

Blocking of global voice to push-to-talk keys.
Gigatek
committed
Fixed overlapping issues with HUD text.
Gigatek
committed
Fixed Ifrit rear-end not being painted.
Gigatek
committed
Added adjustable nightvision by xx-LSD-xx.
Gigatek
committed
Added adjustable nightvision by xx-LSD-xx.
Gigatek
committed
Fixed issue where landing on edge of step after jump caused death.
Gigatek
committed
Other minor fixes.
Gigatek
committed
Fixed anim issues when injured while weapon is deployed or rested.
Gigatek
committed
Changed allPlayers to fn_allPlayers due to command added in A3 v1.47.
Gigatek
committed
Changed allPlayers to fn_allPlayers due to command added in A3 v1.47. *Fix
Gigatek
committed
Added "A3W_survivalSystem" option.
Gigatek
committed
Modified store scripts to be able to read item names from config.
Gigatek
committed
Player hud fix.
Gigatek
committed

Commits on Jul 19, 2015

MagRepack A3W v1.2 version.
Gigatek
committed
MagRepack A3W 1.2 version.
Gigatek
committed
MagRepack A3W 1.2 version. *Fix
Gigatek
committed
MagRepack A3W 1.2 version. *Fix WTF Github
Gigatek
committed
Fix for TAW error.
Gigatek
committed
Fix for TAW error tweak
Gigatek
committed
Fix for cctv font error.
Gigatek
committed
Fix for cctv font error. *Fix
Gigatek
committed

Commits on Aug 2, 2015

Reduced max view distance to 3600m.
Gigatek1
committed
Reduced attack heli ammo a bit.
Gigatek1
committed
HUD flicker fix.
Gigatek1
committed
Fixed Sell button error in general store when no item is selected.
Gigatek1
committed
v1.2 release.
Gigatek1
committed
Reduced attack heli ammo a bit. *Fix
Gigatek1
committed

Commits on Oct 9, 2015

Hellcat fix
mooneymoon
committed