Thomas Kooi
|
911cba81b7
|
Merge pull request #3347 from GitHawk/refuel_removedTruck
Handling disconnect and removal of fuel truck
|
2016-02-20 17:24:32 +01:00 |
|
Thomas Kooi
|
ff7dbfa9f2
|
Merge pull request #3305 from GitHawk/dagr_fix
Disable ACE_Laser for choppers (aka Changes to DAGR)
|
2016-02-20 17:17:46 +01:00 |
|
Thomas Kooi
|
6048d15847
|
Merge pull request #3290 from acemod/nametagsOptimization
Nametags optimization
|
2016-02-20 17:15:01 +01:00 |
|
Thomas Kooi
|
14b526d417
|
Merge pull request #3272 from acemod/deadmanBombVest
Deadman switch - trigger explosives in inventory
|
2016-02-20 17:11:06 +01:00 |
|
PabstMirror
|
918413030b
|
Short Circuit Tagging
|
2016-02-20 10:08:41 -06:00 |
|
Thomas Kooi
|
427b14e3ba
|
Merge pull request #3245 from GitHawk/rearm_fix
Fixing setVehicleAmmo for rearm
|
2016-02-20 17:08:37 +01:00 |
|
Thomas Kooi
|
8055eae580
|
Merge pull request #3210 from acemod/taggingX
Tagging X
|
2016-02-20 17:05:02 +01:00 |
|
Thomas Kooi
|
8d12f1cc08
|
Merge pull request #3130 from acemod/ab-subsonicAmmo
AB - Handle subsonic ammo when configs not defined
|
2016-02-20 17:01:22 +01:00 |
|
bux578
|
76bacf184d
|
Merge pull request #2237 from gienkov/patch-29
Make reserve steerable
|
2016-02-20 17:00:51 +01:00 |
|
Thomas Kooi
|
2e47cb5b40
|
Merge pull request #3079 from jonpas/tacticalLadderFixes
Prevent Tactical Ladder interaction if unit on ladder
|
2016-02-20 16:59:23 +01:00 |
|
Thomas Kooi
|
1e3596b92a
|
Merge pull request #3043 from acemod/Mortar_interact
Mortar interaction and ammunition handling
|
2016-02-20 16:57:55 +01:00 |
|
Thomas Kooi
|
4f10d551d6
|
Merge pull request #2949 from gienkov/fixWoundCount
ceil number of wounds
|
2016-02-20 16:56:17 +01:00 |
|
Thomas Kooi
|
27c6934ff2
|
Merge pull request #2230 from SzwedzikPL/interactions_lamps
Interaction with portable lamps
|
2016-02-20 16:47:28 +01:00 |
|
Thomas Kooi
|
fbcfbb92a6
|
Merge pull request #3346 from acemod/betterFlashEffects
Better flash effects
|
2016-02-20 10:22:57 +01:00 |
|
PabstMirror
|
fc3bb0de6b
|
Fix #3355 - add missing semi-colons
|
2016-02-19 18:51:25 -06:00 |
|
PabstMirror
|
488d24bc01
|
Fix cargo loading on the big huron containers
|
2016-02-19 15:30:23 -06:00 |
|
PabstMirror
|
ed653456e5
|
Merge pull request #3338 from acemod/translations156merge
Fix Merge Conflicts on More Italian Translations
|
2016-02-19 15:09:40 -06:00 |
|
esteldunedain
|
f2566afc73
|
Another 5m of effect
|
2016-02-19 15:22:24 -03:00 |
|
bux578
|
d601e50b15
|
Merge pull request #3350 from gienkov/patch-2
medical PL translation
|
2016-02-19 19:21:15 +01:00 |
|
Grzegorz
|
95250c8ecd
|
medical PL translation
3.5.0 ready
|
2016-02-19 19:10:59 +01:00 |
|
Grzegorz
|
99e24aab6d
|
frag PL translation
3.5.0 ready
|
2016-02-19 19:07:00 +01:00 |
|
Githawk
|
5b908b4be8
|
Adding disconnect EH
|
2016-02-19 17:32:02 +01:00 |
|
Githawk
|
e925c48798
|
Adding HandleDisconnect EH and deletion of fuel truck
|
2016-02-19 17:24:32 +01:00 |
|
esteldunedain
|
b420512139
|
Fix reduction based on looking away from the grenade
|
2016-02-19 12:34:50 -03:00 |
|
esteldunedain
|
9e5f52d161
|
Make units heavily affected by the blast turn away from the light.
|
2016-02-19 12:33:49 -03:00 |
|
esteldunedain
|
0f7853f6c6
|
Increase the maximum range for blinding effect to 25m, but with a high falloff. Close #1539
|
2016-02-19 12:18:22 -03:00 |
|
esteldunedain
|
648a0259ec
|
Improve flashbang effects. Make sure the light effect is rendered even if the grenade explodes further than 20m from the player. Increase the amount of hearing damage.
|
2016-02-19 12:02:29 -03:00 |
|
Thomas Kooi
|
95532ea521
|
Merge pull request #3333 from acemod/medicalEvents
Replace execRemoteFnc in ace_medical
|
2016-02-19 12:00:00 +01:00 |
|
commy2
|
08e09d5cbd
|
manual merge
|
2016-02-19 11:50:17 +01:00 |
|
commy2
|
97008d8fc3
|
Merge pull request #3131 from acemod/removedep
remove deprecated functions
|
2016-02-19 11:48:20 +01:00 |
|
commy2
|
5d0d8576ea
|
Merge pull request #3288 from SzwedzikPL/edenassignsettings
Repair & medical object attributes for eden editor
|
2016-02-19 11:47:26 +01:00 |
|
PabstMirror
|
d2a3f35c80
|
Fix deleted czech strings from merge
|
2016-02-18 13:39:14 -06:00 |
|
bux
|
49f565f541
|
fix merging errors
|
2016-02-18 20:05:30 +01:00 |
|
ViperMaul
|
14c5558bbf
|
Merge branch 'master' of https://github.com/acemod/ACE3
|
2016-02-18 10:50:52 -08:00 |
|
ViperMaul
|
52b3f1e219
|
Bump version to 3.4.3
|
2016-02-18 10:50:33 -08:00 |
|
bux578
|
93e655588b
|
Merge pull request #3294 from gienkov/pltranslations
pl translation
|
2016-02-18 19:38:43 +01:00 |
|
esteldunedain
|
87dd607901
|
Add a category name to frag settings
|
2016-02-18 12:28:00 -03:00 |
|
esteldunedain
|
a8131f597a
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into reflectionsDefaultOff
|
2016-02-18 12:18:51 -03:00 |
|
commy2
|
50b04d937b
|
Merge pull request #3278 from acemod/removeragdolls
remove old ragdoll tweaks
|
2016-02-18 14:46:21 +01:00 |
|
commy2
|
cf4f47160f
|
Merge pull request #3275 from acemod/realnamebadger
correct name for wheeled apc 01 cannon
|
2016-02-18 14:44:24 +01:00 |
|
commy2
|
be8f7f9cc0
|
Merge pull request #3276 from acemod/156selectapply
replace filter and map with select and apply
|
2016-02-18 14:23:02 +01:00 |
|
esteldunedain
|
88eae19646
|
Replace execRemoteFnc in ace_medical
|
2016-02-17 22:54:43 -03:00 |
|
PabstMirror
|
be742c13cd
|
Merge branch 'master' into 155selectRandom
|
2016-02-17 15:58:19 -06:00 |
|
PabstMirror
|
c456e1a631
|
Merge pull request #3214 from acemod/cba23
Changes for CBA 2.3
|
2016-02-17 15:33:42 -06:00 |
|
PabstMirror
|
53d870b62a
|
Merge pull request #3312 from acemod/passengerInteraction
Only get passenger actions for selected unit
|
2016-02-17 15:33:29 -06:00 |
|
PabstMirror
|
77f5aebf73
|
Merge pull request #3282 from acemod/eventLocationHash
Use location hash for ace events
|
2016-02-17 15:32:50 -06:00 |
|
Thomas Kooi
|
a8846e92ee
|
Merge pull request #2954 from gienkov/nozzleLogic
nozzle additonal check condition
|
2016-02-17 21:26:04 +01:00 |
|
PabstMirror
|
dccc1d33fd
|
Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge
|
2016-02-17 12:30:03 -06:00 |
|
Thomas Kooi
|
e31e20bd42
|
Merge pull request #3293 from acemod/fix3270
Slightly reduce the distance for which the LOS check is skipped.
|
2016-02-17 18:39:39 +01:00 |
|
Thomas Kooi
|
26cb6bd6a3
|
Merge pull request #3326 from acemod/makeAdvMedicalWoundsConsistant
Make wound assignment consistent for dll/sqf
|
2016-02-17 18:34:28 +01:00 |
|