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 |
|
Glowbal
|
8c0472bbeb
|
Merge branch 'master' of github.com:acemod/ACE3
|
2016-02-04 20:35:15 +01:00 |
|
Thomas Kooi
|
8741c3665d
|
Merge pull request #3261 from acemod/Fix-french-translation-string
Fix french translation refresh marker interval
|
2016-02-04 20:35:55 +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 |
|
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
|
9f62334713
|
Merge pull request #3228 from acemod/theTechnology
findUnloadPosition (Redo)
|
2016-02-04 19:44:49 +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
|
692ead07f1
|
Merge pull request #2264 from jonpas/make_versionFiles_subFolder_support
Add subfolder support to importantFiles and versionFiles to make.py
|
2016-02-04 19:35:15 +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 |
|
Lukas
|
714a885566
|
Merge pull request #1 from acemod/master
Update
|
2016-02-03 01:20:14 +01:00 |
|
PabstMirror
|
397a12056a
|
Merge branch 'master' into deterministicOverheatingX
|
2016-02-02 17:11:00 -06: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 |
|
esteldunedain
|
f744e164d3
|
Fix #3238 even if ACE_ScopeAdjust_Vertical = 0 or ACE_ScopeAdjust_Horizontal = 0
|
2016-02-01 14:58:01 -03:00 |
|
esteldunedain
|
8d437c91f1
|
Fix ace_scopes capturing native adjustment keys for the PSO scope. Close #3238
|
2016-02-01 14:42:11 -03:00 |
|
Felix Wiegand
|
4612652f8c
|
Use proper image URL
|
2016-02-01 18:16:55 +01:00 |
|
Nicolás Badano
|
1f9d817133
|
Merge pull request #3233 from fr89k/master
As bux578 requested: Added myself to AUTHORS.txt
|
2016-01-29 09:58:17 -03:00 |
|
fr89k
|
bd9587981d
|
Added email address for fr89k
|
2016-01-29 13:58:01 +01:00 |
|
fr89k
|
ddd63bf1a8
|
AUTHORS.txt now in alphabetical order
|
2016-01-29 13:54:57 +01:00 |
|
fr89k
|
d2296411d8
|
As bux578 requested: Added myself to AUTHORS.txt
Forgot to change the AUTHORS.txt in the last pull request
|
2016-01-29 13:45:52 +01:00 |
|
Thomas Kooi
|
665ac862ab
|
Merge pull request #3232 from fr89k/master
Added the correct preprocessor macro for parse_imagepath
|
2016-01-29 13:06:08 +01:00 |
|