commy2
9c4121f3b1
replace ace_common_fnc_selectWeaponMode with CBA_fnc_selectWeapon
2016-02-20 23:30:40 +01:00
commy2
a67917c590
add deprecate log
2016-02-20 23:11:50 +01:00
licht-im-Norden87
cdb58b6233
common
2016-02-20 23:06:29 +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
ChairborneIT
0021bc08df
Added translation for most Italian stringtable entries
2016-02-20 21:39:05 +01: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
Thomas Kooi
95532ea521
Merge pull request #3333 from acemod/medicalEvents
...
Replace execRemoteFnc in ace_medical
2016-02-19 12:00:00 +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
bux
49f565f541
fix merging errors
2016-02-18 20:05:30 +01:00
bux578
93e655588b
Merge pull request #3294 from gienkov/pltranslations
...
pl translation
2016-02-18 19:38:43 +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
77f5aebf73
Merge pull request #3282 from acemod/eventLocationHash
...
Use location hash for ace events
2016-02-17 15:32:50 -06:00
PabstMirror
dccc1d33fd
Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge
2016-02-17 12:30:03 -06:00
commy2
1bc73af1c9
remove ace fake weapon from 3den cargo editor
2016-02-16 16:11:18 +01:00
esteldunedain
e2ed38609d
Replace driver by effectivCommander on EFUNC(common,getGunner) and EFUNC(common,firedEH)
2016-02-13 15:04:43 -03:00
licht-im-Norden87
b9083f1712
common
2016-02-10 17:17:26 +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
esteldunedain
8fbb6cd72e
Fixed event parameters
2016-02-06 20:49:18 -03:00
PabstMirror
1e66cd406b
Use location hash for ace events
2016-02-06 15:27:53 -06: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
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
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
commy2
d89c93de22
setAllGear - abort function and print warning when used on remote units,
2016-02-05 21:14:20 +01:00
esteldunedain
dbe7e294a5
Document the locality requirements of fnc_setAllGear. Close #3140
2016-02-05 10:18:36 -03:00
PabstMirror
54870f872a
Disable Debug
2016-02-04 13:16:41 -06:00
Nicolás Badano
cbafe05f76
Merge pull request #3082 from acemod/deterministicOverheatingX
...
Deterministic overheating (updated)
2016-02-04 16:03:30 -03:00
PabstMirror
35333cbe9d
Merge branch 'cargoCleanup'
2016-02-04 12:51:52 -06: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
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
PabstMirror
46d6e92bca
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
PabstMirror
c0eccc67c3
Change all SCALAR to NUMBER in headers
2016-01-28 18:19:15 -06:00
PabstMirror
7a7e0d689a
Improve underwater cargo unloading
2016-01-27 14:56:25 -06:00
PabstMirror
17a882fe4d
Add findUnloadPosition integration
2016-01-26 18:01:01 -06:00
PabstMirror
45138aea18
Merge pull request #3163 from acemod/unifiedStatusEffects
...
Unified status effect handler
2016-01-22 14:55:25 -06:00
VKing
999d8ac2ce
Use max
2016-01-22 00:01:13 +01:00
esteldunedain
f7cfbebc49
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into deterministicOverheatingX
2016-01-20 22:19:11 -03: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
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
esteldunedain
782934c4b2
Add the setApproximateVariablePublic function to common
2016-01-19 16:58:07 -03:00
esteldunedain
3792acd7f7
Merge branch 'master' into deterministicOverheatingX
2016-01-19 15:57:38 -03: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
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
8cbf31a375
Fix undefined variable error in FUNC(debug)
...
possibly related to #2677 - threw error from switchToGroupSide
2016-01-11 23:37:44 -06:00
commy2
62f589ac84
remove deprecated functions
2016-01-08 15:56:32 +01:00
PabstMirror
9d14ff8b03
Merge branch 'master' into deterministicOverheatingX
2016-01-06 23:25:24 -06:00
commy2
abf516aeb1
manual merge
2016-01-06 15:57:09 +01:00
PabstMirror
46cb90254a
Add ACE_HashLocation to common
2016-01-04 21:48:26 -06:00
Alessandro Foresi
c16d97cad0
Merge branch 'master' into translation/15bn/alef
2016-01-03 12:23:27 +01:00
PabstMirror
fb0738bd30
Merge branch 'master' into release
2015-12-31 20:27:26 -06:00
PabstMirror
586449eef9
Merge pull request #3084 from acemod/cbaZeusIntegration
...
CBA zeus integration
2015-12-31 15:15:23 -06:00
PabstMirror
cf27571b5a
Merge pull request #3007 from dudakov/master
...
Russian Translations - Update
2015-12-31 14:11:45 -06: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
PabstMirror
3020023f58
setVariablePublic - Use waitAndExecute
2015-12-28 16:04:55 -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
Glowbal
c1fa81f28b
Fix tabs in sqf files
2015-12-21 17:05:48 +01:00
PabstMirror
9b0641c06f
Add nil return for count
2015-12-19 21:17:36 -06:00
PabstMirror
c53a0541a4
Add support for non local Zeus RC in common-isPlayer
2015-12-18 11:08:10 -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
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
commy2
bd3c79f739
add function to retrieve the control of the stamina bar
2015-12-12 20:25:42 +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
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
PabstMirror
c7b6375092
Sanitize less/greater-than symbol to square
...
Fix #2912
The raw `<` 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
bux
8e6a057f52
fix common stringtable
2015-12-10 18:48:00 +01: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
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
cae9f436f6
Merge branch 'release'
2015-12-08 15:14:33 -06:00
PabstMirror
cd68f9b320
Fix refuel unconc error - Man unloading for air
2015-12-07 13:54:41 -06:00
PabstMirror
39edd205f0
Merge pull request #2942 from acemod/CzechTables
...
Czech Translations - Update
2015-12-07 09:32:00 -06:00
PabstMirror
358228f5bb
Cleanup De Stringtables
2015-12-06 15:03:15 -06:00
ProfessorCZ
cf41ac5fba
Czech Translations - Update
2015-12-04 22:28:10 -06:00
licht-im-Norden87
291f4df072
Update German Stringtables
...
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
kommas...........................................................................................................................................................
Rallypoint
Update stringtable.xml
slideshow, not finished yet
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
What does Curator mean in this context?
l. 294, l 302
cargo
Update stringtable.xml
Update stringtable.xml
I left a few things out. I'd like if someone gives me advice
Z.698 Pionier oder Instandsetzer o.Ä. Was genau ist die deutsche Bezeichung der Klasse in ACE bzw Arma?
Z.707 Ich habe mich einfach mal auf Mechatroniker festgelegt, da Reperaturspezialist sich doch ein wenig ungelenk anhört...
Update stringtable.xml
Habe engineer als Pionier übersetzt (halte es selbst für etwas unpassend) Der specialist ist bei mir zum Mechatroniker geworden.
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Fix Mistakes from merge
Fix Empty Entries
Fix Mistake
Fix
2015-12-04 22:06:44 -06:00
commy2
e418cfcf11
Merge pull request #2935 from acemod/fixbinoculars2
...
Fix binocular related bugs
2015-12-04 21:27:53 +01:00
commy2
5d43fa93c6
fix FUNC(binocularMagazine), fix #2916 , fix #2917 , fix #2918 , fix #2922 , fix #2928 , fix #2933
2015-12-04 19:37:37 +01:00
PabstMirror
91ace4fc9b
Fix whitelist string -> array error in checkPbo
...
Fix #2913
Use splitString instead of call compile to convert string into an array
2015-12-02 23:58:41 -06:00
PabstMirror
c928a0d6cb
Remove Sleep/WaitUntil from checkPBO
...
Fix #2910
2015-12-01 22:50:28 -06:00
commy2
861262e41c
revert false captitalization change
2015-11-30 17:56:25 +01:00
commy2
411a8d58f3
fix more setVariable and getVariable capitalization
2015-11-30 17:53:57 +01:00
commy2
5a1aae6028
manual merge
2015-11-30 17:44:15 +01:00
commy2
e422388484
fix waitUntil capitalization
2015-11-30 17:28:01 +01:00
commy2
a9ebcf8543
fix setVariable and getVariable capitalization
2015-11-30 17:27:09 +01:00
commy2
b3950bd7f0
fix forEach capitalization
2015-11-30 17:23:48 +01:00
commy2
2b05f6f451
fix isNil capitalization
2015-11-30 17:22:16 +01:00
commy2
5e41643cff
fix pushBack capitalization
2015-11-30 17:21:28 +01:00
commy2
d9b90258bc
fix typeOf capitalization
2015-11-30 17:19:57 +01:00
commy2
34d351c652
fix exitWith capitalization
2015-11-30 17:14:05 +01:00
commy2
0b84bb514b
fix Cfg capitalization
2015-11-30 17:09:26 +01:00
commy2
dcf0a68b80
Revert "fix Cfg capitalization"
...
This reverts commit 43bda9c462
2015-11-30 17:00:32 +01:00
commy2
43bda9c462
fix Cfg capitalization
2015-11-30 16:52:20 +01:00
PabstMirror
f676e6d9c9
Add some more typeNames replacements
2015-11-27 21:23:27 -06:00
PabstMirror
5850f78c1f
Merge branch 'master' into isEqualTypeRepalcement
2015-11-27 21:08:21 -06:00
PabstMirror
ca0cfc9bbf
Merge pull request #2861 from acemod/repairRebass
...
Repair Overhaul
2015-11-25 17:00:32 -06:00
PabstMirror
0b9044e3c7
Merge pull request #2753 from acemod/showHudSetter
...
Showhud setter
2015-11-25 11:16:21 -06:00
PabstMirror
ac6390c0b3
Add array info to header
2015-11-25 11:07:56 -06:00
SilentSpike
c731d83642
Merge pull request #2848 from acemod/fixForEachDeleteAt
...
fix Issue with forEach Loops and deleteAt Index
2015-11-25 14:00:37 +00:00
PabstMirror
36bf2d9cb5
Merge pull request #2803 from BaerMitUmlaut/remove-team-synching
...
Remove manual team synching
2015-11-24 21:37:50 -06:00
PabstMirror
ab769757d9
Skip Depends Hitpoints - Use HitPoints selPos for wheels
...
Stuff
Normalize Depends - Skip Glass Repair
Fix spawned wheel/track not having correct damage
getHitpointString robustness, hatchback fuelHitpoint, fix count errors
-
Formatting
local -> private
Fix Stuff
2015-11-20 21:11:50 -06:00
PabstMirror
4e93b9c72d
2307 - Repair sub-turrets
...
Privates
Cleanup debug
Add repair actions for sub turrets
Cleanup
Fix Header
Error Handling
Cleanup setHitpointDamage
Fix common ACE_isEngineer to handle scalar or bool
Claim and release repair objects (wheel/track)
Repair sub-turrets
2015-11-20 21:11:05 -06:00
Thomas Kooi
4a19fcc5a5
Merge pull request #2771 from BaerMitUmlaut/inWater-deprecation
...
inWater -> isUnderwater
2015-11-20 22:28:43 +01:00
PabstMirror
69b53af1d3
1.54 - Replace typeName with isEqualType
2015-11-20 11:40:31 -06:00
SilentSpike
d1dff4a24a
Merge branch 'master' into fixForEachDeleteAt
...
# Conflicts:
# addons/common/XEH_postInit.sqf
2015-11-18 13:27:04 +00:00
SilentSpike
49d4f233d9
Revert commit a718c82780
2015-11-18 13:19:12 +00:00
PabstMirror
5cbfe4f2a5
local -> private
2015-11-17 14:02:20 -06:00
PabstMirror
896615beb1
Merge pull request #2826 from acemod/settingsParamsArray
...
Read settings from paramsArray (params in description.ext)
2015-11-17 14:01:16 -06:00
PabstMirror
5823749f0c
Merge branch 'master' into settingsErrorChecking
2015-11-17 14:00:22 -06:00
PabstMirror
6d04156f69
local -> private
2015-11-17 13:56:55 -06:00
commy2
a57d1bca75
replace local keyword with private
2015-11-17 17:43:07 +01:00
SilentSpike
a718c82780
Implement nice index deletion iteration solution
...
Previously when iterating over an array and modifying the same array via deletion of the current index, incorrect means was used to account for the change in index resulting in any further deletions being applied to the wrong elements.
This solution does not require duplication of the array or the use of external variables to track the number of deleted elements. We simply lower the `_forEachIndex` by 1 whenever an element is removed.
2015-11-17 16:02:56 +00:00
jokoho48
561f6126dc
fix missing bracket
2015-11-17 13:34:34 +01:00
jokoho48
f3c5c64390
fix Issue with forEach Loops and deleteAt Index
2015-11-17 04:31:17 +01:00
PabstMirror
5b16638ae5
Always force param settings
2015-11-08 11:22:41 -06:00
PabstMirror
826b4fd20b
Cleanup
2015-11-06 20:53:05 -06:00
PabstMirror
e0506f29bc
Read settings from paramsArray (params in description.ext)
...
for now just limited to SCALAR/BOOL
2015-11-06 20:46:06 -06:00
PabstMirror
c91789f3c4
Merge remote-tracking branch 'refs/remotes/origin/master' into settingsErrorChecking
2015-11-06 20:30:12 -06:00
PabstMirror
a3443cae43
Merge pull request #2780 from acemod/fixTimeInComments
...
Changed ACE_time back to time in comments where appropriate
2015-11-04 13:04:05 -06:00
PabstMirror
cfba7c01e8
Merge branch 'master' into settingsErrorChecking
...
Conflicts:
addons/map_gestures/stringtable.xml
2015-11-03 12:09:36 -06:00
Joko
bd97c1ee96
fix Docu in waitUntilAndExecute
2015-11-02 12:05:43 +01:00
BaerMitUmlaut
8f473b4a27
Removed all assignTeam occurrences
2015-10-30 16:50:13 +01:00
commy2
049d40b96e
change description in function header
2015-10-28 19:02:54 +01:00
commy2
a0bfcdd04c
Revert "rename hasHatch to canTurnOut, change description in function header"
...
This reverts commit 932f09ce60
2015-10-28 19:01:47 +01:00
commy2
932f09ce60
rename hasHatch to canTurnOut, change description in function header
2015-10-28 18:57:47 +01:00
commy2
643f4d36dc
add FUNC(hasHatch)
2015-10-28 08:01:25 +01:00
VKing
069169cc72
Changed ACE_time back to time in comments where appropriate
2015-10-21 22:52:21 +02:00
BaerMitUmlaut
c227f05f8a
Deprecated isWater
2015-10-19 23:28:50 +02:00
PabstMirror
64de91ed06
Add warning for duplicate setting modules.
2015-10-18 23:34:11 -05:00
PabstMirror
16180686d2
PV GVAR(settings) after modules, add error debug
2015-10-18 18:49:03 -05:00
Glowbal
76efdbcc1c
Merge pull request #2257 from jonpas/parseList
...
Parse List Common Function
2015-10-18 12:14:18 +02:00
PabstMirror
fa7299ba1b
Add array info to header
2015-10-16 08:28:54 -05:00
PabstMirror
bec884e581
showHud handler
2015-10-15 22:33:05 -05:00
PabstMirror
616bc9f8a0
local-private waitAndXX PFEH
2015-10-04 11:38:31 -05:00
PabstMirror
f3e61e2136
Merge branch 'master' into commonCleanupX
2015-10-04 11:31:05 -05:00
commy2
d9595b6176
fix fnc_binocularMagazine on remote and dead units
2015-10-04 12:10:08 +02:00
commy2
42ce11cfee
Merge pull request #2679 from acemod/340missingmags
...
fix missing magazines after certain scenarios
2015-10-04 11:46:36 +02:00
commy2
040a63bd8f
Merge pull request #2254 from acemod/waitUntilAndExecute
...
Add WaitUntilAndExecute Function
2015-10-04 11:45:54 +02:00
commy2
a2b6166aa0
optimization waitUntilAndExecute, add comments
2015-10-04 11:43:13 +02:00
PabstMirror
59da3e1c35
Optimize PFEH Funcs
2015-10-03 23:05:46 -05:00
PabstMirror
c75d219b65
Cleanup Undefined Functions
2015-10-03 21:34:46 -05:00
commy2
38422e6586
fix missing magazines after certain scenarios
2015-10-04 01:26:38 +02:00
commy2
1fdedb5785
delay scroll wheel init
2015-09-30 19:29:17 +02:00
commy2
9f3615ea06
change function header of removeEventhandler and waitAndExecute to public: yes
2015-09-30 00:14:21 +02:00
PabstMirror
6e24d2868c
Fix playerChanged event
2015-09-28 22:41:45 -05:00
commy2
bc8cefa5e7
manual merge
2015-09-28 21:06:40 +02:00
commy2
34793ce044
Merge pull request #2635 from acemod/340interactcleanup
...
Code Cleanup Interaction
2015-09-28 21:04:28 +02:00
jonpas
4521df0a57
Add synchronizedObjects vehicle support to assignObjectsInList with an optional parameter
2015-09-28 16:17:12 +02:00
jonpas
db2572acfd
Merge branch 'master' into parseList
...
Conflicts:
addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
2015-09-28 16:06:32 +02:00
commy2
9189148b3f
more interaction cleanup
2015-09-28 15:37:18 +02:00
commy2
4b536425b1
Code Cleanup Interaction
2015-09-28 14:36:51 +02:00
commy2
a078d73230
Code Cleanup WeaponSelect
2015-09-27 08:51:42 +02:00
commy2
dc7d24a3fd
fix fixFloating resetting reflector hitpoints, close #2279
2015-09-26 14:38:50 +02:00
commy2
2fe142032e
rework modifier key, cleanup sandbags, tripod, ladder, fix #2590
2015-09-26 03:16:55 +02:00
jokoho48
4ad16ed938
fix that waitUntilAndExecute have a return
2015-09-25 13:29:39 +02:00
jokoho48
998fbcc403
Merge remote-tracking branch 'remotes/acemod/master' into waitUntilAndExecute
...
Conflicts:
addons/common/XEH_postInit.sqf
2015-09-25 13:19:19 +02:00
commy2
43cdfaecc0
Merge branch 'master' of https://github.com/acemod/ACE3
2015-09-25 11:15:46 +02:00
commy2
412685e0ff
fix some code was commented out in loadPersonLocal and unloadPersonLocal
2015-09-25 11:15:25 +02:00
PabstMirror
079d88ded7
Merge pull request #2509 from acemod/miscFixNilFunctions
...
Fix some nil functions
2015-09-21 20:36:09 -05:00
commy2
24f0df55a2
Merge pull request #2559 from acemod/340disableuserinputcleanup
...
Use CBA PFH in disableUserInput
2015-09-22 00:52:58 +02:00
jonpas
2e3014daa3
Merge branch 'master' into parseList
...
Conflicts:
addons/common/functions/fnc_assignObjectsInList.sqf
2015-09-21 22:46:01 +02:00
commy2
23e3db9cc0
use CBA pfh in disableUserInput and fix key input weirdness
2015-09-21 22:42:31 +02:00
commy2
f134a77e98
add and use deprecated macro
2015-09-21 22:09:54 +02:00
PabstMirror
d3c2420381
Merge branch 'master' into miscFixNilFunctions
...
Conflicts:
addons/common/functions/fnc_doAnimation.sqf
2015-09-21 15:08:43 -05:00
commy2
f8676afca4
use correct macro for rpt writing
2015-09-21 21:56:18 +02:00
commy2
441efcd65f
change version number in deprecated log
2015-09-21 21:48:18 +02:00
commy2
af309b937b
add depracted warnings
2015-09-21 21:25:18 +02:00
commy2
5a5242f1c9
more common code cleanup
2015-09-21 19:19:49 +02:00
commy2
8503d15c9b
more common code cleanup
2015-09-21 18:37:19 +02:00
commy2
1a4ebdac51
more common code cleanup
2015-09-21 17:32:21 +02:00
commy2
13b487e13b
fix missing ;
2015-09-21 17:13:28 +02:00
commy2
b5b5c761c4
fix missing '' in info log macro
2015-09-21 17:09:10 +02:00
commy2
3037181fc2
more common code cleanup
2015-09-21 17:00:53 +02:00
commy2
df3211cc42
more common code cleanup
2015-09-21 14:20:53 +02:00
commy2
b0f9eab1f7
more common code cleanup
2015-09-21 13:53:12 +02:00
commy2
5adca6616d
Merge branch '323cleanuphitpoints' into commoncleanup10
2015-09-21 13:24:12 +02:00
commy2
9fa6eb0651
more common code cleanup
2015-09-21 13:08:10 +02:00
commy2
ef099861a3
Merge pull request #2545 from acemod/commoncleanup9
...
common code cleanup part 9
2015-09-21 09:24:41 +02:00
commy2
d802cdfb23
more common code cleanup
2015-09-21 01:41:17 +02:00
commy2
d449e4bd83
more common code cleanup
2015-09-21 01:07:49 +02:00
Grzegorz
fe75aa55cf
Add missing english string
2015-09-21 00:39:13 +02:00
commy2
5f7d8c0095
more common code cleanup
2015-09-21 00:34:04 +02:00
commy2
1679235b51
more common code cleanup
2015-09-21 00:28:25 +02:00
PabstMirror
345b1f0f98
Merge branch 'master' into miscFixNilFunctions
...
Conflicts:
addons/common/functions/fnc_execPersistentFnc.sqf
addons/common/functions/fnc_execRemoteFnc.sqf
2015-09-20 17:02:49 -05:00
commy2
1d4eb209a4
fix missing ; in dumpPerformanceCounters
2015-09-20 23:50:30 +02:00
commy2
ffc5a16384
more common code cleanup
2015-09-20 23:40:51 +02:00
commy2
a98a45e5d1
more common code cleanup
2015-09-20 23:18:51 +02:00
commy2
62ec00a251
more common code cleanup
2015-09-20 22:36:05 +02:00
commy2
5fd1938f25
more common code cleanup
2015-09-20 22:29:38 +02:00
commy2
493ce1b092
more common code cleanup
2015-09-20 22:16:51 +02:00
commy2
2348c25e1a
more common code cleanup
2015-09-20 20:25:25 +02:00
PabstMirror
610fb0bb2c
Fix Merge
2015-09-20 11:28:43 -05:00
PabstMirror
7687374fcf
Merge branch 'master' into miscFixNilFunctions
...
Conflicts:
addons/common/functions/fnc_resetAllDefaults.sqf
2015-09-20 11:25:33 -05:00
commy2
0a01bbdc76
more common code cleanup
2015-09-20 16:56:35 +02:00
commy2
e62683a0c4
more common code cleanup
2015-09-20 16:40:49 +02:00
commy2
e8ebe87450
more common code cleanup
2015-09-20 15:52:40 +02:00
commy2
4c4785c140
Merge pull request #2535 from acemod/commoncleanup7
...
common code cleanup part 7
2015-09-20 11:06:38 +02:00
commy2
d33a98c612
set variable public didn't work / didn't work on server and headless client
2015-09-20 11:02:15 +02:00
commy2
8c8b23ec18
Merge pull request #2530 from acemod/commoncleanup6
...
common code cleanup part 6
2015-09-20 10:44:31 +02:00
commy2
dfa6d71a64
more common code cleanup
2015-09-20 00:55:58 +02:00
commy2
73a9c1b5f8
more common code cleanup
2015-09-19 23:18:07 +02:00
commy2
6b96c7fd7c
more common code cleanup
2015-09-19 22:27:23 +02:00
commy2
bfd5d13de8
more common code cleanup
2015-09-19 21:33:25 +02:00
bux578
450ee98004
Merge pull request #2515 from acemod/340fixinventoryeh
...
fix playerInventoryChanged eventhandler triggers when current weapon is changed fix #2513
2015-09-19 21:04:48 +02:00
commy2
09f133b7f8
more common code cleanup
2015-09-19 20:55:35 +02:00
commy2
3ddaa5ed4a
more common code cleanup
2015-09-19 20:34:07 +02:00
commy2
1636e3976d
more common code cleanup
2015-09-19 20:17:38 +02:00
commy2
cbc7f961b2
more common code cleanup
2015-09-19 19:40:56 +02:00
commy2
20a5c79431
more common code cleanup
2015-09-19 19:26:45 +02:00
commy2
fb71e0594e
lsd module, use global variable for color
2015-09-19 18:47:00 +02:00
commy2
e08c6c343e
fix LSD module, cutback on global variable usage
2015-09-19 09:24:28 +02:00
commy2
1357d72f16
fix broken LSD module
2015-09-19 02:44:02 +02:00
commy2
25d1e46422
Merge branch 'commoncleanup5' of https://github.com/acemod/ACE3 into commoncleanup5
2015-09-19 01:50:37 +02:00
commy2
c7d636a533
more common code cleanup
2015-09-19 01:50:17 +02:00
jokoho48
e7ff41a03c
Merge branch 'commoncleanup5' of https://github.com/acemod/ACE3 into commoncleanup5
2015-09-19 01:12:20 +02:00
jokoho48
f2070deee8
Change spawn while to CBA PFH
2015-09-19 01:12:03 +02:00
commy2
f8ecf1b8ab
fnc_debug was broken
2015-09-19 00:30:36 +02:00
commy2
56f4cbb39e
fix playerInventoryChanged eventhandler triggers when current weapon is changed fix #2513
2015-09-18 23:03:35 +02:00
commy2
85fd9d9d75
more common code cleanup
2015-09-18 21:46:21 +02:00
PabstMirror
5f0d73bab6
Cleanup more stuff
2015-09-18 14:24:20 -05:00
commy2
f3a175e9d6
remove obsolete private
2015-09-18 21:15:06 +02:00
commy2
5d0a7ed062
more common code cleanup
2015-09-18 21:12:40 +02:00
PabstMirror
c62ea5e406
Fix some nil functions
2015-09-18 13:47:19 -05:00
commy2
a53d158a89
Merge pull request #2501 from acemod/commoncleanup4
...
common code cleanup part 4
2015-09-18 19:54:04 +02:00
commy2
8704cd0321
fix additional bracket, formatting
2015-09-18 19:40:48 +02:00
commy2
a18f63d861
more common code cleanup
2015-09-18 19:12:38 +02:00
commy2
2674310e65
remove another deprecated function
2015-09-18 18:45:41 +02:00
esteldunedain
a621a0c693
Fixes to spanish translations
2015-09-18 13:36:57 -03:00
commy2
1fd2fcafb0
remove old, not working functions
2015-09-18 18:34:29 +02:00
commy2
1b96caedc0
more common code cleanup
2015-09-18 18:28:19 +02:00
esteldunedain
3422f5a7f1
Merge branch 'master' of https://github.com/Legolasindar/ACE3 into spanish-translation
...
Conflicts:
addons/medical/stringtable.xml
addons/repair/stringtable.xml
2015-09-18 13:20:22 -03:00
