Commit Graph

3576 Commits

Author SHA1 Message Date
Wargog
1c839f47fd Fixed a ton of errors
Made it look nicer as well, separated some lines and vars and values.
2014-08-27 14:48:54 -04:00
vbawol
6f58a882aa Merge pull request #1544 from arma2WillRobinson/master
Corrected all Red Ryder paths
2014-08-27 11:04:58 -05:00
vbawol
727a2d211a Merge pull request #1551 from Uro1/master
Update CfgServerTrader to match #1508
2014-08-27 11:01:36 -05:00
Uro1
b3246ec80d Update CfgServerTraders to match #1508
Updated the CfgServerTrader to match my changes in dynamic_vehicles &
SQL changes.
2014-08-27 16:40:33 +01:00
githubmil
309655a89b Update NeutralAssaultRifle.hpp
Fixed typo making L85A2 Holo 90 gold to buy.
2014-08-26 04:08:10 -06:00
githubmil
7b6d565b54 Update FriendlyAssaultRifle.hpp 2014-08-26 04:06:15 -06:00
githubmil
ff5c55cc13 Update FriendlyAssaultRifle.hpp
Fixed typo making L85A2 Holo 90 gold to buy.
2014-08-26 04:01:01 -06:00
Beefheart
f3c0b582b4 Update player_onPause.sqf 2014-08-26 10:22:47 +02:00
githubmil
1015e8a206 Update hilux.hpp
Armor Upgrade balance
2014-08-26 01:32:11 -06:00
githubmil
9efd265a95 Update datsun.hpp
Armor Upgrade balance
2014-08-26 01:30:43 -06:00
githubmil
b65a0cd189 Update Volha.hpp
Armor Upgrade balance
2014-08-26 01:28:28 -06:00
githubmil
1ba1cc29eb Update VWGolf.hpp
Armor Upgrade balance
2014-08-26 01:26:04 -06:00
githubmil
7e020760ed Update UAZ.hpp
Cargo Upgrade fix, Armor Upgrade balance
2014-08-26 01:23:53 -06:00
githubmil
52ea5110f9 Update Skoda.hpp
Armor Upgrade balance
2014-08-26 01:20:54 -06:00
githubmil
d7b55d59af Update SUV.hpp
Balanced armor upgrade
2014-08-26 01:17:02 -06:00
githubmil
f4291a5b1f Update Pickup_PK.hpp 2014-08-26 01:11:39 -06:00
githubmil
753cc19e75 Update Offroad_DSHKM.hpp
Balanced armor
2014-08-26 01:09:04 -06:00
githubmil
106b05f1ef Update Lada.hpp
Balanced armor upgrade
2014-08-26 01:01:52 -06:00
githubmil
a607f77906 Update UAZ.hpp
Corrected pack upgrade to be consistent with other vehicle upgrades.
2014-08-25 21:16:58 -06:00
raymix
efca644b46 fix for db ATL limitation 2014-08-23 19:02:49 +01:00
Uro1
9984923462 Merge pull request #13 from vbawol/master
merge
2014-08-22 20:56:27 +01:00
arma2WillRobinson
e35e5e326b Update config.cpp 2014-08-22 10:34:51 -07:00
Beefheart
9cdae44069 Update player_onPause.sqf
fixes players logging out in selfmade no-building-zones
2014-08-22 08:31:33 +02:00
raymix
903f5d8572 code optimization, bugs, improvements 2014-08-21 06:23:42 +01:00
deadeye2
5b4d53d3b9 Update player_drink.sqf
eliminate redundant declaring of _itemtodrop and change to match player_eat.sqf
2014-08-20 19:58:43 -04:00
deadeye2
e4982dc313 fixes #1535
After eating in a vehicle that should drop an empty can, client RPT would show:

