BaerMitUmlaut
8f49715ae6
Cleanup function params and headers
...
Cleanup function params and headers
Removed unecessary param
2016-02-22 00:31:27 +01:00
BaerMitUmlaut
8cfbbe4f1f
Skip FRIES preparation if unnecessary
2016-02-22 00:31:26 +01:00
BaerMitUmlaut
953119a411
Bugfix for static FRIES
2016-02-22 00:31:25 +01:00
BaerMitUmlaut
996a5105fc
Model update
2016-02-22 00:31:25 +01:00
BaerMitUmlaut
b2fd7f93b5
Cleanup privates and function params
2016-02-22 00:31:24 +01:00
BaerMitUmlaut
e5c0b5afd3
Added empty fire LOD to helper
2016-02-22 00:31:23 +01:00
BaerMitUmlaut
7d90f707c0
Improved config
2016-02-22 00:31:22 +01:00
BaerMitUmlaut
cc1a54d900
Updated model
2016-02-22 00:31:22 +01:00
BaerMitUmlaut
7241e703ae
Code cleanup, restructured rope deployment
2016-02-22 00:31:21 +01:00
BaerMitUmlaut
2695fc6beb
Better twitching fix, failsaves and EHs
2016-02-22 00:31:20 +01:00
BaerMitUmlaut
3ec9369a9e
Added FRIES object, FRIES module, debugging code
2016-02-22 00:31:20 +01:00
BaerMitUmlaut
12779b03bf
Glitchy rope fix
2016-02-22 00:31:19 +01:00
BaerMitUmlaut
774984dbac
Added possibility for memory point rope origins
2016-02-22 00:31:18 +01:00
BaerMitUmlaut
554c6b14e0
Tweaked interaction conditions
2016-02-22 00:31:17 +01:00
BaerMitUmlaut
890171e629
Added rope origins for all vanilla helicopters
2016-02-22 00:31:17 +01:00
BaerMitUmlaut
c70ab0b332
Buggy ropes workaround
2016-02-22 00:31:16 +01:00
BaerMitUmlaut
eb028c0d1b
Initial commit fastroping
2016-02-22 00:31:15 +01:00
commy2
f4a985fdfd
Merge pull request #3345 from acemod/jrCompat338
...
Add flashsupressor to asdg_MuzzleSlot_338
2016-02-21 23:46:50 +01:00
commy2
dd10fac470
use DisplayLoad for main menu box and to disable options when world=Empty
2016-02-21 23:28:02 +01:00
commy2
9ac1f8fc47
use DisplayLoad for turretDisplayLoaded event
2016-02-21 23:13:26 +01:00
commy2
4c0a817ba8
use precompiled function for optics display
2016-02-21 22:56:35 +01:00
commy2
e1db193099
remove unused config and remove some wrong base classes
2016-02-21 22:50:15 +01:00
commy2
2b9518bf81
use precompiled function for vector display
2016-02-21 22:41:11 +01:00
commy2
da0d37ed0d
remove commented out code
2016-02-21 22:31:14 +01:00
commy2
3f855298e2
remove unused mapDisplayLoaded event and ACE_dlgMap variable
2016-02-21 22:23:46 +01:00
commy2
f43e88ff25
replace zeusDisplayChanged with DisplayLoad event
2016-02-21 22:16:12 +01:00
commy2
4335bfbfcf
replace inventoryDisplayLoaded with DisplayLoad event
2016-02-21 21:24:39 +01:00
licht-im-Norden87
5e0f109b4c
Update stringtable.xml
2016-02-21 21:15:38 +01:00
commy2
e9808bf20b
remove unused PFH check
2016-02-21 20:42:06 +01:00
licht-im-Norden87
00c8f7bdef
mk6
2016-02-21 20:30:57 +01:00
commy2
5e486869c0
replace mainDisplayLoaded event with DisplayLoad XEH and add ACE version to main menu (CBA help)
2016-02-21 20:26:30 +01:00
licht-im-Norden87
4036dcaa8e
Update stringtable.xml
2016-02-21 20:05:26 +01:00
licht-im-Norden87
62dc2ffd06
Update stringtable.xml
2016-02-21 20:04:32 +01:00
licht-im-Norden87
3c8b3031d8
Update stringtable.xml
2016-02-21 19:59:06 +01:00
licht-im-Norden87
ce97916fbf
Update stringtable.xml
2016-02-21 19:55:08 +01:00
licht-im-Norden87
574a6a32ea
Update stringtable.xml
2016-02-21 19:54:24 +01:00
PabstMirror
2467fa7b0c
Fix empty callbacks in medical/repair
2016-02-21 11:34:25 -06:00
PabstMirror
cb33666091
ObjectEvent Func, swap execRemoteFnc in doAnim
...
#3370
2016-02-21 11:08:07 -06:00
commy2
5dcb8707dd
Merge pull request #3359 from gienkov/edenadditions
...
integrate captivity modules with 3DEN
2016-02-21 12:44:39 +01:00
bux
38c1b45fb9
properly fix the medical translation file
2016-02-21 11:41:53 +01:00
PabstMirror
3d4602e461
Add all joint muzzles and remove from ballistics
2016-02-20 20:03:10 -06:00
PabstMirror
3fbd6cff18
Merge pull request #3368 from acemod/fixNils
...
Fix some undefined functions / strings
2016-02-20 19:49:07 -06:00
Nicolás Badano
d7403976aa
Merge pull request #3337 from acemod/overheatingSilencers
...
Substantially increase overheating when using silencers or flash suppresors
2016-02-20 22:06:19 -03:00
licht-im-Norden87
360c35dc9c
Update stringtable.xml
2016-02-21 02:04:58 +01:00
licht-im-Norden87
0a0400a7a2
deleted all lines exept for 2 because of obvious reason.
2016-02-21 02:03:30 +01:00
esteldunedain
e4e2f0d661
Add a 10% chance for the unjam action to fail (like in ACE2)
2016-02-20 21:09:52 -03:00
Glowbal
ea113b8e61
Fix duplicate {
2016-02-21 01:04:12 +01:00
Glowbal
7d063d4dee
Merge branch 'master' into medical-focus-feature
...
Conflicts:
addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf
2016-02-21 00:37:30 +01:00
commy2
f5ef7b6b2d
displayLoad xeh for imenu
2016-02-21 00:36:46 +01:00
esteldunedain
dc7c4ff4fd
Increase the jam chance of all weapons at high temperatures
2016-02-20 20:26:30 -03:00
esteldunedain
11f3189306
Add an unjam action to the interact menu when the weapon is jammed
2016-02-20 20:19:56 -03:00
esteldunedain
2dbf979ec6
By default, prevent reloading from automatically clearing a weapon jam (like in ACE2)
2016-02-20 20:05:59 -03:00
PabstMirror
8b932fd5a0
Fix some undefined functions / strings
2016-02-20 16:58:45 -06:00
licht-im-Norden87
a977715460
Merge pull request #37 from licht-im-Norden87/patch-49
...
Viewdistance
2016-02-20 23:54:10 +01:00
licht-im-Norden87
82a938113c
Merge pull request #39 from licht-im-Norden87/patch-47
...
hearing
2016-02-20 23:54:04 +01:00
licht-im-Norden87
a4d0c219ac
Merge pull request #40 from licht-im-Norden87/patch-51
...
switchunits
2016-02-20 23:53:52 +01:00
licht-im-Norden87
fb20492573
switchunits
2016-02-20 23:53:02 +01:00
licht-im-Norden87
593ae5495e
Merge pull request #38 from licht-im-Norden87/patch-48
...
interaction
2016-02-20 23:46:17 +01:00
licht-im-Norden87
5996f50490
Merge pull request #36 from licht-im-Norden87/patch-50
...
finger
2016-02-20 23:46:11 +01:00
licht-im-Norden87
50dc6ec341
finger
...
Iam not happy with my translation in any way.
"Zeige Zeiger" sounds terrible
"Zeige Fingerzeig (middlefinger)" can be misunderstood
(maybe there is a nice solution Iam not aware of.) This is truely a pain in the ass
2016-02-20 23:43:16 +01:00
licht-im-Norden87
747cd8c4cf
Viewdistance
2016-02-20 23:33:12 +01:00
commy2
9c4121f3b1
replace ace_common_fnc_selectWeaponMode with CBA_fnc_selectWeapon
2016-02-20 23:30:40 +01:00
licht-im-Norden87
91bdceead6
interaction
2016-02-20 23:27:32 +01:00
licht-im-Norden87
5569790e0b
hearing
2016-02-20 23:25:19 +01:00
licht-im-Norden87
7f2dfe1749
Merge pull request #35 from licht-im-Norden87/patch-46
...
explosives
2016-02-20 23:20:21 +01:00
licht-im-Norden87
d4cca14929
explosives
2016-02-20 23:19:51 +01:00
commy2
a67917c590
add deprecate log
2016-02-20 23:11:50 +01:00
licht-im-Norden87
83e17e293b
Merge pull request #33 from licht-im-Norden87/patch-45
...
common
2016-02-20 23:08:47 +01:00
licht-im-Norden87
5294527daa
Merge pull request #32 from licht-im-Norden87/patch-44
...
cargo
2016-02-20 23:07:59 +01:00
licht-im-Norden87
cdb58b6233
common
2016-02-20 23:06:29 +01:00
licht-im-Norden87
b41efc39ff
cargo
2016-02-20 23:02:02 +01:00
licht-im-Norden87
073a476ed1
Update German Stringtable
...
Since my other PR was merged I have to open another one to add a few things a fix one or two mistakes. It should be done in <30 minutes. (Guess you guys want to realease 3.5.0 as soon as possible.)
2016-02-20 22:57:45 +01:00
commy2
9cdefae10e
delete sqf file
2016-02-20 22:46:22 +01:00
commy2
73d5b3c77b
relace ace_common_fnc_canUseWeapon with CBA_fnc_canUseWeapon
2016-02-20 22:41:24 +01:00
esteldunedain
d00587f367
Minor fixes
2016-02-20 17:40:19 -03:00
ChairborneIT
0021bc08df
Added translation for most Italian stringtable entries
2016-02-20 21:39:05 +01:00
esteldunedain
2d2e95fddc
Merge branch 'master' into overheatingSilencers
2016-02-20 17:25:26 -03:00
esteldunedain
63056ef47a
Merge branch 'master' into fixRHSCompat
2016-02-20 17:02:11 -03:00
esteldunedain
6fd8d8da04
Merge branch 'master' into changeHearingDefaults
...
Conflicts:
addons/grenades/functions/fnc_flashbangExplosionEH.sqf
2016-02-20 16:59:00 -03:00
PabstMirror
c9aa221b01
Convert other weapons with join muzzles
2016-02-20 12:01:34 -06:00
PabstMirror
84ba6f29f2
Merge pull request #3362 from acemod/delayedCaptivity
...
Delay captivity until 0.05s after settings are initialized
2016-02-20 10:34:18 -06:00
Thomas Kooi
f6dfd03bec
Merge pull request #2168 from jokoho48/codeCleanupLaserSelfdesignate
...
Code Cleanup laser Self Designate Module
2016-02-20 17:28:41 +01:00
Thomas Kooi
b6b173b03e
Merge pull request #3358 from acemod/darkerSandbags
...
Darken and improve sandbag texture, close #2595
2016-02-20 17:26:35 +01:00
Thomas Kooi
2930fab6c6
Merge pull request #3354 from acemod/playerBodybags
...
Fix bagging respawning players (alt)
2016-02-20 17:26:07 +01:00
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
PabstMirror
b9cf5817b9
Restore delay in modules
2016-02-20 09:39:15 -06:00
esteldunedain
6523b715fe
Delay captivity until 0.05s after settings are initialized
2016-02-20 11:57:47 -03:00
gienkov
1b03ee76fd
tabs
2016-02-20 14:07:39 +01:00
gienkov
54b71cc7ba
integrate captivity modules with 3DEN
2016-02-20 13:36:53 +01:00
bux
d9b452f496
darken and improve sandbag texture
2016-02-20 12:12:32 +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
dffcbc7650
Cleanup events
2016-02-19 15:45:37 -06:00
PabstMirror
44b526ab6d
bodybag - hide player corpse and delete later
...
Fix #1301
2016-02-19 15:41:13 -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
2c2626aade
Add flashsupressor to asdg_MuzzleSlot_338
2016-02-19 01:33:27 -06:00
esteldunedain
38c4b1dc81
Add a diagnose script to detect incompatibilities between vanilla and ab initial velocities
2016-02-19 00:45:00 -03:00
PabstMirror
d2a3f35c80
Fix deleted czech strings from merge
2016-02-18 13:39:14 -06:00
esteldunedain
e22b1c0d25
Derp
2016-02-18 16:07:39 -03:00
bux
49f565f541
fix merging errors
2016-02-18 20:05:30 +01:00
esteldunedain
2dd835b56b
Substantially increase overheating when using silencers or flash suppresors. Optimize overheating calculations for the player through caching.
2016-02-18 15:58:44 -03: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
2a8410650a
Swap createLocation by CBA_fnc_createNamespace
2016-02-18 13:58:18 -03:00
esteldunedain
0236c16e8f
Cache volume attenuation due to earplugs and headgear
2016-02-18 13:48:40 -03: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
Thomas Kooi
8e49c8b1b3
Merge pull request #3323 from acemod/fixVehicleCrashes
...
Fix vehicle crashes
2016-02-17 18:32:56 +01:00
PabstMirror
930c2f84c6
Call updateHearingProtection at settings init
2016-02-17 09:49:00 -06:00
PabstMirror
40396fc69e
Remove debug
2016-02-17 09:37:08 -06:00
PabstMirror
649b0c28e2
Calculate hearing protection coefficient on events
2016-02-16 18:17:42 -06:00
PabstMirror
8fed9325c9
Fix flashbang
2016-02-16 13:02:25 -06:00
PabstMirror
749425dfb7
Settings Category, Minor Cleanup
2016-02-16 12:58:42 -06:00
PabstMirror
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
commy2
1bc73af1c9
remove ace fake weapon from 3den cargo editor
2016-02-16 16:11:18 +01:00
PabstMirror
5c9dfd7dc5
Handle enemy causing veh explode, fix revive unload
...
Fix #3269
2016-02-15 22:23:37 -06:00
PabstMirror
9441b548be
Fix vehicle crashes not being fatal to non-drivers
...
Fix #3306
2016-02-15 17:11:04 -06:00
PabstMirror
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
PabstMirror
4a8b032c1f
Don't allow passing mags when not in same veh
2016-02-14 14:53:04 -06:00
PabstMirror
985af4502c
Merge pull request #3313 from ivankrouglyi/patch-1
...
Update fnc_treatment_success.sqf
2016-02-14 13:27:08 -06:00
VKing
74d410688f
Add check so vanilla magazines can't be unloaded
2016-02-14 14:10:28 +01:00
VKing
560c509a3a
Changed to using playerVehicleChanged.
2016-02-14 13:51:44 +01:00
Glowbal
ff86359247
Merge branch 'master' into medical-focus-feature
2016-02-13 19:51:45 +01:00
Nicolás Badano
7bbdcbc054
Merge pull request #3280 from acemod/unifiedFiredEH
...
Unified fired event handler
2016-02-13 15:13:18 -03:00
esteldunedain
e2ed38609d
Replace driver by effectivCommander on EFUNC(common,getGunner) and EFUNC(common,firedEH)
2016-02-13 15:04:43 -03:00
Ivan Krouglyi
0a226b5ee9
Update fnc_treatment_success.sqf
...
Error at 84 line - you forget ";"
2016-02-13 03:29:42 +03:00
PabstMirror
54b350a6c0
Only get passenger actions for selected unit
...
Fix #1690 #3309
2016-02-12 15:57:16 -06:00
Githawk
17cba965c3
Deactivate laser_sefldesignate on Comanche
2016-02-11 20:27:46 +01:00
Githawk
c38b028c3a
Fixing driver gun
...
Magazines from driver gun don't get removed
2016-02-11 19:06:37 +01:00
Githawk
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
PabstMirror
ff4ba98e68
Pre-load again on mission load (save game)
2016-02-10 11:50:30 -06:00
licht-im-Norden87
5577a1b4bb
Merge pull request #31 from licht-im-Norden87/patch-42
...
trenches
2016-02-10 18:15:14 +01:00
licht-im-Norden87
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
licht-im-Norden87
020deb4407
Update stringtable.xml
2016-02-10 18:14:03 +01:00
licht-im-Norden87
adbfa378b1
Update stringtable.xml
2016-02-10 18:12:36 +01:00
licht-im-Norden87
a5597ade89
Merge pull request #30 from licht-im-Norden87/patch-41
...
spectator
2016-02-10 18:06:13 +01:00
licht-im-Norden87
e8a35f3c20
spectator
...
Bitte einmal z. 259,268,377 überprüfen!
2016-02-10 18:05:51 +01:00
licht-im-Norden87
0c268b90dc
Merge pull request #29 from licht-im-Norden87/patch-39
...
overheating
2016-02-10 17:35:56 +01:00
licht-im-Norden87
9419e7daf3
overheating
2016-02-10 17:35:36 +01:00
licht-im-Norden87
7bed10d14b
Merge pull request #28 from licht-im-Norden87/patch-38
...
optionsmenu
2016-02-10 17:32:32 +01:00
licht-im-Norden87
51b57b962b
Update stringtable.xml
2016-02-10 17:32:19 +01:00
licht-im-Norden87
cabbc4b6a9
optionsmenu
2016-02-10 17:31:26 +01:00
licht-im-Norden87
c663feed49
Merge pull request #27 from licht-im-Norden87/patch-37
...
nightvision
2016-02-10 17:26:23 +01:00
licht-im-Norden87
864ae484d4
nightvision
2016-02-10 17:26:08 +01:00
licht-im-Norden87
b352b9b024
Merge pull request #26 from licht-im-Norden87/patch-36
...
captives
2016-02-10 17:20:13 +01:00
licht-im-Norden87
39e26b0f11
captives
2016-02-10 17:19:42 +01:00
licht-im-Norden87
ffb3367a50
Merge pull request #25 from licht-im-Norden87/patch-35
...
common
2016-02-10 17:17:47 +01:00
licht-im-Norden87
b9083f1712
common
2016-02-10 17:17:26 +01:00
licht-im-Norden87
c806bfb721
Merge pull request #24 from licht-im-Norden87/patch-34
...
flashlight
2016-02-10 17:14:37 +01:00
licht-im-Norden87
d52c6cb984
flashlight
2016-02-10 17:13:52 +01:00
licht-im-Norden87
a725553a95
commy2
2016-02-10 17:11:24 +01:00
licht-im-Norden87
b617dee302
Merge pull request #23 from licht-im-Norden87/patch-33
...
cargo
2016-02-10 17:09:05 +01:00
licht-im-Norden87
b1990b1586
Update stringtable.xml
2016-02-10 17:08:48 +01:00
licht-im-Norden87
3583e95e1f
cargo
2016-02-10 17:07:05 +01:00
licht-im-Norden87
35b0b11fff
Merge pull request #22 from licht-im-Norden87/patch-32
...
Gestures
2016-02-10 17:03:21 +01:00
licht-im-Norden87
6481a0fbb8
Gestures
2016-02-10 17:02:54 +01:00
licht-im-Norden87
71682bc2f3
Merge pull request #21 from licht-im-Norden87/patch-31
...
headless
2016-02-10 16:58:21 +01:00
licht-im-Norden87
c0a9d6a0e8
headless
2016-02-10 16:57:56 +01:00
licht-im-Norden87
3eaf466994
Merge pull request #20 from licht-im-Norden87/patch-30
...
hearing
2016-02-10 16:57:24 +01:00
licht-im-Norden87
99f6c79573
Update stringtable.xml
2016-02-10 16:57:12 +01:00
licht-im-Norden87
8971f4db1e
Update stringtable.xml
2016-02-10 16:56:15 +01:00
licht-im-Norden87
a9252c1b5d
Merge pull request #19 from licht-im-Norden87/patch-29
...
Interact menu
2016-02-10 16:49:46 +01:00
licht-im-Norden87
61bd04a390
Interact menu
2016-02-10 16:49:00 +01:00
licht-im-Norden87
e2d4589bb0
Merge pull request #18 from licht-im-Norden87/patch-28
...
Hunt IR
2016-02-10 16:42:35 +01:00
licht-im-Norden87
8ef2905e99
Hunt IR
2016-02-10 16:42:03 +01:00
licht-im-Norden87
53f8b14a7c
Merge pull request #17 from licht-im-Norden87/patch-27
...
Adv. ballistic
2016-02-10 16:41:00 +01:00
licht-im-Norden87
17a16d1bad
Adv. ballistic
2016-02-10 16:40:07 +01:00
licht-im-Norden87
49ee49a5b7
Merge pull request #16 from licht-im-Norden87/patch-26
...
magazine repack
2016-02-10 16:29:32 +01:00
licht-im-Norden87
ed1047e199
magazine repack
2016-02-10 16:26:03 +01:00
licht-im-Norden87
03b4a0e8fb
Update German Stringtable
2016-02-10 16:24:18 +01:00
commy2
82086efca0
manual merge
2016-02-10 10:11:33 +01:00
PabstMirror
e1b83b8172
Manually pre-load for StaticWeapons and Car
...
Fix #3168
2016-02-09 22:43:38 -06:00
SzwedzikPL
388b00f58c
remove unnecessary code, aesthetic tweak
2016-02-10 01:38:14 +01:00
SzwedzikPL
0c80551fd8
ace attribute category, lower case classes
2016-02-10 01:17:18 +01:00
gienkov
d5dd718b8d
fix endlines
2016-02-09 12:01:13 +01:00
gienkov
fafd25dee7
pl translation
2016-02-09 11:50:35 +01:00
gienkov
8048b2ecbd
lazy evaluation fix
2016-02-09 09:35:16 +01:00
esteldunedain
b02a67605c
Revert to normal testing for units on foot
2016-02-09 00:19:18 -03:00
esteldunedain
0f41c5bf13
Only test the GEOM LOD for visibility
2016-02-09 00:01:51 -03:00
esteldunedain
d4eda6d4ec
Show tags for units inside the player vehicle. Close #538 .
2016-02-08 22:54:24 -03:00
esteldunedain
cebc8a2d07
Slightly reduce the distance for which the LOS check is skipped. Fix #3270
2016-02-08 19:19:10 -03:00
esteldunedain
4c938a050b
Fix for combination of "Only Cursor + Keypress" and "Always Show Sound Waves"
2016-02-08 17:57:24 -03:00
esteldunedain
a47f7b8162
Fix cursor mode
2016-02-08 17:18:03 -03:00
esteldunedain
c43b3bd5c1
Switch
2016-02-08 17:14:18 -03:00
esteldunedain
b2e9dd0149
Fix _vecy
2016-02-08 17:03:18 -03:00
esteldunedain
73499489e0
Revert "Optimized EFUNC(common,cachedCall)"
...
This reverts commit b358c4a8af
.
2016-02-08 16:45:16 -03:00
esteldunedain
1b912cdca0
Switch back to modelToWorldVisual. Perf is about the same and it moves smoothly with the model.
2016-02-08 16:38:26 -03:00
esteldunedain
b358c4a8af
Optimized EFUNC(common,cachedCall)
2016-02-08 16:09:14 -03:00
esteldunedain
62fb26200f
Nametags optimization
2016-02-08 15:36:56 -03:00
esteldunedain
94977ffe5c
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into nametagsOptimization
2016-02-08 12:52:49 -03:00
SzwedzikPL
94ea26c7b9
typo fix
2016-02-08 00:14:55 +01:00
SzwedzikPL
3bfac35b65
ace repair and medical attributes
2016-02-07 23:56:45 +01:00
Glowbal
e754c89c73
Remove non functional event driven handleDamage
2016-02-07 13:18:19 +01:00
Glowbal
575f362fb6
Add setting for limiting usage of Epinephrine in basic medical #1792
...
Part of focus feature medical #3134 . Default settings are inline with old default.
2016-02-07 13:10:38 +01:00
VKing
f92b798586
Switch to select (is even slightly faster)
2016-02-07 13:09:01 +01:00
VKing
f1cc2ddd51
Change to apply in fcs
2016-02-07 13:08:31 +01:00
Glowbal
bfd90cd5d3
Add Adenosine to replace atropine #1573
2016-02-07 12:54:23 +01:00
Glowbal
39cf11367f
improve medical bandage configuration
2016-02-07 12:37:00 +01:00
Glowbal
84878c3d8b
Merge branch 'master' into medical-focus-feature
2016-02-07 12:11:25 +01:00
esteldunedain
2b1c312d13
Make explosion reflections optional, default off
2016-02-06 23:46:40 -03:00
esteldunedain
b6058242c8
Fix frag fired EH name
2016-02-06 22:20:08 -03:00
esteldunedain
e4122cf42f
Fix winddeflection fire eh
2016-02-06 21:00:42 -03:00
esteldunedain
8fbb6cd72e
Fixed event parameters
2016-02-06 20:49:18 -03:00
esteldunedain
a51372a6b3
Add the TRACE_10 macro
2016-02-06 20:28:16 -03:00
esteldunedain
b7d94f5363
Apply the ufeh to ACE_Advanced_Ballistics
2016-02-06 18:48:26 -03:00
esteldunedain
94ef0c5659
Apply the ufeh to ACE_WindDeflection
2016-02-06 18:36:20 -03:00
PabstMirror
1e66cd406b
Use location hash for ace events
2016-02-06 15:27:53 -06:00
esteldunedain
25b767a16b
Apply the ufeh to ACE_WeaponSelect
2016-02-06 18:27:43 -03:00
esteldunedain
cdfdfffff6
Apply the ufeh to ACE_Scopes
2016-02-06 18:24:48 -03:00
esteldunedain
12d7a171e5
Apply the ufeh to ACE_Recoil
2016-02-06 18:21:43 -03:00
esteldunedain
69dea087ca
Apply the ufeh to ACE_Overpressure
2016-02-06 18:17:27 -03:00
esteldunedain
5aa763f0c6
Apply the ufeh to ACE_Overheating
2016-02-06 17:59:54 -03:00
esteldunedain
5b3df2bcf7
Apply the ufeh to ACE_Optics
2016-02-06 17:50:35 -03:00
esteldunedain
33bcd6d9f9
Fix
2016-02-06 17:44:34 -03:00
esteldunedain
45b6b8467d
Apply the ufeh to ACE_Nightvision
2016-02-06 17:42:44 -03:00
esteldunedain
7ace1738c0
Apply the ufeh to ACE_HuntIr
2016-02-06 17:29:05 -03:00
esteldunedain
0b9695ce70
Apply the ufeh to ACE_Grenades
2016-02-06 17:20:30 -03:00
esteldunedain
ac3f75c8b4
Apply the ufeh to ACE_Goggles
2016-02-06 17:16:10 -03:00
esteldunedain
b70ae9207c
Apply the ufeh to ACE_Frag
2016-02-06 17:12:28 -03:00
esteldunedain
fe66d93275
Added ignore private warnings + trace
2016-02-06 17:07:05 -03:00
esteldunedain
37bc67c951
Create a _vehicle variable
2016-02-06 16:55:36 -03:00
esteldunedain
efbff8cc23
Pass the turret path too
2016-02-06 16:49:53 -03:00
esteldunedain
59cbc6da10
Remove unneeded test in FCS fireEH
2016-02-06 16:49:27 -03:00
esteldunedain
a084373574
Apply the ufeh to ACE_Disposable
2016-02-06 16:39:08 -03:00
esteldunedain
b2bd11ed77
Apply the ufeh to ACE_FCS
2016-02-06 16:29:58 -03:00
esteldunedain
6d9068e306
gunner to lowercase
2016-02-06 16:26:57 -03:00
esteldunedain
72b262f634
Simplified parameter names
2016-02-06 16:22:23 -03:00
esteldunedain
588f76b3f1
Learning to count
2016-02-06 16:12:18 -03:00
esteldunedain
89354e25c8
Unified fired event handler
2016-02-06 16:09:48 -03:00
esteldunedain
698b934801
Increase the volume of the residual woosh when ringing is disabled
2016-02-06 14:49:56 -03:00
esteldunedain
9a8dd3e2ad
Fix stringtable
2016-02-06 14:49:28 -03:00
esteldunedain
354ed0cab2
Trace instead of sideChat
2016-02-06 14:11:18 -03:00
esteldunedain
2f1e96ae4f
Overhaul ACE_Hearing and change default settings.
2016-02-06 13:59:31 -03:00
commy2
baf979064a
remove old ragdoll tweaks
2016-02-06 17:45:47 +01:00
commy2
0a9048815b
simlify some select CODE statements
2016-02-06 14:59:31 +01:00
commy2
ac007e6995
replace more map with apply
2016-02-06 12:08:04 +01:00
commy2
41e39c9c3a
replace more filter with select
2016-02-06 11:58:31 +01:00
commy2
2ebd2f9046
replace filter and map with select and apply
2016-02-06 11:42:35 +01:00
PabstMirror
d69af47030
Merge branch 'master' of https://github.com/acemod/ACE3
2016-02-05 16:49:39 -06:00
PabstMirror
e3e9d19ca1
Fix "key" capitalization for Interaction_GetOut
2016-02-05 16:49:36 -06:00
commy2
ec4a4ef67f
correct capitalization for German translation
2016-02-05 22:21:27 +01:00
commy2
7f6b17cdbc
correct name for wheeled apc 01 cannon
2016-02-05 22:19:27 +01:00
commy2
0032e7aa9a
Merge pull request #3267 from acemod/removeSwagWalkFix
...
Remove Swag Walk Fix
2016-02-05 21:59:57 +01:00
PabstMirror
9b3ca2822f
Change german stringtable
2016-02-05 14:46:30 -06:00
commy2
f33beb9865
update movement config comments
2016-02-05 21:31:08 +01:00
commy2
d89c93de22
setAllGear - abort function and print warning when used on remote units,
2016-02-05 21:14:20 +01:00
PabstMirror
deac4395c1
Deadman switch - trigger explosives in inventory
...
Also allow manual triggering of the deadman device
2016-02-05 11:40:11 -06:00
Nicolás Badano
027de27e33
Merge pull request #3268 from acemod/fix3140
...
Document the locality requirements of fnc_setAllGear.
2016-02-05 10:19:57 -03:00
esteldunedain
dbe7e294a5
Document the locality requirements of fnc_setAllGear. Close #3140
2016-02-05 10:18:36 -03:00
esteldunedain
b2d050afca
Close #3188 , Close #3260
2016-02-05 09:46:51 -03:00
Nicolás Badano
d26fc4614f
Merge pull request #3266 from SzwedzikPL/overheatingStringtableFix
...
Fix overheating stringtable
2016-02-05 09:35:29 -03:00
Thomas Kooi
0850ab35e3
Merge pull request #3262 from acemod/nozzleFixes
...
fix some issues with Fuel Nozzle
2016-02-05 09:15:27 +01:00
Thomas Kooi
f47b51c0cb
Merge pull request #3070 from dixon13/newCivInteraction
...
Changes to civilian interaction
2016-02-05 09:14:45 +01:00
dixon13
a0e6f97125
Updated condition for ACE_GetOut
2016-02-05 00:32:56 -07:00
SzwedzikPL
270b557084
fix overheating stringtable
2016-02-05 04:55:05 +01:00
SzwedzikPL
5f0a2b1945
use event system, polish translation
2016-02-05 04:26:54 +01:00
Nicolás Badano
dadec15948
Merge pull request #2104 from acemod/trenches
...
Trenches
2016-02-04 23:43:06 -03:00
SzwedzikPL
374b015ee4
major cleanup
2016-02-05 03:41:18 +01:00
SzwedzikPL
ab297ff97e
more readable macro
2016-02-05 02:03:25 +01:00
SzwedzikPL
a9d57e0d1c
fnc_switchLamp cleanup
2016-02-05 02:02:46 +01:00