Commit Graph

1171 Commits

Author SHA1 Message Date
He-Man
c6a1da84d0 Fix for Weaponholder disappear to fast
Empty WH disappear after 1 second.
If filling of WH takes longer than 1s, the WH disappears. This fix let
the Server create the WH, if objnull
2017-04-23 18:52:36 +02:00
vbawol
46a5d37026 0.5 b755 2017-04-22 10:25:14 -05:00
vbawol
c76e8bdb36 update private array 2017-04-22 09:29:59 -05:00
vbawol
5f08b41d0e Merge pull request #748 from Ignatz-HeMan/experimental
Fixed / updated and added Trader Missions
2017-04-22 07:24:52 -07:00
He-Man
eede62bd38 Fixed / updated and added Trader Missions
Ported to run it on Events instead fsm
2017-04-21 19:03:58 +02:00
vbawol
e098a78b4f move be folder back to fix case 2017-04-20 07:47:42 -05:00
vbawol
10f127fc27 move be folder to fix case 2017-04-20 07:47:13 -05:00
vbawol
b5584ffbfe fixed #747 2017-04-18 15:35:41 -05:00
vbawol
3317b8f25d 0.5 b754 2017-04-18 14:27:04 -05:00
vbawol
fe3c464472 fixed missing semicolons 2017-04-18 14:21:25 -05:00
vbawol
a5ec2fd78f Merge pull request #745 from Ignatz-HeMan/patch-7
Added "MeleeRod" (Fishing Rod) to Crafting Menu
2017-04-18 08:24:36 -07:00
He-Man
de4f703e23 Added "MeleeRod" (Fishing Rod) to Crafting Menu
1x Rope
1x Stick
1x Metal Scraps
2017-04-18 17:07:13 +02:00
vbawol
bb30ff9d63 Updated Jenkinsfile 2017-04-18 07:29:43 -07:00
vbawol
21c797c39b 0.5 b753 2017-04-17 12:07:29 -05:00
vbawol
c7c6342cd4 fixed BE kick from CBA 2017-04-17 12:07:08 -05:00
vbawol
0ed023c89d fixes for towing tractor from CUP 2017-04-17 11:48:21 -05:00
vbawol
4382aef326 Merge pull request #744 from EpochModTeam/release
sync changes from release to experimental
2017-04-17 09:21:44 -07:00
vbawol
2cdcf1c418 Merge pull request #740 from morgoth0/patch-3
Force enablesimulation on gates
2017-04-17 09:19:15 -07:00
vbawol
d77fb154ed Merge pull request #741 from morgoth0/patch-4
Force enablesimulation on gates
2017-04-17 09:19:09 -07:00
vbawol
586b6018f1 Merge pull request #742 from morgoth0/patch-5
Force enablesimulation on gates
2017-04-17 09:19:01 -07:00
vbawol
f88ab84b30 Merge pull request #743 from Ignatz-HeMan/patch-6
Fix if only HitPointDamage > 0
2017-04-17 09:18:44 -07:00
vbawol
662c401d84 Merge pull request #739 from morgoth0/patch-2
Force enablesimulation on bargates
2017-04-17 09:17:22 -07:00
vbawol
cf85710a57 Merge pull request #738 from morgoth0/patch-1
Force enablesimulation on Land_BarGate_F
2017-04-17 09:17:00 -07:00
vbawol
9214249f3f Fixing more BE kicks from cup weapons
Lee Enfield / M4A03
2017-04-16 15:22:59 -05:00
vbawol
e5ba3a9006 Fixes for CUP weapon attachment BE kicks 2017-04-16 09:48:57 -05:00
vbawol
6600844a4b further optimized db call for weather script 2017-04-12 10:16:23 -05:00
vbawol
af56e4b89a update privates
since this is execVM'ed it is not really needed but done just in case
the code is compiled call'ed at a later time.
2017-04-12 09:57:55 -05:00
vbawol
91e70e21d9 fix static weather 2017-04-12 09:46:31 -05:00
vbawol
6d8a05c775 more CBA related kick fixes 2017-04-11 15:11:49 -05:00
vbawol
1fd690a43c 0.5 b752 2017-04-11 14:50:28 -05:00
vbawol
63f30be405 fix some BE kicks with newer CBA 2017-04-11 14:50:01 -05:00
vbawol
321854124b Updated Jenkinsfile 2017-04-10 13:21:24 -07:00
vbawol
ab6ab6e175 Updated Jenkinsfile 2017-04-10 08:44:53 -07:00
vbawol
14d8fbe379 Updated Jenkinsfile 2017-04-10 08:24:09 -07:00
vbawol
1c95d07d96 Updated Jenkinsfile 2017-04-10 08:18:07 -07:00
vbawol
aa7696f7b8 Updated Jenkinsfile 2017-04-10 08:08:46 -07:00
He-Man
b2fbd6ef91 Fix if only HitPointDamage > 0
Important, when using SafeZones with VehicleGodmode and only HitPoint is damaged.
2017-04-10 16:38:54 +02:00
Grahame
e7b377383c Force enablesimulation on gates 2017-04-10 09:24:28 -04:00
Grahame
0a9843e3da Force enablesimulation on gates 2017-04-10 09:23:06 -04:00
Grahame
4f0973155f Force enablesimulation on gates 2017-04-10 09:21:32 -04:00
Grahame
941cdae08b Force enablesimulation on bargates 2017-04-10 09:19:42 -04:00
Grahame
ef600d3536 Force enablesimulation on Land_BarGate_F 2017-04-10 09:10:13 -04:00
vbawol
d8f58c0a03 Merge pull request #736 from Ignatz-HeMan/patch-5
Removed redundant checks
2017-04-09 18:25:06 -07:00
He-Man
f1a3d46c64 Removed redundant checks 2017-04-10 00:10:07 +02:00
vbawol
e3a94eaeb8 0.5 b751 2017-04-09 17:08:16 -05:00
vbawol
85096a977d Updated Jenkinsfile 2017-04-09 13:59:47 -07:00
vbawol
acc341666b Merge pull request #735 from Ignatz-HeMan/patch-3
Fixed Heal not working, if only hitpoint damaged
2017-04-09 13:55:44 -07:00
vbawol
09addef078 test 2017-04-09 13:21:59 -07:00
vbawol
e680d32d12 test 2017-04-09 13:15:32 -07:00
vbawol
6c42192724 Merge pull request #734 from Ignatz-HeMan/patch-2
Fix for create / leave Group
2017-04-09 12:55:28 -07:00