Commit Graph

7744 Commits

Author SHA1 Message Date
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
SzwedzikPL
7b8be590b4 Merge branch 'acemod/master' into interactions_lamps 2016-02-05 01:43:06 +01:00
esteldunedain
b6581cf5ef Fix #3264 2016-02-04 21:00:40 -03:00
esteldunedain
2577992dfc Progress bar localization 2016-02-04 20:43:32 -03:00
esteldunedain
7da6e2a35f Reduce the placement distance 2016-02-04 18:47:30 -03:00
esteldunedain
8c187cbf07 Adjust big trench height 2016-02-04 18:47:17 -03:00
esteldunedain
4cd0028794 Add animation and progresive digging 2016-02-04 18:43:47 -03:00
esteldunedain
3d47156547 Rename some variables 2016-02-04 17:42:12 -03:00
esteldunedain
2d45a28863 Merge branch 'master' into trenches 2016-02-04 17:04:09 -03:00
jokoho48
dc3026366a remove unneeded files
fix hard edge in model
add LOD
2016-02-04 20:52:28 +01:00
Glowbal
8c0472bbeb Merge branch 'master' of github.com:acemod/ACE3 2016-02-04 20:35:15 +01:00
VKing
f652db1d2f Add Loadout box for easy conversion 2016-02-04 20:35:00 +01:00
Glowbal
f1ce133d32 Merge branch 'release'
Conflicts:
	addons/refuel/functions/fnc_connectNozzle.sqf
2016-02-04 20:34:32 +01:00
Thomas Kooi
653f6567cc Fix french translation refresh marker interval
As per @alganthe's comment on #3114
2016-02-04 20:30:51 +01:00
Thomas Kooi
543d54d37e Merge pull request #3114 from Luigium/master
Fixed and added French Translation
2016-02-04 20:28:00 +01:00
Glowbal
376b611b89 Merge branch 'master' into Mortar_interact 2016-02-04 20:21:03 +01:00
Thomas Kooi
727cb38be6 Merge pull request #3218 from SzwedzikPL/fix3202
Fix laser_selfdesignate does not measure the distance
2016-02-04 20:17:06 +01:00
PabstMirror
54870f872a Disable Debug 2016-02-04 13:16:41 -06:00
Nicolás Badano
c967bd1ace Merge pull request #3259 from acemod/fix3denGoggles
Fix ACE_goggle changing the tint on the 3den camera
2016-02-04 16:08:02 -03:00
Nicolás Badano
cbafe05f76 Merge pull request #3082 from acemod/deterministicOverheatingX
Deterministic overheating (updated)
2016-02-04 16:03:30 -03:00
Thomas Kooi
dd3613c357 Merge pull request #3190 from acemod/fcs_enableGMG
Add FCS to more things
2016-02-04 20:03:19 +01:00
Thomas Kooi
893040b08a Merge pull request #3102 from buddytex/SandbagEditor
Add Sandbag to editor
2016-02-04 20:00:51 +01:00
Thomas Kooi
f26fb9e9da Merge pull request #3107 from jonpas/headless
Add Dynamic AI Group Tranferring to Headless Clients
2016-02-04 20:00:16 +01:00
Thomas Kooi
a3f80dbc30 Merge pull request #3230 from acemod/draggingStuff
Fix dragging moving object to random location
2016-02-04 19:58:56 +01:00
Thomas Kooi
ce27575de3 Merge pull request #3244 from acemod/fixScopesCapturingKeys
Fix ace_scopes capturing native adjustment keys for the PSO scope.
2016-02-04 19:58:21 +01:00
Thomas Kooi
508f6a16ae Merge pull request #3162 from acemod/Refuel_Fuelbladders
Refuel - Add refuel actions to fuel bladder objects
2016-02-04 19:57:50 +01:00
Thomas Kooi
8c9523e36b Merge pull request #3151 from acemod/explosives_cleanup_plus_minetriggers
Various explosives enhancements
2016-02-04 19:56:27 +01:00
Thomas Kooi
e0946c3fc5 Merge pull request #3106 from acemod/explEvents
Explosive events, fix #3104
2016-02-04 19:52:10 +01:00
PabstMirror
35333cbe9d Merge branch 'cargoCleanup' 2016-02-04 12:51:52 -06:00
Thomas Kooi
3e5908faf8 Merge pull request #3018 from jonpas/fixFuelHoseExceededAfterDisconnect
Fix refuel PFH not exiting on nozzle disconnect
2016-02-04 19:47:52 +01:00
Thomas Kooi
038befbce0 Merge pull request #3191 from acemod/cargoCleanup
Cargo Cleanup, Add makeLoadable
2016-02-04 19:44:27 +01:00
Thomas Kooi
324edbde6d Merge pull request #3192 from acemod/getTargetDistance_to_LIS
Rewrite ace_common_fnc_getTargetDistance to use LineIntersectsSurfaces.
2016-02-04 19:42:32 +01:00
Thomas Kooi
6cf02bd06b Merge pull request #3193 from acemod/fcs_rewriteRangeFunctions
Cleaning up the FCS code
2016-02-04 19:39:32 +01:00
Thomas Kooi
d68c79efb1 Merge pull request #3204 from acemod/m67_dns
Fix Handgrenade DisplayNameShort
2016-02-04 19:37:20 +01:00
Thomas Kooi
69746a133b Merge pull request #3254 from ProfessorCZ/master
Czech Translation - Update
2016-02-04 19:36:28 +01:00
Thomas Kooi
8034d91d76 Merge pull request #3249 from GitHawk/refuel_nozzle
Added a real nozzle
2016-02-04 19:32:17 +01:00
Thomas Kooi
d72c73dc25 Merge pull request #3257 from acemod/flashbangUnderwater
Flashbangs - pass pos instead of obj reference
2016-02-04 19:31:11 +01:00
Thomas Kooi
dc8e7e2994 Merge pull request #3255 from acemod/tourniquetMedications
Tourniquets block medication until released
2016-02-04 19:30:40 +01:00
PabstMirror
336184dfaa Change medication removal from array 2016-02-04 10:00:33 -06:00
esteldunedain
c87f19c8da Fix #3258 2016-02-04 10:04:26 -03:00
PabstMirror
2cf2cb0e59 Fix statusEffect error in refuel 2016-02-04 01:31:12 -06:00
PabstMirror
7fc84c60dd Flashbangs - pass pos instead of obj reference
Fix #3205
2016-02-03 17:53:24 -06:00
PabstMirror
3cc10a27ce Tourniquets block medication until released
Close #2704
2016-02-03 14:40:26 -06:00
ProfessorCZ
61611d0ec7 Czech Translation - Update
Update
2016-02-03 18:31:31 +01:00
PabstMirror
397a12056a Merge branch 'master' into deterministicOverheatingX 2016-02-02 17:11:00 -06:00
Githawk
979ceb7ad7 Fixed rearm unholster macro 2016-02-02 16:04:50 +01:00
Githawk
cbeac7f154 params stuff 2016-02-02 15:47:05 +01:00
Githawk
4d403d21aa Fixes
Moved models into data
fixed vehicle attach for certain angles
2016-02-02 15:45:57 +01:00
Githawk
5e103ba398 Added nozzle
Added code for nozzle object
Params and private update
2016-02-02 15:03:06 +01:00
Githawk
475351fcfa Some bracket errors 2016-02-01 20:21:20 +01:00
Githawk
cc624f58dd Fixes and updates 2016-02-01 20:05:53 +01:00
esteldunedain
f744e164d3 Fix #3238 even if ACE_ScopeAdjust_Vertical = 0 or ACE_ScopeAdjust_Horizontal = 0 2016-02-01 14:58:01 -03:00
PabstMirror
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
PabstMirror
af6b084ba3 Don't allow carrying with injured legs
Fix #2644
2016-01-28 23:05:55 -06:00
PabstMirror
c0eccc67c3 Change all SCALAR to NUMBER in headers 2016-01-28 18:19:15 -06:00
PabstMirror
3f1d6ffeb7 Fix dragging sending objects to random location
attachTo seems to have weird getpos results for a few frames.
also don't show mouse wheel option for carrying man
and always use 0 offset for dragging man
2016-01-28 17:11:05 -06:00
PabstMirror
d9eafbdf0f Privates / Headers 2016-01-28 12:52:53 -06:00
PabstMirror
84e76efc7f Not needed on CfgMagazines 2016-01-27 15:54:45 -06:00
esteldunedain
2eb91cf2b4 Delete spare models 2016-01-27 18:23:04 -03:00
PabstMirror
7a7e0d689a Improve underwater cargo unloading 2016-01-27 14:56:25 -06:00
esteldunedain
d2d7e46401 Align trench to ground surface to avoid having to lower them too much on slopes 2016-01-27 17:54:40 -03:00
esteldunedain
b20a2f338b Replace trench models: bigger and opaque 2016-01-27 17:54:10 -03:00
PabstMirror
17a882fe4d Add findUnloadPosition integration 2016-01-26 18:01:01 -06:00
esteldunedain
f8a1215264 Align trenches to ground 2016-01-26 11:03:11 -03:00
esteldunedain
0358b10298 Bigger trenches 2016-01-26 11:02:55 -03:00
PabstMirror
b15716860d Remove VehicleLock Items from Virtual Arsenal
Close #3215
2016-01-25 14:29:27 -06:00
SzwedzikPL
03fca3c372 fix fcs keyup/down forced params #3202 2016-01-25 09:49:47 +01:00
esteldunedain
3e25f9c5f0 Cache drawIcon3D parameters 2016-01-24 17:12:25 -03:00
esteldunedain
351d20ec32 Cache near object CAManBase that are on LOS instead of recomputing each frame 2016-01-24 17:12:06 -03:00
PabstMirror
276aea04c1 Changes for CBA 2.3 2016-01-24 11:41:10 -06:00
PabstMirror
78729e96ff Fix bad forceWalk params 2016-01-24 11:39:59 -06:00
esteldunedain
0fd6981809 Don't allow placing is standig above the terrain level 2016-01-23 22:05:29 -03:00
esteldunedain
4970423cd7 Cancel placing if position is no longer suitable 2016-01-23 22:04:49 -03:00
esteldunedain
8ff8204905 Initial code implementation of ace_trenches 2016-01-23 20:45:59 -03:00
esteldunedain
1d886ac624 Merge branch 'master' into trenches
Conflicts:
	AUTHORS.txt
