Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

d #92

Open
wants to merge 775 commits into
base: Development_main
Choose a base branch
from
Open

d #92

wants to merge 775 commits into from

Conversation

tonnic
Copy link

@tonnic tonnic commented May 23, 2015

No description provided.

micovery and others added 30 commits January 21, 2015 21:25
Refine the boomerang player/vehicle interactions
e8e0be8
Add configs for boomerang
88da826 
Also add extra controls
Shift + M to cycle the sound modes (muted, beep, voice)
Ctrl + E to exit the system
Enable LCD on boomerang
c2abc6f
Enable saving of boomerang devices
53e88ce
Remove fired near event handler after closing hud
da09015
Merge pull request #79 from micovery/Development_main_addons+Boomerang
525563f 
Development main addons+boomerang
Forgot to remove extra debug log call
b390a74
Merge remote-tracking branch 'upstream/Development_main' into Develop…
2bdde5a 
…ment_main

Conflicts:
	client/functions/firstSpawn.sqf
	persistence/server/players/default/getPlayerFlag.sqf
	persistence/server/setup/default/fn_inidb_custom.sqf
	persistence/server/world/default/getObjects.sqf
	persistence/server/world/default/getVehicles.sqf
	persistence/server/world/default/saveObject.sqf
	persistence/server/world/default/saveVehicle.sqf
	persistence/server/world/extDB/saveObject.sqf
	persistence/server/world/extDB/saveVehicle.sqf
	persistence/server/world/oSave.sqf
	server/functions/spawnStoreObject.sqf
	server/init.sqf
Merge branch 'Development_main' into Development_main_addons
df006ff
Merge remote-tracking branch 'upstream/Development_main_addons' into …
d9de6c4 
…Development_main

Conflicts:
	description.ext
	stringtable.xml
Updated boomerang config.
c873f14
Reduced falling and vehicle collision player damage.
d89269a
Removed one repair kit and nvg. Added 3 chem lights.
84b4d8c
Added UAVs to towing.
d1bb9b6
Added UAVs and UGVs to saved vehicles.
df42f45
Added TS address to server credits.
eb77678
Revamp resupply to work with UAVs, and Statics
f0f4185
Only remove the resupply action
2f4e675
Add the vehicle name to the resupply action
bb60234
Restrict resupply to driver/gunner
e74011f 
Also eject the gunner when resupply is about to start
Possible 1.38 shake fix.
4038f07
Hack to prevent UAVs from blowing up
0af5c51
Merge branch 'Development_main' of https://github.com/A3Armory/ArmA3_…
51fc0f1 
…Wasteland.Altis into Development_main
Resupply only 2 missiles to UAVs.
fa1ad16
Enabled thermal equipment on loaded vehicles for UAVs and UGVs
21273df
Updated locked vehicles.
32d6d40
More reliable fix for UAV explosions
cc7cbcd
Updated sell vehicles.
008de48
Updated sell vehicles.
c16bce9
Merge remote-tracking branch 'upstream/Development_main' into Develop…
54512dc 
…ment_main

Conflicts:
	persistence/server/world/default/postObjectSave.sqf
	persistence/server/world/default/postVehicleSave.sqf
	persistence/server/world/extDB/postObjectSave.sqf
	persistence/server/world/extDB/saveObject.sqf
	persistence/server/world/extDB/saveVehicle.sqf
	persistence/server/world/oLoad.sqf
	persistence/server/world/oSave.sqf
	persistence/server/world/vLoad.sqf
	server/init.sqf
Gigatek and others added 29 commits July 10, 2015 12:30
Changed weather.
16c5604
Blocking of global voice to push-to-talk keys.
01d0ce8 
Thanks AgentRev
Fixed overlapping issues with HUD text.
25c1b73 
Thanks AgentRev
Fixed Ifrit rear-end not being painted.
22798cb 
Thanks AgentRev
Added adjustable nightvision by xx-LSD-xx.
1421880 
Thanks AgentRev
Added adjustable nightvision by xx-LSD-xx.
c41bf2c 
Thanks AgentRev
Fixed issue where landing on edge of step after jump caused death.
4626d8e 
Thanks AgentRev
Other minor fixes.
f88d0f1 
Thanks AgentRev
Fixed anim issues when injured while weapon is deployed or rested.
cd766e1 
Thanks AgentRev
Changed allPlayers to fn_allPlayers due to command added in A3 v1.47.
af2b1d1 
Thanks AgentRev
Changed allPlayers to fn_allPlayers due to command added in A3 v1.47.…
aa13a32 
… *Fix

Thanks AgentRev
Added "A3W_survivalSystem" option.
b7bcb87 
Thanks AgentRev
Modified store scripts to be able to read item names from config.
adcad97 
Thanks AgentRev
Player hud fix.
c3a266a
MagRepack A3W v1.2 version.
d69b7ce 
Thanks AgentRev
MagRepack A3W 1.2 version.
c051939 
Thanks AgentRev
MagRepack A3W 1.2 version. *Fix
7d60e9a 
Thanks AgentRev
MagRepack A3W 1.2 version. *Fix WTF Github
d7bc1c0 
Thanks AgentRev
Fix for TAW error.
b73da18
Fix for TAW error tweak
7b3dbb4
Fix for cctv font error.
dfa0f22
Fix for cctv font error. *Fix
21812de
Reduced max view distance to 3600m.
e018ae7
Reduced attack heli ammo a bit.
4295fbc
HUD flicker fix.
9e0a618 
Thanks AgentRev
Fixed Sell button error in general store when no item is selected.
62d6d8f 
Thanks AgentRev
v1.2 release.
e95dd5a 
Thanks AgentRev
Reduced attack heli ammo a bit. *Fix
2e76b58
@mooneymoon
Hellcat fix
887cfaf 
Add carrying capacity to unarmed and armed hellcats
@codexGW codexGW deleted the Development_main branch January 14, 2016 12:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@tonnic @mooneymoon