Commit Graph

2028 Commits

Author SHA1 Message Date
vbawol
21098f9b73 Merge pull request #1556 from raginruffalo/patch-3
Should fix #1555
2015-01-18 00:33:10 -06:00
vbawol
211a74a645 Merge pull request #1540 from deadeye2/patch-2
Update player_drink.sqf
2015-01-18 00:32:38 -06:00
vbawol
a5e8aae13b Merge pull request #1539 from deadeye2/patch-1
undefined variable _itemtodrop     fixes #1535
2015-01-18 00:31:54 -06:00
Mikeeeyy
4ad1a72db2 Update server_updateObject.sqf 2015-01-18 04:28:04 +00:00
Skaronator.com
2f196bb146 Include FN_FAL_ANPVS4 #1587 2014-11-22 22:40:54 +01:00
Skaronator.com
aedaf4a558 Fix Typo 2014-11-22 22:40:18 +01:00
Skaronator.com
62b711ecd8 Fix typo 2014-11-09 18:00:33 +01:00
vbawol
b0ae579875 Update spawn_loot_small.sqf 2014-09-22 13:23:56 -05:00
Wargog
0c3173826e Done, pull please. 2014-09-03 09:40:36 -04:00
Wargog
1c2511bc55 Maybe? 2014-08-30 12:24:02 -04:00
Wargog
5a54f26c4d I didn't do that 2014-08-30 12:20:54 -04:00
raymix
d59c5b8278 rare bug 2014-08-30 12:55:58 +01:00
Wargog
6bddf7513e Fixed AWOL's pointer 2014-08-28 14:17:43 -04:00
Wargog
064d50778a Should fix #1555 2014-08-28 13:59:22 -04:00
vbawol
b7e2462188 Merge pull request #1552 from raginruffalo/patch-3
Fixed a ton of errors
2014-08-28 11:03:10 -05:00
vbawol
d52eb620e6 Merge pull request #1541 from raymix/master
code optimization, bugs, improvements
2014-08-28 00:28:20 -05:00
vbawol
9762dad8ee Merge pull request #1543 from Beefheart/master
Update player_onPause.sqf
2014-08-28 00:28:09 -05:00
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
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
Beefheart
f3c0b582b4 Update player_onPause.sqf 2014-08-26 10:22:47 +02:00
raymix
efca644b46 fix for db ATL limitation 2014-08-23 19:02:49 +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
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
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
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
vbawol
ca37210345 Merge pull request #1511 from Markokil321/patch-5
Update player_goFishing.sqf
2014-08-10 23:47:49 -05:00
vbawol
29adecc2e9 Merge pull request #1510 from Markokil321/patch-4
Add "Cannot fish while in combat"  text
2014-08-10 23:47:36 -05:00