2016-01-23 17:39:54 -03:00
esteldunedain
dec9235810 Periodically test all tags on objects for corner cases 2016-01-23 16:47:00 -03:00
esteldunedain
431a21044a Tabs be damned. 2016-01-23 16:37:30 -03:00
esteldunedain
74b6036f3e Handle destruction of tags placed on objects that don't support handledamage. 2016-01-23 16:24:55 -03:00
esteldunedain
e31636539a Allow tagging wrongly configured static objects. 2016-01-23 16:21:43 -03:00
esteldunedain
b020d88963 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into taggingX 2016-01-23 15:14:32 -03:00
esteldunedain
758611d230 Restrict temp update to current weapon, and only primary or handgun 2016-01-23 11:48:23 -03:00
PabstMirror
3a62956e24 Fix wind display angle being reversed 2016-01-22 20:43:22 -06:00
PabstMirror
5df211c586 Merge pull request #3126 from acemod/weatherCleanup
Weather cleanup, fix wind inversion, add non-color based wind speed indicator
2016-01-22 14:56:21 -06:00
PabstMirror
73b29085e2 Merge pull request #3200 from acemod/moreCache
Hearing - Cache Weapon/Ammo loudness
2016-01-22 14:56:00 -06:00
PabstMirror
45138aea18 Merge pull request #3163 from acemod/unifiedStatusEffects
Unified status effect handler
2016-01-22 14:55:25 -06:00
VKing
9501c54530 Fix #3203 IEDs magically changing shape 2016-01-22 14:21:25 +01:00
VKing
68531bd4a9 Merge branch 'master' into explosives_cleanup_plus_minetriggers 2016-01-22 14:15:45 +01:00
VKing
1cf7fc727d Fix Handgrenade DisplayNameShort 2016-01-22 13:12:20 +01:00
PabstMirror
1a98726716 Add makeLoadable sync module 2016-01-21 22:12:54 -06:00
VKing
999d8ac2ce Use max 2016-01-22 00:01:13 +01:00
esteldunedain
ad96617d3a - Tagging cleanup.
- Replaced "Tag wall" and "Tag ground" for a single "Tag" action.
- Added more reliable checks before placing the tag
- Allowed non-player units to tag (via API).
- Replaced execRemoteFnc by events
2016-01-21 19:59:27 -03:00
esteldunedain
a22203a02a Replace player for ACE_player 2016-01-21 14:39:20 -03:00
VKing
8482d45d8b Add FCS to gunner and commander RCWS types for MRAPs, APCs, and arty.
Lower max range to 5500m (9990 is too damn high!)
2016-01-21 16:00:55 +01:00
VKing
299baf1e4a Fix shotbullet checking (lost in merge) 2016-01-21 15:56:53 +01:00
VKing
fedfa94dcd Clean up 2016-01-21 15:01:41 +01:00
VKing
4406f270e2 Fix infantry rangefinders (again) 2016-01-21 14:44:23 +01:00
esteldunedain
91b7c7de61 Change the varname of the weapon data cache to be consistent with other modules 2016-01-20 22:22:53 -03:00
esteldunedain
41f8628917 Change cache location type to ACE_HashLocation 2016-01-20 22:20:16 -03:00
esteldunedain
f7cfbebc49 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into deterministicOverheatingX 2016-01-20 22:19:11 -03:00
VKing
bf5eb78788 Merge branch 'fcs_fixWeaponInitspeed' into fcs_rewriteRangeFunctions
# Conflicts:
#	addons/fcs/functions/fnc_keyUp.sqf
2016-01-21 02:14:51 +01:00
VKing
b83be88571 Enhance ranging.
KeyDown will now apply a static range calculation. KeyUp calculates the target movement and reapplies the calculation as normal.
Sorry in advance for the merge conflicts
2016-01-21 02:02:50 +01:00
VKing
7d3044a5c2 Move display update stuff to fnc_getRange 2016-01-21 00:20:21 +01:00
PabstMirror
be8afe507c Few more privates 2016-01-20 17:19:08 -06:00
PabstMirror
3dac426bc6 Merge pull request #3132 from acemod/interactionMenuCleanup
Cleanup Interaction Menu
2016-01-20 17:04:10 -06:00
PabstMirror
abb01e0653 Merge pull request #3129 from acemod/frag-cacheIfWillFrag
Frag - only run addPfhRound on ammo that will frag (for master)
2016-01-20 17:03:55 -06:00
VKing
43ab126c1f Add FCS to botes RCWS 2016-01-20 23:06:06 +01:00
esteldunedain
e113853395 Merge branch 'master' into tagging 2016-01-20 18:51:41 -03:00
VKing
5f14d17f98 Another fix for BIS' inconsistent implementations 2016-01-20 22:30:22 +01:00
Thomas Kooi
232fe62d8d Merge pull request #3195 from acemod/fix3194
Fix typo in ACE_hearing config
2016-01-20 22:26:13 +01:00
esteldunedain
9d13cc6f60 Move the weapon caching code to a different function. Add compatibility for legacy overheating properties. Add some comments. 2016-01-20 15:19:46 -03:00
esteldunedain
851615a234 Inherit custom gesture classes. 2016-01-20 13:44:51 -03:00
esteldunedain
7860f375c2 Better func description 2016-01-20 13:07:51 -03:00
esteldunedain
89106f6953 Replace addPerFrameHandler for waitAndExecute 2016-01-20 13:05:47 -03:00
esteldunedain
80b9a8961a Improve reload animations 2016-01-20 12:48:39 -03:00
PabstMirror
a140f29784 Remove inherited classes that were not used 2016-01-20 09:45:03 -06:00
esteldunedain
bce572e1df Derp 2016-01-20 12:15:25 -03:00
esteldunedain
19ccf52425 MRBS to mrbs 2016-01-20 12:05:35 -03:00
VKing
43c9444fb8 Didn't need that isNil check, anyway 2016-01-20 15:51:07 +01:00
esteldunedain
1a115e7f9c Fix #3194 2016-01-20 11:48:12 -03:00
esteldunedain
6b4b8b707c Prefix new configs for consistency 2016-01-20 11:42:05 -03:00
esteldunedain
2f7cac68a5 Small fixes 2016-01-20 10:59:58 -03:00
VKing
a9511936fd LayZ evaluation 2016-01-20 12:35:53 +01:00
Glowbal
34613b42f2 Increase heart rate increase speed #3134 2016-01-20 11:49:10 +01:00
VKing
05ce4f824c Rewrite fnc_getRange to work with specified minimum and maximum ranges
Also cleaning up fnc_keyUp a bit
2016-01-20 00:10:27 +01:00
VKing
757436140b fnc_getTargetDistance rewritten to use LineIntersectsSurfaces.
Turns out it wasn't really needed after all, but better is better :p
2016-01-20 00:06:06 +01:00
PabstMirror
3d4fc66bb1 Cargo Cleanup, Add makeLoadable 2016-01-19 14:51:58 -06:00
esteldunedain
c78f2f8479 Gotcha travis 2016-01-19 17:29:58 -03:00
esteldunedain
5b90fd8b81 Set default particle effect on for the local player, as per current and historic behaviour. 2016-01-19 17:25:14 -03:00
esteldunedain
9bcabd081b Reorder the fireEH function to allow particle effects for nearby remote players. Add a setting for that (default off). 2016-01-19 17:24:01 -03:00
VKing
968f7c000b Simplify 2016-01-19 21:16:41 +01:00
SilentSpike
ca5f6df3d0 Merge pull request #3147 from acemod/spectatorBandAid
Restart specatator display if player in unitList
2016-01-19 20:15:24 +00:00
VKing
c8bcf44561 Increase M307 FCS range 2016-01-19 21:08:03 +01:00
esteldunedain
8b7ed38990 Add a PFH to cool down all player weapons at (infrequent) regular intervals 2016-01-19 17:04:51 -03:00
esteldunedain
0313e7b322 Divide the weapon state variable into two: a temp variable, and a time variable. Only broadcast the temp part and only approximately 2016-01-19 17:03:47 -03:00
esteldunedain
782934c4b2 Add the setApproximateVariablePublic function to common 2016-01-19 16:58:07 -03:00
VKing
ae576e57e3 Fix the magazine name being broken in later code 2016-01-19 20:21:37 +01:00
esteldunedain
3792acd7f7 Merge branch 'master' into deterministicOverheatingX 2016-01-19 15:57:38 -03:00
VKing
59923710b7 Fix FCS not taking weapon initSpeed into account in some circumstances 2016-01-19 19:52:18 +01:00
VKing
838945c1db Add FCS for the M307 GMG 2016-01-19 18:53:42 +01:00
PabstMirror
04bccf47d7 Replace all use of deprecated commands 2016-01-19 09:39:07 -06:00
esteldunedain
8e2d489312 Add warnings to deprecated functions 2016-01-19 09:39:06 -06:00
PabstMirror
7e84a9d9b0 Add getter, readd old public funcs, add blockSprint 2016-01-19 09:39:06 -06:00
PabstMirror
d2e006397d cleanup, don't setVar public if no change 2016-01-19 09:39:05 -06:00
PabstMirror
9a3972de76 Unified Status Effect Handler 2016-01-19 09:39:05 -06:00
Thomas Kooi
b99be6122b Merge pull request #3187 from acemod/fixFCS
Add missing FUNC to FCS key (Rangefinders)
2016-01-19 16:05:56 +01:00
PabstMirror
6d6cbec5ef Add missing FUNC to FCS key (Rangefinders)
#3160
2016-01-19 09:02:51 -06:00
Thomas Kooi
c439036abe Deprecate execPersistentFnc 3.7.0
Remove functions the second update after deprecation.
2016-01-19 15:55:33 +01:00
Thomas Kooi
a612bdecf2 Deprecate execRemoteFnc in 3.7.0
Remove functions the second update after deprecation.
2016-01-19 15:54:59 +01:00
PabstMirror
69771d531d Merge pull request #3173 from acemod/fixInvintoryLock
Fix Vehicle inventory is not locked
2016-01-19 08:37:58 -06:00
PabstMirror
0ea1c0c03f Cleanup non-working code, and documentation 2016-01-19 08:31:52 -06:00
Thomas Kooi
e083e60e8c Merge pull request #3142 from acemod/switchUnitsCleanup
Cleanup SwitchUnits, Possible fix for #3122
2016-01-19 09:40:24 +01:00
Thomas Kooi
33479ffcae Merge pull request #3146 from acemod/Explosives_DetonateTrigger
Function to detonate explosives via script
2016-01-19 09:38:43 +01:00
Thomas Kooi
aa535c9167 Merge pull request #3177 from acemod/fixJavelinZeus
Javelin - Fix zeus RC after switchCamera
2016-01-19 09:36:08 +01:00
Thomas Kooi
4ee338c57e Merge pull request #3178 from acemod/scopes_hideNonAdjustments
Scopes: Don't show adjustment or play click sound if the adjustment doesn't happen
2016-01-19 09:35:01 +01:00
Thomas Kooi
5c1f55a0f1 Merge pull request #3181 from acemod/leaveMyPlugsAlone
Do not add or remove earplugs if gear should be preserved
2016-01-19 09:34:38 +01:00
Thomas Kooi
46f832379a Merge pull request #3120 from acemod/explosives_actionmenu_cleanup
Clean up explosive interaction menu
2016-01-19 09:32:26 +01:00
Thomas Kooi
f5d71ca03c Merge pull request #3183 from acemod/codeCleanupGforces
Code cleanup of Gforces module V2
2016-01-19 09:31:16 +01:00
Thomas Kooi
fbb358233b Merge pull request #3172 from acemod/overpressureCleanup
Overpressure cleanup and fix distance check
2016-01-19 09:30:43 +01:00
esteldunedain
f599542b8e gforces cleanup. Close #2130 2016-01-19 00:18:01 -03:00
commy2
8731e8e338 Merge pull request #3133 from acemod/gottaCacheEmAll
Use Function Caching in CBA
2016-01-18 20:27:39 +01:00
esteldunedain
0a91dfa7b2 Do not add or remove earplugs if gear should be preserved. Fix #3180. 2016-01-18 13:23:55 -03:00
VKing
2af3d9e769 Don't show adjustment or click sound if the adjustment doesn't happen 2016-01-18 16:16:53 +01:00
PabstMirror
67087d7c88 Capitalization 2016-01-18 00:27:19 -06:00
PabstMirror
a5c6c5579f #3175 - Javelin - Fix zeus RC after switchCamera 2016-01-17 12:12:05 -06:00
Glowbal
86158ac45b Stage improvements bandage effectiveness 2016-01-17 14:09:22 +01:00
Glowbal
7de1a7bc6c add initial implementation of drowning and collision damage handling 2016-01-17 13:21:18 +01:00
Glowbal
209d10065b Fix missing event log entries #3134 2016-01-17 12:28:37 +01:00
Glowbal
6e42a10d47 Add selectionDamage implementation 2016-01-17 12:28:08 +01:00
PabstMirror
48a1ddd401 #3166 - Fix Vehicle inventory is not locked 2016-01-16 21:58:59 -06:00
PabstMirror
35e6a181b5 opps 2016-01-16 17:48:58 -06:00
PabstMirror
893c6658a5 Fix debug msg order, re-add local check on eh 2016-01-16 17:29:57 -06:00
PabstMirror
a875d6a870 Overpressure cleanup and fix distance check 2016-01-16 15:53:28 -06:00
Glowbal
ee9a620a63 Merge branch '340handledamage' into medical-focus-feature 2016-01-16 22:03:28 +01:00
Thomas Kooi
c8c91d2af7 Merge pull request #3138 from acemod/increaseTrainingInLocations
Medical Locations Boost Training
2016-01-16 21:59:45 +01:00
VKing
e3123b3f56 Local check before setPosition 2016-01-16 01:13:01 +01:00
SilentSpike
dbcf94153d Merge pull request #3155 from acemod/spectatorFix
Fix some spectator errors
2016-01-15 15:43:45 +00:00
VKing
17aaf477fe Standardize displayName for the M26/Mk26/M152/whatever this is 2016-01-15 11:47:40 +01:00
VKing
cfea80bec8 Animate preplaced bottom attack SLAMs 2016-01-15 10:49:22 +01:00
VKing
248eb2143b Fix inconsistent detonator pictures for some IEDs 2016-01-15 10:20:49 +01:00
VKing
0078ad862a Remove redundant entries.
Not removing them as it can be useful to have a reminder that those classes exist.
2016-01-15 09:33:01 +01:00
Thomas Kooi
e38a80a712 Merge pull request #3119 from acemod/explosives_detonateAll
Add action to detonate all explosives on a detonator
2016-01-15 08:22:16 +01:00
VKing
4e8ea4f8e6 Fix detonate action pictures 2016-01-15 00:25:02 +01:00
PabstMirror
1affbd7d2f Move littler syncedEH install to after settingInit 2016-01-14 17:06:46 -06:00
VKing
05c80c2368 Gah stop that you jerk! 2016-01-15 00:04:12 +01:00
VKing
ed8b437a8f Prep function 2016-01-14 23:58:31 +01:00
VKing
32b33d7792 How the feck did this happen 2016-01-14 23:58:07 +01:00
VKing
8bdb2cb7f7 GVAR it. 2016-01-14 23:05:56 +01:00
VKing
575f37c8fd Add fnc_connectExplosive to add editor explosives to unit triggers 2016-01-14 23:05:26 +01:00
VKing
195f0a6874 GVAR it 2016-01-14 20:07:53 +01:00
VKing
1da2b69de4 Make fuel bladders work 2016-01-14 20:07:32 +01:00
VKing
099648b6b6 Russian translation as suggested 2016-01-14 18:51:14 +01:00
VKing
7158a89de9 Start 2016-01-14 18:48:16 +01:00
VKing
74435ba777 Style guide formatting 2016-01-14 18:47:51 +01:00
VKing
73e093ec07 Make stringtable a little more translatable 2016-01-13 22:39:37 +01:00
VKing
2c26d3836b Some fixes for the zeus modules 2016-01-13 22:39:14 +01:00
SilentSpike
49c814ccb3 Merge branch 'master' into spectatorUpdates 2016-01-13 19:19:00 +00:00
SilentSpike
d870a1f448 Fix nil spectator Draw3D event handler index
Minor oversight introduced in pabst's fix for #2989, the icon handler is a mission event handler that isn't self terminating so the index needs to be preserved until after it is removed via `removeMissionEventHandler`. It is safe to let the `onUnload` event take care of that (and preferable so that icons disappear while temporarily closed).
2016-01-13 19:03:24 +00:00
SilentSpike
65e981373b Store spectator display in a uiNamespace variable
This allows me to explicitly close the right display and hopefully fix the interface staying open upon mission end.

