Commit Graph

3483 Commits

Author SHA1 Message Date
vbawol
c343541bb4 Merge pull request #1638 from seb3sec/patch-4
Remove hiddenSelections restrictions
2015-04-03 22:49:54 -05:00
vbawol
8d3239ad93 Merge pull request #1636 from Mikeeeyy/patch-15
Update Ammo.hpp
2015-04-03 22:49:25 -05:00
vbawol
444fd125d0 Merge pull request #1632 from seb3sec/patch-2
Fix for compile error "Item listed twice..."
2015-04-03 22:14:27 -05:00
vbawol
31c9f589af Merge pull request #1631 from seb3sec/patch-1
Fix for "Undefined base class" with FN FAL
2015-04-03 22:14:18 -05:00
vbawol
ff77466cbf Merge pull request #1640 from deannreid/patch-2
Edited change-log to add loading fix
2015-03-04 16:52:24 -06:00
[VB]AWOL
342072177c push test build of redryder pbo 2015-03-04 09:17:23 -06:00
vbawol
ccd98e3a4c Merge pull request #1643 from arma2WillRobinson/rrpatch2
RedRyder post-server testing fixes
2015-03-04 08:55:52 -06:00
armaWillRobinson
10003f4ebf update 2015-03-03 19:43:17 -08:00
armaWillRobinson
5d36d84cb2 prefix change 2015-03-02 18:19:13 -08:00
armaWillRobinson
c8ded9b38d patch 2015-03-02 18:07:17 -08:00
arma2WillRobinson
8e5ad427b8 Merge pull request #2 from vbawol/master
updating my git
2015-03-02 17:56:44 -08:00
arma2WillRobinson
ade7d3f36d Merge pull request #1 from arma2WillRobinson/patch5
Patch5
2015-03-02 17:15:18 -08:00
armaWillRobinson
b165cade29 update 2015-03-02 17:12:32 -08:00
Dean Reid
3451892dab Edited change-log to add loading fix
#1610
2015-02-23 16:34:18 +00:00
vbawol
420df74924 Merge pull request #1639 from arma2WillRobinson/patch4
RedRyder added missing files
2015-02-22 14:44:04 -06:00
armaWillRobinson
96c3471d11 updated 2015-02-21 12:28:53 -08:00
seb3sec
e8430a49c5 removed hiddenSelections definition 2015-02-21 02:56:25 +01:00
seb3sec
70f232e0ff remove hiddenSelection definition 2015-02-21 02:55:25 +01:00
seb3sec
49d702b6b8 Keep hiddenSelections for armed Mi17
hiddenSelections = {}; removes the option to use custom textures on the armed version. The civilian one has these hiddenSelections.
2015-02-21 02:33:05 +01:00
Mikeeeyy
2e8fb3bd17 Update Ammo.hpp 2015-02-19 21:16:34 +00:00
seb3sec
4ed8769e93 Fix for compile error "Item listed twice..."
The type attribute was defined twice for ItemHempPlant
2015-02-19 13:16:44 +01:00
seb3sec
5850efb0c6 Fix for "Undefined base class" with FN FAL 2015-02-19 12:21:52 +01:00
vbawol
86551302de Merge pull request #1626 from Mikeeeyy/patch-12
Fix rare occasion of gear not updating
2015-02-08 08:26:13 -06:00
Mikeeeyy
9623809d5b Update player_gearSync.sqf 2015-02-08 05:46:42 +00:00
vbawol
7fcb7ff657 Merge pull request #1610 from deannreid/patch-1
Fixed Black Screen on Loading
2015-02-06 09:31:05 -06:00
vbawol
d472450062 Merge pull request #1621 from ebaydayz/patch-7
[FIXED] Trader menu expected array error
2015-02-05 10:15:03 -06:00
vbawol
1c87cac11a Merge pull request #1620 from ebaydayz/patch-6
Fix trader menu expected array error
2015-02-05 10:14:55 -06:00
vbawol
0efa8ea37b Merge pull request #1619 from ebaydayz/patch-5
Fix trader menu expected array error
2015-02-05 10:14:48 -06:00
vbawol
cdb0399f19 Merge pull request #1618 from ebaydayz/patch-4
Fix trader menu expected array error
2015-02-05 10:14:37 -06:00
vbawol
a664da7b3e Merge pull request #1611 from Mikeeeyy/patch-9
Update server_updateObject.sqf
2015-02-05 10:12:02 -06:00
vbawol
172b9e21c7 Merge pull request #1615 from ebaydayz/patch-2
Update CHANGE LOG 1.0.5.2.txt
2015-02-05 10:10:27 -06:00
vbawol
23791fc1d8 Merge pull request #1614 from ebaydayz/patch-1
Compact mission.sqm port from DayZ Mod 1.8.3
2015-02-05 10:09:59 -06:00
ebaydayz
5b2949c33d [FIXED] Trader menu expected array error
[FIXED] Trader menu expected array error #1618-1620 @ebaydayz
2015-02-04 14:16:50 -05:00
ebaydayz
7151f6859f Fix trader menu expected array error
TraderItemList and TraderCatList should be initialized as arrays, not numbers. Fixes this error:
```
Error in expression < 0;
if (_index < 0) exitWith {};
while {count TraderItemList < 1} do { sleep 1; >
  Error position: <count TraderItemList < 1} do { sleep 1; >
  Error count: Type Number, expected Array,Config entry
File z\addons\dayz_code\compile\player_traderMenuHive.sqf, line 174
```
See: https://github.com/vbawol/DayZ-Epoch/issues/1616