Error Undefined variable in expression: _itemtodrop
2014-08-20 19:41:06 -04:00
vbawol
740f4144f1 Merge pull request #1534 from raymix/master
updated stringtable compatibility with modular build
2014-08-18 00:59:52 -05:00
raymix
1c4be9a043 Merge remote-tracking branch 'upstream/master' 2014-08-18 04:08:14 +01:00
raymix
34a2d03163 compatibility for issue 1526 45m plotpole 2014-08-18 04:03:11 +01:00
vbawol
2542d94c21 Merge pull request #1531 from McKeighan/patch-10
Update UAZ.hpp
2014-08-17 14:04:00 -05:00
vbawol
a8a0e0ca5c Merge pull request #1532 from McKeighan/patch-11
Update Volha.hpp
2014-08-17 14:03:31 -05:00
vbawol
fe5af9425a Merge pull request #1526 from Mikeeeyy/patch-4
Update cannot build plot pole within 45m.
2014-08-17 14:02:09 -05:00
vbawol
ac07359c80 Merge pull request #1525 from Mikeeeyy/patch-3
Update cannot build plot pole within 45m.
2014-08-17 14:02:03 -05:00
Uro1
dccbb19131 Merge pull request #12 from vbawol/master
merge
2014-08-15 22:51:54 +01:00
McKeighan
1bdd96cd88 Update Volha.hpp
added armor damage resistance on upgrade.
2014-08-15 13:39:06 -04:00
McKeighan
5bb15f0c66 Update UAZ.hpp
Armor of only 50 on the upgrade seemed light since it's baseline is 40. The normal ratio of armor increase is X 2.5, so this has been applied to the 40.  (results in 100 armor).  Added damage resistance to the armor to increase it's effectiveness.
2014-08-15 13:36:47 -04:00
vbawol
a6f55498b7 Merge pull request #1528 from raymix/master
modular build code optimization + some extras
2014-08-15 01:52:04 -05:00
raymix
c66b229a96 modular build code optimization + some extras 2014-08-15 05:40:26 +01:00
Mikeeeyy
49fe5f4846 Update cannot build plot pole within 45m.
Updates the cannot build plot pole within 45m message to use the DZE_PlotPole variable.
2014-08-15 00:10:24 +01:00
Mikeeeyy
5ae7f920dd Update cannot build plot pole within 45m.
Updates the cannot build plot pole within 45m message to use the DZE_PlotPole variable.
2014-08-15 00:08:21 +01:00
vbawol
59124e6eef Merge pull request #1523 from Legodev/master
added Items for a simple Plantingsystem
2014-08-14 12:20:58 -05:00
vbawol
8192dd7b50 Merge pull request #1519 from McKeighan/patch-7
Update Offroad_DSHKM.hpp
2014-08-14 12:09:57 -05:00
vbawol
8bd438f4c6 Merge pull request #1515 from McKeighan/patch-3
Update AH6.hpp
2014-08-14 12:08:06 -05:00
vbawol
ba6a5c7dc1 Merge pull request #1513 from McKeighan/patch-1
Update cfgVehicles.hpp
2014-08-14 12:06:59 -05:00
vbawol
c7b400f36a Merge pull request #1524 from Mikeeeyy/patch-2
Fix Maintain Area/Preview not disappearing
2014-08-14 12:06:31 -05:00
vbawol
d8841474c6 Merge pull request #1521 from SJossy/patch-3
Update fn_damageActions.sqf
2014-08-14 12:05:27 -05:00
vbawol
ef0a157eb2 Merge pull request #1512 from raymix/master
minor range adjustments
2014-08-14 12:01:52 -05:00
vbawol
a0372bc88d Merge pull request #1509 from SJossy/patch-2
Update server_functions.sqf
2014-08-14 12:01:34 -05:00
Mikeeeyy
3e42af0bb4 Fix Maintain Area/Preview not disappearing
When players would look at a plot pole, they would get the maintain/preview option and if they looked away they would still have it.
2014-08-13 14:10:43 +01:00
Legodev
688c1f15b6 added Items for a simple Plantingsystem 2014-08-13 00:18:35 +02:00