@Commy2's theory is that perhaps the main display `46` is killed upon mission end, meaning that `findDisplay` can't find the spectator display to close it because the game thinks it doesn't exist.
2016-01-13 18:38:51 +00:00
VKing
1ae21ad354 Change SLAM bottom attack ammo to be more bottom attacky 2016-01-13 15:41:20 +01:00
VKing
b87a6327ee Fix Zeus modules not showing up 2016-01-13 15:40:39 +01:00
VKing
058ea4e8f4 Actual editor mines 2016-01-13 01:03:50 +01:00
VKing
f90dd9fed8 Allow SLAMs to use long range transmitter 2016-01-13 00:14:17 +01:00
VKing
46643d44d0 Add editor/zeus modules for different trigger options 2016-01-13 00:13:56 +01:00
VKing
a07d456476 Change small IEDs to use smaller pressure plates 2016-01-12 23:17:10 +01:00
VKing
61f288c9cc Rename custom classes with ACE_ prefix 2016-01-12 23:16:49 +01:00
esteldunedain
455c53a084 Nerf the amount of backblast received by the firer via reflection. Fix #2890. 2016-01-12 13:09:41 -03:00
PabstMirror
091c807708 Restart specatator display if player in unitList
Possible fix for #2677
2016-01-12 00:30:03 -06:00
PabstMirror
8cbf31a375 Fix undefined variable error in FUNC(debug)
possibly related to #2677 - threw error from switchToGroupSide
2016-01-11 23:37:44 -06:00
VKing
4fc7c3065e Rename to fnc_scriptedExplosive 2016-01-11 23:41:33 +01:00
VKing
01dd663337 Add fnc_detonateExplosiveTrigger 2016-01-11 23:36:34 +01:00
bux
ec0ece059f use Killed event, fix missing public setVar
add more text, don't delete dead unit
2016-01-10 20:58:54 +01:00
bux
09e4a6a76e cleanup SwitchUnits 2016-01-10 19:08:28 +01:00
PabstMirror
c2f780e95f #1259 - Medical Locations Boost Training 2016-01-09 23:54:48 -06:00
PabstMirror
dd979676fd Remove use of CAManBase for all mans
End use of bandaid from #1294
2016-01-09 22:05:40 -06:00
PabstMirror
82179636f3 Cache hearing firedNear 2016-01-09 18:51:41 -06:00
PabstMirror
63a79b9920 Use Function Caching in CBA 2016-01-09 01:36:19 -06:00
PabstMirror
a161008eb7 Fix count/forEach 2016-01-09 01:15:09 -06:00
PabstMirror
ed4cc42897 Cleanup Interaction Menu 2016-01-08 23:29:32 -06:00
commy2
62f589ac84 remove deprecated functions 2016-01-08 15:56:32 +01:00
PabstMirror
54397abaa2 AB - Handle subsonic ammo when not defined
Fix #3062
- Add basic AB configs for subsonic russian bullets.
- When building ab ammo cache, if round is subsonic and does not have AB
configured
attempt to use the parent's config, scaled down to the subsonic's round
speed.
2016-01-07 15:06:12 -06:00
PabstMirror
066976766f Show beaufort dots on wind display -for color Blind
Show dots on the wind display so color blind can still determine wind
level
Replace PR #1308
2016-01-07 10:34:31 -06:00
PabstMirror
9d14ff8b03 Merge branch 'master' into deterministicOverheatingX 2016-01-06 23:25:24 -06:00
commy2
de13518177 explode macro to params 2016-01-06 22:49:22 +01:00
commy2
e56e18bff3 Code cleanup 1.54 2016-01-06 22:42:02 +01:00
VKing
9985988987 Change ACE_Player to _unit 2016-01-06 18:05:06 +01:00
jokoho48
daf2fc2669 remove ccp issue in settings
prevent setCaptive if unit is wake up
2016-01-06 18:01:24 +01:00
jokoho48
6d49bbda28 add delay to Unconsciousness Captivity(posible fix for #3121) 2016-01-06 17:46:59 +01:00
commy2
abf516aeb1 manual merge 2016-01-06 15:57:09 +01:00
PabstMirror
4c229c92f5 Add Stringtable Entry 2016-01-05 17:29:01 -06:00
PabstMirror
b6dce03c90 Fix Header 2016-01-05 17:16:47 -06:00
VKing
1706ca0adc Move detonate actions from "Detonate" layer to "Explosives" layer.
Remove inconsistent ">>" from explosive actions.
2016-01-06 00:06:06 +01:00
VKing
cc8ac69feb Add function and action to detonate all explosives on a detonator 2016-01-05 23:47:01 +01:00
Glowbal
c042703786 Merge branch 'release' 2016-01-05 22:55:34 +01:00
Glowbal
509e142de8 bump version 3.4.2 2016-01-05 22:42:37 +01:00
PabstMirror
175624620c Fix inverting wind direction each sync update
Fix #1052 (and maybe #1708)
2016-01-05 15:29:52 -06:00
commy2
7eaa55f9df Merge pull request #3022 from acemod/bodybagevent
add event for placing units in body bags
2016-01-05 21:59:47 +01:00
commy2
74f78c2dd1 Merge pull request #3010 from acemod/cargoboxfilters
Add more filters to ammo boxes
2016-01-05 21:55:24 +01:00
commy2
279b48f112 Merge pull request #3110 from acemod/gogglesfiredBIS
fix usage of deprectated fired XEH, fix #3088
2016-01-05 21:52:53 +01:00
commy2
3854a5c989 Merge pull request #3109 from acemod/ThingX
fix ThingX capitalization, fix #3076
2016-01-05 21:52:42 +01:00
PabstMirror
e2c08d2c26 Privates, Headers, Merge 4 PFEH into one 2016-01-05 01:39:29 -06:00
PabstMirror
46cb90254a Add ACE_HashLocation to common 2016-01-04 21:48:26 -06:00
Luigi
7f9c766770 Fixed and added French Translation 2016-01-04 16:47:15 +01:00
Luigi
a079f213c0 Fix French translation
Fix an error in a French translation
2016-01-04 16:19:23 +01:00
PabstMirror
a72e07fcaa Goggles - change some events to be client only
all these events have `if (_unit != ACE_player) exitWith {true};`
2016-01-03 11:01:14 -06:00
Alessandro Foresi
bafde22c71 Fix: Indentation 2016-01-03 16:47:41 +01:00
commy2
3974c255a0 fix usage of deprectated fired XEH, fix #3088 2016-01-03 15:27:16 +01:00
commy2
427628045c fix ThingX capitalization, fix #3076 2016-01-03 15:21:38 +01:00
commy2
ecad63e34d integrate filters pbo into inventory pbo 2016-01-03 14:47:37 +01:00
jonpas
b93183fef9 Shorten if check 2016-01-03 14:05:50 +01:00
Alessandro Foresi
2d152675fc Add: IT small translations, DE removed duplicate 2016-01-03 13:02:01 +01:00
Alessandro Foresi
c16d97cad0 Merge branch 'master' into translation/15bn/alef 2016-01-03 12:23:27 +01:00
Braxton Williams
ce069c8f3c Change Sandbag category 2016-01-02 18:25:48 -06:00
jonpas
6edd7ab093 Change ACE_HeadlessClientJoined event to be global and always triggered 2016-01-02 14:42:05 +01:00
jonpas
a1866a561b Add Headless 2016-01-02 14:23:14 +01:00
bux
977bda83e5 add 2 new events, add unit to place event
defuse and explodeOnDefuse
2016-01-01 21:47:39 +01:00
Braxton Williams
99e2ee6110 Add sandbag to editor 2016-01-01 13:09:11 -06:00
PabstMirror
76c9e1560d Frag - only run addPfhRound on ammo that will frag
If spall is not enabled (default) then calculate which ammo types will
actually cause a frag event, cache and then only track those.
2016-01-01 02:33:08 -06:00
PabstMirror
79a7bb54aa Kill Spectator PFEH when exiting spectator
Should fix #2989
There is a race condition between these 4 PFEH and the "onUnload" event
in handleInterface.
If the PFEHs run first they will use nil variables and throw a script
error.
This sets them to nil immediately when exiting spectator
2016-01-01 00:14:48 -06:00
PabstMirror
5f74daec42 Fix dupe german stringtable entry 2015-12-31 22:28:35 -06:00
jonpas
33f91b2ee7 Remove duplicated line caused by merge 2016-01-01 03:52:37 +01:00
jonpas
ebf1321c0b Merge branch 'release' into fixFuelHoseExceededAfterDisconnect 2016-01-01 03:51:44 +01:00
PabstMirror
fb0738bd30 Merge branch 'master' into release 2015-12-31 20:27:26 -06:00
PabstMirror
32b4416c29 Merge pull request #3064 from GitHawk/refuel
Adaptation of fnc_makeJerryCan to new interact_menu
2015-12-31 20:12:43 -06:00
VKing
222b15634f Increase prep time for guided projectiles 2015-12-31 22:26:04 +01:00
PabstMirror
586449eef9 Merge pull request #3084 from acemod/cbaZeusIntegration
CBA zeus integration
2015-12-31 15:15:23 -06:00
PabstMirror
19f54071f1 Merge pull request #3052 from acemod/isPlayerRemoteZeus
Add support for non local Zeus RC in common-isPlayer
2015-12-31 15:14:44 -06:00
PabstMirror
62a94759c4 Merge pull request #3092 from acemod/minorSittingCleanup
Sitting Cleanup
2015-12-31 14:50:31 -06:00
PabstMirror
8bdd5d0597 Merge remote-tracking branch 'brGuy/Translations-December' into fixStringtablesMerge 2015-12-31 14:30:29 -06:00
licht-im-Norden87
2d64d54d98 Update German Stringtable
Iam sure there was a translation some time ago. Someone must have deleted it.

spelling mistake

Update Stringtable

100% some of them already existed in german language

Update stringtable.xml

spelling mistake

Update stringtable.xml

Iam not sure if SSWT is a Scharfschützenzweibein. However, it was used before, i just adpated it.

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Handelt es sich bei dem Modell den auch um das Produkt von Sharpshooters® http://shop.centermassinc.com/Sharpshooters-Sniper-Weapon-Tripod-Kit-764737932766.htm bzw ist ads erkennbar. Ich persönlich halte die Bezeichnung SSWT-Kit für ein wenig ungünstig.

Update stringtable.xml
2015-12-31 14:17:13 -06:00
PabstMirror
cf27571b5a Merge pull request #3007 from dudakov/master
Russian Translations - Update
2015-12-31 14:11:45 -06:00
PabstMirror
7b077c5f19 Merge pull request #3078 from acemod/fixGoggles3rd
Fix Third Person Goggle Effect Not Displaying
2015-12-31 10:24:23 -06:00
Thomas Kooi
40afa45417 Merge pull request #3058 from freghar/isturnedout
fix inverted isTurnedOut for map lighting
2015-12-31 13:03:42 +01:00
bux
23bec6d9a8 Merge master into branch 2015-12-31 10:20:47 +01:00
PabstMirror
2e211c5a04 Fix Medical Triagecard Macro
Fix #3087
2015-12-31 01:46:24 -06:00
PabstMirror
f11c2af921 Update XEH_clientInit.sqf 2015-12-30 14:55:25 -06:00
PabstMirror
d372111d3f Sitting Cleanup
- Add modern privates
- Don't add actions, canInteractWith, or EH if not enabled
2015-12-30 12:23:35 -06:00
bux
0e8eb5fac4 Remove obsolete hotkey entries 2015-12-30 11:23:52 +01:00
bux
d6c5643790 improve code style 2015-12-30 09:43:19 +01:00
bux
2a6042bf61 add interaction position and defuse object position
and reduce interaction distance
2015-12-30 09:11:57 +01:00
PabstMirror
72fe95c797 Add "isNotInZeus" to canInteractWith
Re-fix #1951 (CTRL+V from climb blocking paste in zeus)
2015-12-30 01:48:43 -06:00
PabstMirror
1e29c0286f Remove Keybinds/Events for Zeus now handeld in CBA
Close #2937
2015-12-30 01:07:55 -06:00
bux
112c002b0b remove ace_offset entry
Ported from AGM and simply renamed. It wasn't even used in AGM.
2015-12-29 20:57:55 +01:00
dixon13
356bd36728 Changed action name
- Changed display name for extraction action on civilians to match the new action name 'Get Out'.
- Changed class name for extracting civilians out of vehicles to match the action name
2015-12-29 09:27:43 -07:00
dixon13
f2b3275538 Changed action name
Changed extraction action to 'Get Out' to match other civilian actions.
2015-12-29 09:25:33 -07:00
dixon13
d410fe42d9 Fixed misspell
'_targe' is suppose to be '_target'
2015-12-28 22:00:08 -07:00
PabstMirror
462e37e6d1 Update Heating / Cooling physics numbers
Attempting to update numbers based on real physics.
Effects will increase heat generated per shot and decrease cooling
- ~1.333x increased heating
- ~1.45x less cooling
2015-12-28 21:01:56 -06:00
PabstMirror
415402b5ad Cleanup and debug
Fix missing weapon configs

Fix Dispersion (Radians / Degrees)

Fix comment
2015-12-28 16:08:32 -06:00
PabstMirror
42b350a40c Cache Weapon Configs 2015-12-28 16:04:56 -06:00
PabstMirror
e587a6e6e3 Modernize code 2015-12-28 16:04:56 -06:00
PabstMirror
3020023f58 setVariablePublic - Use waitAndExecute 2015-12-28 16:04:55 -06:00
esteldunedain
c1e8b3dba9 Fix temperature bar color 2015-12-28 16:04:55 -06:00
esteldunedain
f132955d9f Reenable refraction fx but make it optional for the moment. 2015-12-28 16:04:55 -06:00
esteldunedain
d001131314 Tweak and optimize the smoke effect to increase smoke and reduce performance impact 2015-12-28 16:04:54 -06:00
esteldunedain
3c74c4bada Fix temperature indicator to max out red at half the bar 2015-12-28 16:04:54 -06:00
ulteq
4122d68684 Adjusted temperature display (red above 600°C) 2015-12-28 16:04:54 -06:00
ulteq
a1ee99cc8a Remove debug code 2015-12-28 16:04:53 -06:00
ulteq
7858b65fde Fixed misspelled function name 2015-12-28 16:04:53 -06:00
ulteq
0a27c309cb Added missing variable definitions 2015-12-28 16:04:52 -06:00
commy2
f83206353d jamming 2015-12-28 16:04:52 -06:00
Nicolás Badano
4264789631 Refactored code so the weapon temperature is correctly updated when checking it 2015-12-28 16:04:52 -06:00
Nicolás Badano
ac67e45098 overheating: sync weapon temperature across the net, deterministic pseudo-random bullet dispersion 2015-12-28 16:04:51 -06:00
Nicolás Badano
932e17cea4 fix 2015-12-28 16:04:51 -06:00
Nicolás Badano
fb56350217 small fixes 2015-12-28 16:04:51 -06:00
Nicolás Badano
de902ca4fd Modify setVariablePublic so it published inmediately if the variable hasn't being publishes recently. Then establish an embargo time before it can be published again. 2015-12-28 16:04:50 -06:00
jonpas
c0aaf05eaf Prevent interaction if unit(s) climbing the ladder, Disable tilting, Split adjust string into adjust and tilt 2015-12-27 19:28:29 +01:00
PabstMirror
dc60860421 Fix Third Person Goggle Effect Not Displaying
#3074
2015-12-26 23:31:49 -06:00
dixon13
a4781a20d3 Authors 2015-12-23 19:27:55 -07:00
dixon13
2a98aa57ed Delete fnc_canInteractWithCivilianVehicle.sqf
No need to create another funciton
2015-12-23 11:54:41 -07:00
dixon13
d3a1110250 Removed a portion of the condition 2015-12-23 11:52:23 -07:00
dixon13
5f7e833d43 Removed "PREP(canInteractWithCivilianVehicle)"
Function is being removed
2015-12-23 11:51:19 -07:00
dixon13
21daa331dc Changes to ACE_Unload
- added semi-colon
- changed the condition
- changed the statement
2015-12-23 11:49:17 -07:00
dixon13
1aa192f7e0 Extract civilans from vehicles, rmeoved actions from civilians in vehicles 2015-12-23 00:19:41 -07:00
Githawk
2432ac3319 Changed scope for carried objects 2015-12-22 17:54:16 +01:00
Githawk
d16417a00b Changed scope on nozzle 2015-12-22 17:49:58 +01:00
Githawk
ebb28177b1 More fixes to make jerryCan work 2015-12-21 17:54:52 +01:00
Glowbal
c1fa81f28b Fix tabs in sqf files 2015-12-21 17:05:48 +01:00
Githawk
d9e7a43bf7 Fixes error with new interact_menu 2015-12-21 16:53:25 +01:00
jokoho48
0addb592d3 remove Unused Varaible in AB
fix private in AB
2015-12-21 02:29:10 +01:00
VKing
38fb97aeac Fixed init problem; added mortar ammo boxes 2015-12-20 20:51:44 +01:00
VKing
73720f9313 Too hasty 2015-12-20 18:20:34 +01:00
VKing
b7bd468fdd That ought to not have worked before 2015-12-20 18:18:33 +01:00
freghar
a383da5b2d fix inverted isTurnedOut for map lighting
According to the comment, the idea is to provide unobscured map when
inside an enclosed vehicle (!isTurnedOut).

Signed-off-by: freghar <freghcz@gmail.com>
2015-12-20 11:53:08 +01:00
PabstMirror
9b0641c06f Add nil return for count 2015-12-19 21:17:36 -06:00
PabstMirror
74aec45921 Fix medical menu not closing on range, litter dir
- Medical Menu didn't close when target moved out of range
- Litter was always created in the same direction
2015-12-19 20:50:57 -06:00
VKing
450a18e13a Forgot to disable in case the setting's set to "no" (but why would you ever want to 2015-12-19 21:29:37 +01:00
VKing
f75311917c Upped mortar round mass 2015-12-19 20:49:09 +01:00
VKing
b4cb5c2ba7 Changed mortar initialization to getIn; Zeus-controlled AI will not trigger the init. 2015-12-19 19:54:45 +01:00
VKing
85270e4521 Fix init issue 2015-12-19 18:22:54 +01:00
VKing
a37d97103f Erk 2015-12-19 16:37:30 +01:00
VKing
a336707623 Fixed initialization, added exclude variable to prevent initialization of individual guns (for e.g. AI mortars) 2015-12-19 16:30:01 +01:00
VKing
dfe7c07936 Fix fnc_mortarInit, fnc_loadMagazine, some other stuff 2015-12-19 12:10:12 +01:00
VKing
2c4a25a6c0 Mortar init functions 2015-12-19 02:18:35 +01:00
PabstMirror
4d041c3c94 Merge pull request #3049 from acemod/fixlaserdesignator
Remove undefined laser selfdesignate macro
2015-12-18 12:09:04 -06:00
Jonathan Pereira
ad48f51ec7 Added PT-BR translations
All remaining translations of gestures, hearing, interact_menu,
interaction, nightvision, rearm, refuel, viewdistance were done!
2015-12-18 15:14:19 -02:00
PabstMirror
c53a0541a4 Add support for non local Zeus RC in common-isPlayer 2015-12-18 11:08:10 -06:00
Jonathan Pereira
db7074b6cf Removed duplicated German entry 2015-12-18 14:45:20 -02:00
commy2
e3ecc64771 remove undefined macro 2015-12-18 13:53:25 +01:00
VKing
579f861b8f Unload to player inventory 2015-12-17 19:25:22 +01:00
VKing
27890a8dab First try at some module control 2015-12-17 11:00:46 +01:00
VKing
a0fdc58ed7 Remove unused variables, spaces 2015-12-17 09:13:23 +01:00
VKing
d8c8d02177 Port inventory picture and model 2015-12-17 00:21:54 +01:00
VKing
e0a21ce144 Completed code porting and interaction 2015-12-16 23:47:14 +01:00
VKing
3e6fc52733 First working iteration.
Todo:
Implement in module (Choose new or old/don't break old missions)
Magazine UI+model
Add preparing delay
Fix function readmes
Cleanup in functions?
Credits
MP Testing
2015-12-16 20:22:18 +01:00
PabstMirror
43a9865fa2 Use isNil for better future compatiblity 2015-12-16 12:10:53 -06:00
PabstMirror
360bdcb50e Optics - Don't modify camera for ThreeDen Editor
Fix broken ThreeDen Camera when returning to editor from preview.
PIP will still work in preview.
Will have to take a look at 1.56 RC to see if command exists and
eventually cleanup.
2015-12-16 11:28:43 -06:00
PabstMirror
ff3ddbe287 Building Interact - Dummy object instead of hiding
Fix #3038
InteractiMenu now checks `isObjectHidden`,
So now use dummy object instead of hiding a real one
2015-12-15 12:04:03 -06:00
PabstMirror
7258a0084a Merge pull request #2995 from acemod/repairThreshholdToolkit
Fix PostRepairDamage and toolkit consumtion setting
2015-12-14 19:30:19 -06:00
PabstMirror
f2bcd66784 Toolkit also consumed on fullRepair 2015-12-14 19:28:31 -06:00
PabstMirror
886c13f6a9 Merge pull request #3013 from acemod/bloodyLitter
Fix litter for adv - Add bloody p3d for Pack/qClot
2015-12-14 19:23:51 -06:00
PabstMirror
0b5b11c966 Merge pull request #3014 from acemod/fixNameSanatize
Sanitize less/greater-than symbol to square
2015-12-14 19:23:07 -06:00
PabstMirror
e5abb59f1d Merge pull request #3011 from acemod/rhsMergeERA
RHS Compat - Combine all ERA Hitpoints
2015-12-14 19:22:51 -06:00
commy2
e6be1537cd replace more private with private keyword in common 2015-12-14 13:17:48 +01:00
commy2
bfa29246be replace private with private keyword in other half of common 2015-12-14 13:08:19 +01:00
PabstMirror
9064579a65 Send string to serverLog instead of strucText
Fix `Performance warning: SimpleSerialization::Read
'ace_common_remoteFnc' is using type of ,'TEXT' which is not optimized
by simple serialization, falling back to generic serialization, use
generic type or ask for optimizations for these types`
2015-12-13 13:27:46 -06:00
VKing
170095ae35 Initial commit for mortar ammunition handling. 2015-12-13 18:27:13 +01:00
commy2
bd3c79f739 add function to retrieve the control of the stamina bar 2015-12-12 20:25:42 +01:00
commy2
7f63d51ccb add event for placing units in body bags 2015-12-12 18:21:11 +01:00
commy2
2839cff753 common code fixes 2015-12-12 17:26:47 +01:00
commy2
3d5ea74c7e replace private with private keyword in first half of common 2015-12-12 16:48:54 +01:00
jonpas
4c2d92d360 Negate fuel hose connected condition 2015-12-12 15:12:50 +01:00
PabstMirror
a501c7e1c3 Remove new models and just combine existing litter 2015-12-11 19:47:40 -06:00
jonpas
e5f64bcdc1 Fix refuel PFH not exiting on nozzle disconnect 2015-12-11 22:45:28 +01:00
PabstMirror
24d77d1b7c Fix Typo 2015-12-11 12:17:05 -06:00
PabstMirror
db50b5313d getName can return raw or sanatized html tags 2015-12-11 12:01:50 -06:00
commy2
ff95aab100 remove helmets from items filter 2015-12-11 15:05:43 +01:00
commy2
ee7f8f82f5 remove debug 2015-12-11 14:24:54 +01:00
commy2
5d9a057165 add more filters to ammo boxes 2015-12-11 14:18:11 +01:00
commy2
2b63b2efa8 add more filters to ammo boxes 2015-12-11 13:14:58 +01:00
PabstMirror
c7b6375092 Sanitize less/greater-than symbol to square
Fix #2912
The raw `&lt;` showed up in nametags and anything besides strucText
`[ / ]` is fairly close and will work in either text mode.
2015-12-10 23:29:05 -06:00
PabstMirror
e9be05209a Fix litter for adv - Add bloody p3d for Pack/qClot
Fix #2950
Get correct bloodLossOnSelection for both basic and advanced
Adds bloody versions of packing bandage and quickClot
2015-12-10 22:58:44 -06:00
PabstMirror
ee0812ad15 RHS Compat - Combine all ERA Hitpoints
Put all ERA hitpoints (up to 46 of them) onto a single point
and put that point on the main interaction point
2015-12-10 20:57:23 -06:00
commy2
68388bc976 add more filters to ammo boxes 2015-12-11 01:02:15 +01:00
bux
8e6a057f52 fix common stringtable 2015-12-10 18:48:00 +01:00
kaban
fd06472f4d Russian Translations - Update 2015-12-10 20:32:16 +03:00
[OMCB]kaban
aec2c3fef2 HotFix: removed duplicated key.
Removed duplicated German key for STR_ACE_Common_DoNotForce.
It caused Tabler.exe couldn't read stringtable files.
2015-12-10 18:24:28 +03:00
PabstMirror
f3b7b3b94f Merge pull request #2994 from acemod/microDagrListBoxKeyblock
MicroDagr - Prevent Home Key being blocked
2015-12-10 09:20:06 -06:00
PabstMirror
a71cce1981 Merge pull request #2987 from acemod/gesturesCleanup
Setting For Gestures - Fix BI* gestures
2015-12-10 09:19:35 -06:00
commy2
077b9827e8 code cleanup fcs 2015-12-10 16:00:14 +01:00
commy2
7748131e73 code cleanup markers 2015-12-10 15:32:31 +01:00
commy2
a08cf69149 tweak size of laserpointer, fix #2975 2015-12-09 22:56:14 +01:00
havena
6f0568c370 fix Unexpected stringtable format
Unexpected stringtable format inside <Text ID="STR_ACE_Common_CheckPBO_Action_WarnPerm"><German>
2015-12-09 20:18:15 +01:00
PabstMirror
3ae7cd15bd cleanup stringtable phrasing 2015-12-09 12:27:47 -06:00
PabstMirror
3d560108a3 Setting For Gestures - Fix BI* gestures 2015-12-08 23:08:09 -06:00
PabstMirror
0eed4799af MicroDagr - Prevent Home Key being blocked
Fix #2974
2015-12-08 21:31:03 -06:00
PabstMirror
e964b2c135 Fix PostRepairDamage and toolkit consumtion setting
Fix #2982
2015-12-08 20:31:40 -06:00
PabstMirror
cae9f436f6 Merge branch 'release' 2015-12-08 15:14:33 -06:00
Glowbal
0599b35fc6 Bump version to 3.4.1 2015-12-08 14:47:48 +01:00
PabstMirror
38bf869f07 Also Fix Rearm 2015-12-07 14:07:03 -06:00
PabstMirror
cd68f9b320 Fix refuel unconc error - Man unloading for air 2015-12-07 13:54:41 -06:00
Thomas Kooi
05c56f73b5 Change disable NVG with sights by default
As discussed on Slack, we are changing the default behaviour infavor of excepted gameplay.
2015-12-07 18:33:20 +01:00
PabstMirror
39edd205f0 Merge pull request #2942 from acemod/CzechTables
Czech Translations - Update
2015-12-07 09:32:00 -06:00
bux578
fbde1dd794 Merge pull request #2941 from acemod/DieStringtables
Update German Stringtables
2015-12-07 10:27:11 +01:00
bux578
821ccf5726 fix medical menu stringtable name 2015-12-07 10:21:48 +01:00
bux578
af31d43567 fix german typos 2015-12-07 10:20:35 +01:00
PabstMirror
358228f5bb Cleanup De Stringtables 2015-12-06 15:03:15 -06:00
commy2
9fa62c6d2a clean up vehicles config 2015-12-06 11:18:07 +01:00
gienkov
56e919dccc nozzle additonal check condition 2015-12-06 06:47:19 +01:00
gienkov
1132efaf48 ceil number of wounds 2015-12-06 02:57:21 +01:00
gienkov
f6e7cad678 remove Original entries 2015-12-05 22:08:39 +01:00
PabstMirror
b13656e54b addDamageToUnit - Disable debug / testing code 2015-12-05 12:19:34 -06:00
Thomas Kooi
761d6e28d8 Merge pull request #2939 from acemod/fixMicroDagrDefines
MicroDagr - Add #undef to config for pboProject
2015-12-05 11:29:25 +01:00