jonpas
|
d931eb4e15
|
Improve XEH adding in cargo
|
2016-04-03 14:17:16 +02:00 |
|
jonpas
|
357045a0ed
|
Merge pull request #3518 from ColdEvul/CargoAndInteractionCase
Carry, drag and load metal and plastic cases
|
2016-04-03 11:43:11 +00:00 |
|
jonpas
|
3abb3d321c
|
Merge branch 'master' into customTaggingTextureSupport
|
2016-04-03 13:41:26 +02:00 |
|
jonpas
|
f4074e981a
|
Merge pull request #3529 from acemod/tagEvents
Throw a globalEvent when a tag is created.
|
2016-04-03 11:38:24 +00:00 |
|
jonpas
|
caf06f58c8
|
Add map altitude to GPS - fix #3650
|
2016-04-02 18:53:34 +02:00 |
|
nomisum
|
5c87161118
|
fixed logic problem
|
2016-04-02 15:53:39 +02:00 |
|
nomisum
|
02e3e1c7ec
|
Merge remote-tracking branch 'refs/remotes/acemod/master'
|
2016-04-02 15:39:44 +02:00 |
|
nomisum
|
fed4662884
|
changed suggested lines to ace standards
|
2016-04-02 15:36:21 +02:00 |
|
Nicolás Badano
|
ec2c331bd9
|
Merge pull request #3644 from J3aLeiNe/master
fnc_getMGRSdata update1
|
2016-04-02 09:23:29 -03:00 |
|
commy2
|
a7cf010f7a
|
Merge pull request #3648 from acemod/fixtagging_master
fix script error in tagging
|
2016-04-02 10:12:38 +02:00 |
|
J3aLeiNe
|
4576ea0194
|
abbottabad altitude fix
altitude 0 for altitude 1256
|
2016-04-02 09:50:50 +02:00 |
|
PabstMirror
|
84c5a0d266
|
FCS - Minor firedEH optimization
|
2016-04-01 21:51:22 -05:00 |
|
jonpas
|
31953c5d52
|
Merge pull request #3635 from acemod/fixInvertedGestureStopFreeze
Fix inverted gestures Stop and Freeze and minor gestures cleanup
|
2016-04-01 19:30:48 +00:00 |
|
jonpas
|
723d27fc99
|
Rename tagging action classes
|
2016-04-01 21:29:03 +02:00 |
|
jonpas
|
fbaae2beb3
|
Fix stringtable casing
|
2016-04-01 21:25:00 +02:00 |
|
jonpas
|
9f7f176b1f
|
Merge branch 'master' into customTaggingTextureSupport
|
2016-04-01 21:24:31 +02:00 |
|
J3aLeiNe
|
d4a7d864aa
|
fnc_getMGRSdata update1
|
2016-04-01 11:53:33 +02:00 |
|
J3aLeiNe
|
093da2badf
|
Merge branch 'master' into master
|
2016-03-31 22:22:50 +02:00 |
|
PabstMirror
|
e104b0ac55
|
Merge pull request #3640 from acemod/fixZeusAutoAdd
Delay calling addCuratorEditableObjects for a frame
|
2016-03-31 10:04:44 -05:00 |
|
J3aLeiNe
|
c998ab622e
|
fnc_getMGRSdata update1
fnc_getMGRSdata update1
|
2016-03-31 14:41:09 +02:00 |
|
bux578
|
076803951d
|
Merge pull request #3628 from alef/translation/15bn/alef
Italian translation
|
2016-03-31 06:54:31 +02:00 |
|
commy2
|
92af6ffe2e
|
add cargo space to csat attack heli (can transport 8 troops)
|
2016-03-31 01:03:40 +02:00 |
|
commy2
|
28468bec82
|
specify helicopter cargo spaces, fix #3591
|
2016-03-31 00:57:04 +02:00 |
|
Joko
|
6038ab89c9
|
improve Code to String
|
2016-03-30 23:02:52 +02:00 |
|
PabstMirror
|
6f412c312a
|
Delay calling addCuratorEditableObjects for a frame
Fixes createVehicle not always being added on dedicated server.
|
2016-03-30 10:26:33 -05:00 |
|
PabstMirror
|
a83c3b5219
|
Merge pull request #3623 from acemod/fixAbTerrainProcessor
Fix AB Terrain Extension
|
2016-03-29 13:08:14 -05:00 |
|
commy2
|
89428dc55c
|
Merge pull request #3624 from acemod/compatPboWarnings
Compat pbo warnings
|
2016-03-29 17:01:53 +02:00 |
|
commy2
|
a4c848a090
|
formating
|
2016-03-29 17:00:54 +02:00 |
|
jonpas
|
ec2be36e81
|
Use boolean
|
2016-03-29 16:25:55 +02:00 |
|
jonpas
|
2d22b06150
|
Add README.md to gestures and update author URL
|
2016-03-29 16:08:33 +02:00 |
|
jonpas
|
330977a709
|
Remove including DIK KeyCodes definitions, use decimal codes, Improve BI gesture handling even further
|
2016-03-29 16:03:41 +02:00 |
|
jonpas
|
3489dd48bb
|
Remove unused gestures, Improve stringtabling and remove duplicate
|
2016-03-29 15:51:51 +02:00 |
|
commy2
|
49f6904f9e
|
Merge pull request #3634 from acemod/fixerrornoname
fix FUNC(setName) for Zeus and alive spawned units
|
2016-03-29 15:48:19 +02:00 |
|
jonpas
|
c24c1b9dc0
|
Fix inverted Stop and Freeze - prone Stop will still be freeze due to BI animation being wrong
|
2016-03-29 15:39:32 +02:00 |
|
commy2
|
4e1b2dd24a
|
just delay setName one frame
|
2016-03-29 15:32:05 +02:00 |
|
commy2
|
1f6f90a5b2
|
fixerrornoname
|
2016-03-29 13:59:07 +02:00 |
|
commy2
|
666a4030b5
|
make FUNC(scriptedExplosive) work in scheduled env, ref #3621
|
2016-03-29 13:21:13 +02:00 |
|
jonpas
|
6469b11f3c
|
Cleanup tagging, use internal getTexture for getting texture from color, move tag size definition
|
2016-03-28 20:07:02 +02:00 |
|
jonpas
|
dc1af390cd
|
Allow custom texture for tagging (only direct function call)
|
2016-03-28 18:44:30 +02:00 |
|
PabstMirror
|
bcde9f8ed6
|
Filter minor falling damage to non-leg hitpoints
|
2016-03-28 01:15:58 -05:00 |
|
Alessandro Foresi
|
e97c7c0f65
|
Translation: IT completed (with BOM)
|
2016-03-27 21:22:15 +02:00 |
|
Alessandro Foresi
|
e5a7578f92
|
Translation: IT completed (no BOM)
|
2016-03-27 21:20:15 +02:00 |
|
PabstMirror
|
e90609d043
|
Fix AB Terrain Extension
|
2016-03-24 12:23:48 -05:00 |
|
PabstMirror
|
86ad2ab415
|
Only warn for weapon compat if AB is on
|
2016-03-24 11:53:55 -05:00 |
|
PabstMirror
|
b0df31783d
|
Merge branch 'master' into compatPboWarnings
|
2016-03-24 11:23:29 -05:00 |
|
SzwedzikPL
|
9b1b4a46fa
|
better polish translation
|
2016-03-23 17:17:16 +01:00 |
|
SzwedzikPL
|
cdcde46a7d
|
Fix double displayName in medical settings
|
2016-03-22 13:05:47 +01:00 |
|
SzwedzikPL
|
10d20472d3
|
Remove grass behind the trench
|
2016-03-22 11:26:40 +01:00 |
|
SzwedzikPL
|
203c059cc1
|
move placement data to config, setTrenchPlacement fnc, cleanup
|
2016-03-22 08:10:37 +01:00 |
|
Nicolás Badano
|
b4f6dbbc18
|
Merge pull request #3568 from acemod/settingsNameDescp
Ace_Settings - add name,descption,categories
|
2016-03-21 21:24:22 -03:00 |
|
SzwedzikPL
|
d6e9890b1b
|
Add remove trench and continue digging trench actions
|
2016-03-21 18:25:38 +01:00 |
|
esteldunedain
|
ec2920ed35
|
Improve protractor accuracy. Close #3606
|
2016-03-20 22:24:30 -03:00 |
|
commy2
|
5aeb19312b
|
fix script error in tagging
|
2016-03-20 17:09:03 +01:00 |
|
commy2
|
a841839aa6
|
don't overwrite helicopter sub class self actions
|
2016-03-19 19:37:26 +01:00 |
|
SzwedzikPL
|
8555f00889
|
remove needless tolower from mortarinit
|
2016-03-18 17:26:37 +01:00 |
|
Thomas Kooi
|
daceaa9dd8
|
Merge branch 'master' into settingsNameDescp
|
2016-03-18 14:48:11 +01:00 |
|
Thomas Kooi
|
e8b26a7a14
|
Merge pull request #3593 from BaerMitUmlaut/release
Fixed fastroping race condition
|
2016-03-18 12:07:43 +01:00 |
|
BaerMitUmlaut
|
fc06782256
|
Fixed broken ropeDetach
|
2016-03-18 00:16:31 +01:00 |
|
BaerMitUmlaut
|
b25ffdb54f
|
Fixed network race condition
|
2016-03-18 00:15:57 +01:00 |
|
commy2
|
5e52e22e81
|
Merge branch 'release' into fixNametagsRank
|
2016-03-17 20:14:40 +01:00 |
|
PabstMirror
|
218d333738
|
Fix nametag error when rank is empty string
|
2016-03-17 11:56:20 -05:00 |
|
Glowbal
|
485900dce8
|
increment patch version
|
2016-03-16 22:59:28 +01:00 |
|
Thomas Kooi
|
559d111e66
|
Merge pull request #3584 from SzwedzikPL/fixmk6mortarinit
Fix mortar ammo handling init on dedicated
|
2016-03-16 22:48:49 +01:00 |
|
commy2
|
0c42bb5345
|
Merge branch 'release' into revc65656a0
|
2016-03-16 22:44:19 +01:00 |
|
jonpas
|
72c9e9da39
|
Replace usage of filter to select in tagging
|
2016-03-16 20:17:23 +01:00 |
|
jonpas
|
c568c18865
|
Add module icon
|
2016-03-14 19:14:52 +01:00 |
|
jonpas
|
89924e927a
|
Disable debug
|
2016-03-14 17:25:20 +01:00 |
|
Nicolás Badano
|
8ff4fb8851
|
Merge branch 'release' into revc65656a0
|
2016-03-14 12:21:11 -03:00 |
|
esteldunedain
|
14183470bc
|
Revert "Improved rope glitchyness"
This reverts commit c65656a016.
|
2016-03-14 12:16:23 -03:00 |
|
SzwedzikPL
|
32846014a1
|
fix ammo handling init on dedicated
|
2016-03-14 14:21:02 +01:00 |
|
PabstMirror
|
2ab169eb73
|
Merge branch 'release' into FixTrue
|
2016-03-12 13:46:44 -06:00 |
|
PabstMirror
|
1985e7e20a
|
Fix versioning true when compiled
|
2016-03-12 13:42:52 -06:00 |
|
Thomas Kooi
|
61f1959109
|
Fix morphine increasing viscosity
Morphine should decrease viscosity instead of increase. Closes #3579
|
2016-03-12 18:55:42 +01:00 |
|
commy2
|
fca8b51bb2
|
reset interaction menu time variables on save game load
|
2016-03-12 17:08:08 +01:00 |
|
esteldunedain
|
aad79eda85
|
The dead shouldn't interact (it's not TWD)
|
2016-03-12 10:06:45 -03:00 |
|
jonpas
|
32c32b6cc5
|
Add stamina bar selective UI
|
2016-03-09 18:58:46 +01:00 |
|
PabstMirror
|
ad3a03a9c7
|
versioning - Add warnings for missing compat PBOs
|
2016-03-08 13:52:34 -06:00 |
|
PabstMirror
|
94adcf4ccb
|
MicroDagr Scalar Values
|
2016-03-08 13:17:20 -06:00 |
|
esteldunedain
|
3122542814
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
|
2016-03-08 15:25:04 -03:00 |
|
esteldunedain
|
69bd858167
|
Merge branch 'fr-fix-quotes' of https://github.com/BaerMitUmlaut/ACE3 into BaerMitUmlaut-fr-fix-quotes
Conflicts:
addons/fastroping/CfgMoves.hpp
addons/fastroping/CfgVehicles.hpp
|
2016-03-08 15:24:23 -03:00 |
|
Thomas Kooi
|
bfe738ba80
|
Merge pull request #3513 from acemod/cbaVersioning
Add CBA 2.3.1 to versioning check
|
2016-03-08 19:21:36 +01:00 |
|
Thomas Kooi
|
ddd8187b19
|
Merge pull request #3534 from GitHawk/refuel_isEngineOn
Disallow refueling with running engine
|
2016-03-08 19:20:28 +01:00 |
|
esteldunedain
|
2b33dd7686
|
Merge branch 'fr-ai-deploy' of https://github.com/BaerMitUmlaut/ACE3 into BaerMitUmlaut-fr-ai-deploy
Conflicts:
addons/fastroping/XEH_preInit.sqf
|
2016-03-08 15:13:50 -03:00 |
|
esteldunedain
|
88f4c49c08
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
|
2016-03-08 15:08:53 -03:00 |
|
esteldunedain
|
afe835816f
|
Merge branch 'fr-fixes' of https://github.com/BaerMitUmlaut/ACE3 into BaerMitUmlaut-fr-fixes
Conflicts:
addons/fastroping/CfgVehicles.hpp
|
2016-03-08 15:07:45 -03:00 |
|
commy2
|
4ceb1b34b8
|
Merge pull request #3566 from acemod/removeDragCarryFromCannons
Disable drag and carry for StaticCannon
|
2016-03-08 19:05:04 +01:00 |
|
jonpas
|
70100825cf
|
Fix params in clientInit
|
2016-03-08 18:49:19 +01:00 |
|
PabstMirror
|
1a77b0fcd4
|
Disable drag and carry for StaticCannon
#3528
|
2016-03-08 11:43:35 -06:00 |
|
jonpas
|
e90ef30904
|
Add return value to public setElementVisibility function
|
2016-03-08 18:42:37 +01:00 |
|
jonpas
|
23e2617db8
|
Change params order and improve clientInit
|
2016-03-08 18:40:23 +01:00 |
|
Thomas Kooi
|
60af0d3162
|
Merge pull request #3456 from acemod/StandardizeConfigArrayGVAR
Standardize GVAR array brackets in configs.
|
2016-03-08 18:19:50 +01:00 |
|
jonpas
|
64fe944b0f
|
Add public setter function, Optimize some checks
|
2016-03-08 18:12:01 +01:00 |
|
PabstMirror
|
3232654e13
|
Close #3565 -Fix spelling of local var _woundEffectiveness
|
2016-03-08 11:02:54 -06:00 |
|
PabstMirror
|
b5e95f3945
|
Add some names/descriptions to settings configs
|
2016-03-08 01:17:40 -06:00 |
|
commy2
|
e605ede04a
|
execute addActionEvents in unscheduled env
|
2016-03-08 01:19:32 +01:00 |
|
BaerMitUmlaut
|
35857f4523
|
Cleanup canPrepareFRIES
|
2016-03-07 20:42:13 +01:00 |
|
Thomas Kooi
|
d86f58f418
|
Merge pull request #3525 from acemod/sandbag3den
Set sandbag side to civ to show in 3den
|
2016-03-07 19:30:24 +01:00 |
|
Thomas Kooi
|
8946779c1a
|
Merge pull request #3527 from acemod/fixHrCallbackVar
Fix empty callback for hr adjustment
|
2016-03-07 12:51:23 +01:00 |
|
BaerMitUmlaut
|
c65656a016
|
Improved rope glitchyness
|
2016-03-06 20:33:23 +01:00 |
|
BaerMitUmlaut
|
84af4b7676
|
Force open ramps on helicopters
|
2016-03-06 19:53:37 +01:00 |
|
commy2
|
a85c5b14cf
|
Merge pull request #3547 from acemod/fixsavegamecrashmaybe
Store Interact Menus on CBA Namespaces
|
2016-03-06 19:28:26 +01:00 |
|
commy2
|
a9578ab473
|
Merge pull request #3524 from acemod/fixCancelAction
Fix Cancel (RMB) Action
|
2016-03-06 19:16:40 +01:00 |
|
commy2
|
81c29d8120
|
Merge pull request #3551 from acemod/disableOnlyActionMenuOnMouseHint
Disable only action menu on mouse hint and modifier where unnecessary
|
2016-03-06 19:13:10 +01:00 |
|
commy2
|
391aaeba89
|
Merge pull request #3548 from acemod/namespaceforcargofilters
use namespace for cargo filters, fixes problem with save games
|
2016-03-06 19:10:53 +01:00 |
|
commy2
|
c90775091e
|
Merge pull request #3549 from acemod/fixmagincompat
remove obsolete fix, fix #3545
|
2016-03-06 19:10:45 +01:00 |
|
jonpas
|
858c68f8d7
|
Don't use modifier for rotation where not needed
|
2016-03-06 16:54:27 +01:00 |
|
jonpas
|
c378cd9f12
|
Disable action menu on mouse hint with inGameUISetEventHandler rather than showHud, as showHud disables UI script commands
|
2016-03-06 16:47:46 +01:00 |
|
jonpas
|
f956675d35
|
Merge pull request #3542 from acemod/refuelGlobalEvents
Replace execRemoteFnc with events and increase fuel update delay in refuel
|
2016-03-06 16:23:02 +01:00 |
|
jonpas
|
b47b887a21
|
Fix event name already being used
|
2016-03-06 16:20:16 +01:00 |
|
jonpas
|
9b46e8856e
|
Merge modules, Add base allow client settings toggle, Add requires descriptions
|
2016-03-06 15:41:17 +01:00 |
|
jonpas
|
a064c0c98d
|
Modernize code
|
2016-03-06 12:50:16 +01:00 |
|
jonpas
|
0dc1e37874
|
Merge branch 'master' into uiSettings
|
2016-03-06 12:41:27 +01:00 |
|
jonpas
|
52007fab6a
|
Add sanity checks, fix explosives checks
|
2016-03-06 12:06:17 +01:00 |
|
commy2
|
79db282aca
|
remove obsolete fix, fix #3545
|
2016-03-06 09:12:49 +01:00 |
|
commy2
|
8892aeed9d
|
missed one
|
2016-03-06 07:55:34 +01:00 |
|
commy2
|
8603f2062a
|
simplify
|
2016-03-06 07:14:43 +01:00 |
|
commy2
|
f43b287093
|
use namespace for cargo filters, fixes problem with save games
|
2016-03-06 06:53:59 +01:00 |
|
commy2
|
6a58af5b33
|
fix save game crash?, ref #3397
|
2016-03-06 06:22:38 +01:00 |
|
esteldunedain
|
ae8cbb4834
|
Add "check temperature" and "swap barrel" actions for AARs
|
2016-03-05 23:33:30 -03:00 |
|
jonpas
|
ae3a41e6d8
|
Move common event handlers closer to their counterparts
|
2016-03-06 02:38:05 +01:00 |
|
Nicolás Badano
|
de6af27912
|
Merge pull request #3492 from acemod/Fix3491_MortarBoxes
Replace transportMax... with maximumLoad for mortar boxes.
|
2016-03-05 22:09:07 -03:00 |
|
Nicolás Badano
|
9f205b4a54
|
Merge pull request #3509 from acemod/fix3379
Increase interaction distance with explosives from 1m to 1.5m.
|
2016-03-05 22:08:31 -03:00 |
|
Nicolás Badano
|
1d3950bfff
|
Merge pull request #3497 from acemod/liteDrag
Fix portable light floating / dir when carrying
|
2016-03-05 22:07:43 -03:00 |
|
Nicolás Badano
|
e2c2495d52
|
Merge pull request #3496 from looterz/bftbug
Fix for player markers not showing up correctly with BFT_ShowPlayerNames
|
2016-03-05 22:05:33 -03:00 |
|
esteldunedain
|
e15d534fd1
|
Rename event, removing prefix. Back to square one.
|
2016-03-05 21:11:53 -03:00 |
|
BaerMitUmlaut
|
8e895e8cff
|
Added gantry hiding animation
|
2016-03-05 23:21:10 +01:00 |
|
BaerMitUmlaut
|
b20e433f43
|
Fixed bug with fastroping simultaneously
|
2016-03-05 23:20:44 +01:00 |
|
BaerMitUmlaut
|
8039332743
|
Switched to preStart + XEH_PREP
|
2016-03-05 23:19:53 +01:00 |
|
BaerMitUmlaut
|
21d546ac1c
|
Added note concerning BIS_fnc_guiMessage
|
2016-03-05 21:22:45 +01:00 |
|
PabstMirror
|
721aa94a29
|
Merge pull request #3536 from acemod/dediCaps
Fix captivity system on dedicated
|
2016-03-05 14:08:53 -06:00 |
|
BaerMitUmlaut
|
b8a4349c10
|
Added deployment API and waypoint
|
2016-03-05 20:25:35 +01:00 |
|
jonpas
|
9463b05218
|
targetEvent -> objectEvent
|
2016-03-05 18:16:09 +01:00 |
|
jonpas
|
881eaf951a
|
Move setVectorDirAndUp and setHitPointDamage events to common, Make refuel set nozzle position execute only on target where local
|
2016-03-05 18:07:07 +01:00 |
|
jonpas
|
589ca27b60
|
Fix missing comma
|
2016-03-05 18:02:21 +01:00 |
|
jonpas
|
015a60e6c4
|
Increase fuel update to 1s
|
2016-03-05 17:44:03 +01:00 |
|
jonpas
|
401d457a46
|
Replace execRemoteFnc with global/targetEvent in refuel
|
2016-03-05 17:41:47 +01:00 |
|
esteldunedain
|
6cf9787fd1
|
Fix travis warning
|
2016-03-05 13:18:41 -03:00 |
|
esteldunedain
|
ebfd76107e
|
The function name was changed in CBA
|
2016-03-05 13:15:56 -03:00 |
|
esteldunedain
|
62f598b2a6
|
Use the correct CBA function name, defining it in ACE as long as it doesn't exist already.
|
2016-03-05 13:11:20 -03:00 |
|
jonpas
|
b37b1a39b2
|
Allow string input for isBackpack
|
2016-03-05 14:29:04 +01:00 |
|
nomisum
|
e36198561f
|
Merge remote-tracking branch 'refs/remotes/acemod/master'
|
2016-03-05 12:43:27 +01:00 |
|
PabstMirror
|
4826a89ef5
|
Fix captivity system on dedicated
Fix #3532
|
2016-03-04 11:45:38 -06:00 |
|
GitHawk
|
0b3abd55d3
|
Disallow refueling with running engine
|
2016-03-04 13:59:14 +01:00 |
|
esteldunedain
|
5450954fc2
|
Rename the event as "ace_tagging_tagCreated"
|
2016-03-04 09:16:42 -03:00 |
|
esteldunedain
|
02616ebbb2
|
Throw a globalEvent when a tag is created. Close #3521.
|
2016-03-03 19:43:26 -03:00 |
|
PabstMirror
|
e3deebff7e
|
Fix empty callback for hr adjustment
Fix #3526
Same issue as #3384
|
2016-03-03 13:23:53 -06:00 |
|
PabstMirror
|
53a36f8783
|
Add REQUIRED_CBA_VERSION macro to script_mod.hpp
|
2016-03-03 13:00:47 -06:00 |
|
PabstMirror
|
56c5343bd7
|
Set sandbag side to civ to show in 3den
ref #3102 #2633
|
2016-03-03 12:54:13 -06:00 |
|
jonpas
|
ef95e278f9
|
Fix Cancel Action by moving it to MouseButtonDown display EH
|
2016-03-03 17:35:43 +01:00 |
|
PabstMirror
|
137a512a9e
|
close main display if using incompatible cba
|
2016-03-02 16:33:29 -06:00 |
|