Commit Graph

9135 Commits

Author SHA1 Message Date
f1797feead Make wound assignment consistent for dll/sqf
Dll now exits on first match for threshold damage (exitWith)
Remove random wound in sqf to match dll
Fix backblast threshold order
Add lower vehiclecrash threshold
Add dll version logging
2016-02-16 12:19:18 -06:00
9c67710bf3 Merge pull request #3324 from acemod/makeChangesForCI
change make.py to accept --ci arg
2016-02-16 17:47:52 +01:00
d9dd5ba755 Merge pull request #3325 from acemod/fixfakeriflein3den
remove ace fake weapon from 3den cargo editor
2016-02-16 16:29:36 +01:00
1bc73af1c9 remove ace fake weapon from 3den cargo editor 2016-02-16 16:11:18 +01:00
067f88ff42 change make.py to accept --ci arg 2016-02-16 15:46:10 +01:00
8ec7063206 add proper exit code when build is failing 2016-02-16 13:44:43 +01:00
245a9d43d1 fix - args being recognized as modules 2016-02-16 13:26:47 +01:00
dacb5e1748 add --ci switch to make.py
to signal the end of the process to an automated build
2016-02-16 13:14:28 +01:00
5c9dfd7dc5 Handle enemy causing veh explode, fix revive unload
Fix #3269
2016-02-15 22:23:37 -06:00
9441b548be Fix vehicle crashes not being fatal to non-drivers
Fix #3306
2016-02-15 17:11:04 -06:00
d88f10b8e0 Merge pull request #3318 from acemod/restricMagPass
Don't allow passing mags when not in same veh
2016-02-15 11:41:18 -06:00
4a8b032c1f Don't allow passing mags when not in same veh 2016-02-14 14:53:04 -06:00
985af4502c Merge pull request #3313 from ivankrouglyi/patch-1
Update fnc_treatment_success.sqf
2016-02-14 13:27:08 -06:00
74d410688f Add check so vanilla magazines can't be unloaded 2016-02-14 14:10:28 +01:00
560c509a3a Changed to using playerVehicleChanged. 2016-02-14 13:51:44 +01:00
ff86359247 Merge branch 'master' into medical-focus-feature 2016-02-13 19:51:45 +01:00
7bbdcbc054 Merge pull request #3280 from acemod/unifiedFiredEH
Unified fired event handler
2016-02-13 15:13:18 -03:00
e2ed38609d Replace driver by effectivCommander on EFUNC(common,getGunner) and EFUNC(common,firedEH) 2016-02-13 15:04:43 -03:00
0a226b5ee9 Update fnc_treatment_success.sqf
Error at 84 line - you forget ";"
2016-02-13 03:29:42 +03:00
54b350a6c0 Only get passenger actions for selected unit
Fix #1690 #3309
2016-02-12 15:57:16 -06:00
17cba965c3 Deactivate laser_sefldesignate on Comanche 2016-02-11 20:27:46 +01:00
c38b028c3a Fixing driver gun
Magazines from driver gun don't get removed
2016-02-11 19:06:37 +01:00
9619fc7fb5 Changes to DAGR
Allow laserLock, set weaponLockSystem to Laser and move class ADDON to
ACE_Hydra70_DAGR
2016-02-11 16:39:53 +01:00
0df06ea4c1 Merge pull request #3299 from acemod/staticsLodHack
Manually pre-load for StaticWeapons and Car
2016-02-11 16:04:31 +01:00
ff4ba98e68 Pre-load again on mission load (save game) 2016-02-10 11:50:30 -06:00
5577a1b4bb Merge pull request #31 from licht-im-Norden87/patch-42
trenches
2016-02-10 18:15:14 +01:00
4fb705e0f9 Update stringtable.xml
Eigentlich ist Graben ja das falsche Wort, da es in Arma gar nicht möglich ist in die Tiefe zu graben....
2016-02-10 18:14:51 +01:00
020deb4407 Update stringtable.xml 2016-02-10 18:14:03 +01:00
adbfa378b1 Update stringtable.xml 2016-02-10 18:12:36 +01:00
a5597ade89 Merge pull request #30 from licht-im-Norden87/patch-41
spectator
2016-02-10 18:06:13 +01:00
e8a35f3c20 spectator
Bitte einmal z. 259,268,377 überprüfen!
2016-02-10 18:05:51 +01:00
0c268b90dc Merge pull request #29 from licht-im-Norden87/patch-39
overheating
2016-02-10 17:35:56 +01:00
9419e7daf3 overheating 2016-02-10 17:35:36 +01:00
7bed10d14b Merge pull request #28 from licht-im-Norden87/patch-38
optionsmenu
2016-02-10 17:32:32 +01:00
51b57b962b Update stringtable.xml 2016-02-10 17:32:19 +01:00
cabbc4b6a9 optionsmenu 2016-02-10 17:31:26 +01:00
c663feed49 Merge pull request #27 from licht-im-Norden87/patch-37
nightvision
2016-02-10 17:26:23 +01:00
864ae484d4 nightvision 2016-02-10 17:26:08 +01:00
b352b9b024 Merge pull request #26 from licht-im-Norden87/patch-36
captives
2016-02-10 17:20:13 +01:00
39e26b0f11 captives 2016-02-10 17:19:42 +01:00
ffb3367a50 Merge pull request #25 from licht-im-Norden87/patch-35
common
2016-02-10 17:17:47 +01:00
b9083f1712 common 2016-02-10 17:17:26 +01:00
c806bfb721 Merge pull request #24 from licht-im-Norden87/patch-34
flashlight
2016-02-10 17:14:37 +01:00
d52c6cb984 flashlight 2016-02-10 17:13:52 +01:00
a725553a95 commy2 2016-02-10 17:11:24 +01:00
b617dee302 Merge pull request #23 from licht-im-Norden87/patch-33
cargo
2016-02-10 17:09:05 +01:00
b1990b1586 Update stringtable.xml 2016-02-10 17:08:48 +01:00
3583e95e1f cargo 2016-02-10 17:07:05 +01:00
35b0b11fff Merge pull request #22 from licht-im-Norden87/patch-32
Gestures
2016-02-10 17:03:21 +01:00
6481a0fbb8 Gestures 2016-02-10 17:02:54 +01:00