Tested buying and selling to all the stary and base traders as well as the boat dealer with these changes. No more error or problems.
2015-02-04 14:13:08 -05:00
ebaydayz
3623b68112 Fix trader menu expected array error
TraderItemList and TraderCatList should be initialized as arrays, not numbers. Fixes this error:
```
Error in expression < 0;
if (_index < 0) exitWith {};
while {count TraderItemList < 1} do { sleep 1; >
  Error position: <count TraderItemList < 1} do { sleep 1; >
  Error count: Type Number, expected Array,Config entry
File z\addons\dayz_code\compile\player_traderMenuHive.sqf, line 174
```
See: https://github.com/vbawol/DayZ-Epoch/issues/1616

Tested buying and selling to all the stary and base traders as well as the boat dealer with these changes. No more error or problems.
2015-02-04 14:11:47 -05:00
ebaydayz
de4f50dad0 Fix trader menu expected array error
TraderItemList and TraderCatList should be initialized as arrays, not numbers. Fixes this error:
```
Error in expression < 0;
if (_index < 0) exitWith {};
while {count TraderItemList < 1} do { sleep 1; >
  Error position: <count TraderItemList < 1} do { sleep 1; >
  Error count: Type Number, expected Array,Config entry
File z\addons\dayz_code\compile\player_traderMenuHive.sqf, line 174
```
See: https://github.com/vbawol/DayZ-Epoch/issues/1616

Tested buying and selling to all Stary and Bash traders as well as the boat dealer with these changes. No more error or problems.
2015-02-04 14:09:16 -05:00
ebaydayz
13578d07ad Update CHANGE LOG 1.0.5.2.txt 2015-01-29 13:39:25 -05:00
ebaydayz
fd2eaaaa56 Update mission.sqm 2015-01-29 13:19:45 -05:00
ebaydayz
e3d57adbae Update mission.sqm 2015-01-29 13:19:21 -05:00
ebaydayz
720f50f443 Update mission.sqm 2015-01-29 13:18:54 -05:00
ebaydayz
ed575c818b Update mission.sqm 2015-01-29 13:18:16 -05:00
ebaydayz
dfb99cc867 Update mission.sqm 2015-01-29 13:17:40 -05:00
ebaydayz
737fd45f26 Update mission.sqm 2015-01-29 13:16:59 -05:00
ebaydayz
a1ae300b92 Update mission.sqm 2015-01-29 13:16:30 -05:00
ebaydayz
909ca991cd Update mission.sqm 2015-01-29 13:16:01 -05:00
ebaydayz
5d0b141b60 Update mission.sqm 2015-01-29 13:15:30 -05:00
ebaydayz
9ac6611ceb Update mission.sqm 2015-01-29 13:14:31 -05:00
ebaydayz
362fa9bbed Update mission.sqm 2015-01-29 13:14:02 -05:00
ebaydayz
d183859167 Update mission.sqm 2015-01-29 13:13:19 -05:00
ebaydayz
b204a23af6 Update mission.sqm 2015-01-29 13:12:50 -05:00