Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,044 Commits 73 Branches 88 Tags 752 MiB
3c4a3c67db
Commit Graph

2738 Commits

Author SHA1 Message Date
Legolasindar
c7d3618d79 Update stringtable.xml 
fix spanish term
 2015-04-10 13:43:39 +02:00
Legolasindar
a224ec3371 Update stringtable.xml 
added spanish translation
 2015-04-10 13:43:07 +02:00
Legolasindar
f2a73ab9c6 Update stringtable.xml 
added some spanish translation
 2015-04-10 13:41:44 +02:00
Legolasindar
19da5b366e Update stringtable.xml 
added spanish translation
 2015-04-10 13:38:19 +02:00
Legolasindar
c741154ff2 Update stringtable.xml 
added spanish translation
 2015-04-10 13:36:17 +02:00
Legolasindar
6f69361a73 Update stringtable.xml 
added spanish translation
 2015-04-10 13:34:16 +02:00
Legolasindar
470a12ed46 Update stringtable.xml 
added spanish translation
 2015-04-10 13:19:26 +02:00
Legolasindar
a73c37ce05 Update stringtable.xml 
added spanish translation
 2015-04-10 13:14:33 +02:00
Legolasindar
e0fc44cfa8 Update stringtable.xml 
Added spanishtr translation
 2015-04-10 13:04:08 +02:00
ulteq
f7944381af Updated the .50 Cal airFriction values 2015-04-10 13:00:08 +02:00
Legolasindar
cf769e09fb Update stringtable.xml 
Add spanish translation
 2015-04-10 12:46:31 +02:00
ulteq
8f6bf930ee Added gun profiles for the new vanilla calibers 2015-04-10 12:41:29 +02:00
Legolasindar
52d476abd3 Update stringtable.xml 
Added spanisth translation, and two lines of english translation
 2015-04-10 12:29:44 +02:00
ulteq
bbfafdb5e1 Added missing private variable declaration 2015-04-10 11:43:47 +02:00
ulteq
77d39016fa Fixed an issue with zero ranges close to 0 meters. 2015-04-10 11:14:13 +02:00
Jo David
c258c6c00d fixing translation 2015-04-10 09:05:37 +02:00
Jo David
33a14076fc Merge branch 'master' of https://github.com/acemod/ACE3 into translations 
Conflicts:
	addons/captives/stringtable.xml
	addons/medical/stringtable.xml
 2015-04-10 09:01:24 +02:00
jaynus
6286d59bd9 Remove NVG from gunner optics on comanche. 2015-04-09 23:29:37 -07:00
jaynus
9e7d4c25bb Removes old value of stabalizing which broke gunner. Fixes #412 2015-04-09 23:28:41 -07:00
commy2
d5f190dff8 fix: getGunner returns null object when throwing grenades, planting explosives 2015-04-10 06:47:31 +02:00
commy2
105184ce88 fix: getGunner returns null object if pilot uses manual fire if no gunner is present 2015-04-10 06:36:09 +02:00
Anthariel
04bf321099 Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 06:31:42 +02:00
Anthariel
81122e0839 Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 06:30:49 +02:00
Anthariel
b5841f8f09 Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 06:28:59 +02:00
Anthariel
dd8f9cd8d6 Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 06:27:04 +02:00
Anthariel
0191abc529 Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 06:25:05 +02:00
Anthariel
523417ba3c Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 06:23:13 +02:00
Anthariel
0c851a6d9a Update stringtable.xml 
Added: French Translations (100%)
 2015-04-10 06:22:26 +02:00
Anthariel
95e53fd1bf Update stringtable.xml 
Added: French Translations (~85%)
 2015-04-10 06:20:04 +02:00
Anthariel
d6b2d13a72 Update stringtable.xml 
Added: French Translation (95%)
 2015-04-10 06:00:22 +02:00
commy2
5fe33fb1db rename cfgAce_Triggers to ACE_Triggers 2015-04-10 05:56:19 +02:00
Anthariel
0d8145073f Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 05:54:45 +02:00
Anthariel
627f8fb41b Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 05:53:29 +02:00
Anthariel
87f5873c2a Update stringtable.xml 
Added: French Translation (90%)
Fixed: Uknow to Unknow (line 101)
 2015-04-10 05:50:08 +02:00
PabstMirror
26d282c224 Explosives: Fix cursor interaction menu breaking 2015-04-09 22:46:19 -05:00
Anthariel
fb8c49135e Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 05:43:42 +02:00
Anthariel
d9986c6959 Update stringtable.xml 
Added: French Translation (75%)
 2015-04-10 05:40:22 +02:00
Anthariel
7280148f91 Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 05:37:10 +02:00
Anthariel
949cee6df4 Update stringtable.xml 
Added: French Translation (100%)
 2015-04-10 05:35:56 +02:00
Anthariel
e6adddb7fa Update stringtable.xml 
Added: French Translations (100%)
 2015-04-10 05:34:09 +02:00
Anthariel
29f06a7bd8 Update stringtable.xml 
Added: French Translation (100%).
 2015-04-10 05:29:00 +02:00
PabstMirror
170985295d Flashbangs: Medical Pain 2015-04-09 22:00:03 -05:00
PabstMirror
eb60910aab Flashbangs: eyePos LOS check, 3d eye direction 2015-04-09 21:58:45 -05:00
Kavinsky
a118cae13d unified ACE_Attachable config entry now ACE_Attachable its a string and hold the effect for the item 2015-04-10 04:36:28 +02:00
Kavinsky
b49fec58e6 Updated stringtable 2015-04-10 04:35:21 +02:00
Grzegorz
311e018ba7 weaponselect PL translation 2015-04-10 04:33:13 +02:00
Grzegorz
bf6984400f medical PL translation 
like a boss
 2015-04-10 04:30:39 +02:00
Kavinsky
adaee74a57 removed config redundancy 2015-04-10 04:00:26 +02:00
Kavinsky
999ad49fd0 removed duplicated debugging error 2015-04-10 03:58:14 +02:00
Grzegorz
3ffd7ac8c7 attach PL translation 2015-04-10 03:57:55 +02:00
Grzegorz
37be4f9e53 captives PL translation 2015-04-10 03:56:24 +02:00
Grzegorz
95be641918 common PL translation 2015-04-10 03:52:30 +02:00
Kavinsky
049edd1483 Added ACE Attach posibility to add more types of attachable items 2015-04-10 03:49:50 +02:00
Grzegorz
dcc07c84bc disposable PL translation 2015-04-10 03:43:34 +02:00
Grzegorz
6be80caf2e dragging PL translation 2015-04-10 03:41:12 +02:00
Grzegorz
d0787ab2d8 explosives PL translation 2015-04-10 03:40:03 +02:00
Grzegorz
ae1b2f04b0 fcs PL translation 2015-04-10 03:39:05 +02:00
Grzegorz
022e17417f frag PL translation 2015-04-10 03:37:30 +02:00
Grzegorz
2925100ec6 frag PL translation 2015-04-10 03:36:32 +02:00
Grzegorz
d874140268 hearing PL translation 2015-04-10 03:33:40 +02:00
Grzegorz
e907553abc interact_menu PL translation 2015-04-10 03:28:14 +02:00
Grzegorz
2984aa2e8c interaction PL translation 2015-04-10 03:26:03 +02:00
Grzegorz
aaa4dcba2c inventory PL translation 2015-04-10 03:19:37 +02:00
Grzegorz
e13199af2a laser_selfdesignate PL translation 2015-04-10 03:15:28 +02:00
Grzegorz
8b6ac39d1d laserpointer PL translation 2015-04-10 03:13:59 +02:00
Grzegorz
e0a2a144c5 logistics_wirecutter 2015-04-10 03:10:05 +02:00
Grzegorz
685d21169d magazinerepack PL translation 
Had to make some shifts in lines 70 and 93 to make it sound good in PL
 2015-04-10 03:03:03 +02:00
Grzegorz
6cbb6206c1 microdagr PL translation 
fixed typo in line 119
 2015-04-10 02:47:19 +02:00
Grzegorz
0f9614eb4f nametags PL translation 
SoundWaves :)
 2015-04-10 02:36:23 +02:00
Nicolás Badano
357fd1969b Merge pull request #406 from Legolasindar/patch-4 
Spanish: Update stringtable.xml
 2015-04-09 21:24:19 -03:00
Nicolás Badano
7e6e0d0ecd Merge pull request #402 from Legolasindar/patch-2 
Update stringtable.xml
 2015-04-09 21:24:00 -03:00
Grzegorz
5255c91408 optionsmenu PL translation 2015-04-10 02:20:22 +02:00
Grzegorz
03faa32cef overheating PL translation 2015-04-10 02:07:19 +02:00
Grzegorz
d193fd513f realisticnames PL translation 2015-04-10 02:02:59 +02:00
Grzegorz
a150ab43e1 Update stringtable.xml 2015-04-10 01:53:28 +02:00
Grzegorz
f61832f735 reload PL translation 2015-04-10 01:44:43 +02:00
jaynus
c1089dfffa Working save, distance shots are off. 2015-04-09 16:43:05 -07:00
Legolasindar
2a5e416dfc Update stringtable.xml 
fixed spanish terms
 2015-04-10 01:40:22 +02:00
Legolasindar
e63b9c7aa9 Update stringtable.xml 
added spanish translation
 2015-04-10 01:38:31 +02:00
Grzegorz
ce46961ef1 reloadlaunchers PL translation 2015-04-10 01:38:13 +02:00
Legolasindar
2456660867 Update stringtable.xml 2015-04-10 01:36:42 +02:00
Grzegorz
08590d98a3 respawn PL translation 2015-04-10 01:35:09 +02:00
Legolasindar
5a849fe8a4 Update stringtable.xml 
added spanish translation
 2015-04-10 01:33:08 +02:00
jaynus
2e9f6a7058 Better projected up/down. 2015-04-09 16:31:14 -07:00
Legolasindar
2542f994d6 Update stringtable.xml 
added spanish translation
 2015-04-10 01:29:52 +02:00
Grzegorz
aa8275460f weaponselect PL translation 2015-04-10 01:29:26 +02:00
Legolasindar
5f5ce47bec Update stringtable.xml 
fixed one term in spanish
 2015-04-10 01:26:06 +02:00
Grzegorz
df3927324a wep_javelin PL translation 2015-04-10 01:24:58 +02:00
Legolasindar
65b3566d41 Update stringtable.xml 
fixed spanish terms.
 2015-04-10 01:24:37 +02:00
Legolasindar
b8b151e62e Update stringtable.xml 
added spanish terms
 2015-04-10 01:20:39 +02:00
Clon1998
d7bdb48547 Update stringtable.xml 2015-04-10 01:15:20 +02:00
Legolasindar
df31442599 Update stringtable.xml 
added spanish terms
 2015-04-10 01:13:33 +02:00
Legolasindar
dc44b73a36 Update stringtable.xml 
updated spanish terms
 2015-04-10 01:12:31 +02:00
licht-im-Norden87
852f939430 whoops 2015-04-10 01:00:35 +02:00
Legolasindar
ed87e53c80 Update stringtable.xml 
Updated spanish terms.
 2015-04-10 00:48:51 +02:00
licht-im-Norden87
620d458cab Update stringtable.xml 2015-04-10 00:45:37 +02:00
licht-im-Norden87
7221042d7c Update stringtable.xml 2015-04-10 00:43:30 +02:00
licht-im-Norden87
7e78a7de18 Reload 2015-04-10 00:41:39 +02:00
licht-im-Norden87
fb5189be9a Overheating 2015-04-10 00:38:51 +02:00
Legolasindar
cef9a6454a Update stringtable.xml 
Updated spanish terms, on moved english to first raws.
 2015-04-10 00:38:24 +02:00
licht-im-Norden87
88336753d0 optionsmenu 2015-04-10 00:36:41 +02:00
jaynus
1eadcade72 Linear work javelin. 2015-04-09 15:34:42 -07:00
licht-im-Norden87
c18f7cafa6 Update stringtable.xml 2015-04-10 00:34:04 +02:00
licht-im-Norden87
03aa01c354 Update stringtable.xml 2015-04-10 00:31:52 +02:00
licht-im-Norden87
fbe214db74 Not yet completed 2015-04-10 00:29:45 +02:00
licht-im-Norden87
9cca9dbd80 Update stringtable.xml 2015-04-10 00:23:49 +02:00
licht-im-Norden87
6323a85f17 Update stringtable.xml 
<English>Field Dressing</English>
        <German>Notverband</German>
I dont know if a Notverband is the same as a Field Dressing.
 2015-04-10 00:23:20 +02:00
PabstMirror
c511431e61 Fix encoding problem 
Not sure why, but it was decoding the \a's: Warning:
z\ace\addons\main\config.cpp Line 556: ['MAIN',_this] execVM
'\zceddons\mainbout.sqf';-NOGIT
 2015-04-09 17:17:33 -05:00
Legolasindar
1dcbebc04c Update stringtable.xml 
Updated spanish terms
 2015-04-10 00:10:47 +02:00
Felix Wiegand
309eb7b3bf Merge pull request #399 from licht-im-Norden87/patch-1 
Stringtable: German additions
 2015-04-10 00:06:43 +02:00
Legolasindar
7b4d62c46c Update stringtable.xml 
Fixed spanish terms
 2015-04-10 00:05:47 +02:00
licht-im-Norden87
4522b45939 Update stringtable.xml 2015-04-10 00:03:46 +02:00
licht-im-Norden87
7f54ec34b6 Update stringtable.xml 2015-04-09 23:53:15 +02:00
licht-im-Norden87
1dc56cb1af Update stringtable.xml 2015-04-09 23:48:58 +02:00
licht-im-Norden87
7994441968 Update stringtable.xml 2015-04-09 23:48:21 +02:00
licht-im-Norden87
7d71d360b0 Update stringtable.xml 
Not quite convinced by my translation ... Flummi you better have a look
 2015-04-09 23:45:33 +02:00
licht-im-Norden87
2373e78245 Update stringtable.xml 2015-04-09 23:43:58 +02:00
licht-im-Norden87
828e19a268 Update stringtable.xml 2015-04-09 23:42:45 +02:00
licht-im-Norden87
2097a5f213 Update stringtable.xml 2015-04-09 23:42:15 +02:00
licht-im-Norden87
0986eb427d Update stringtable.xml 2015-04-09 23:41:10 +02:00
licht-im-Norden87
2304b46e2f Update stringtable.xml 2015-04-09 23:39:48 +02:00
licht-im-Norden87
a6f8e05cb8 Update stringtable.xml 2015-04-09 23:37:26 +02:00
licht-im-Norden87
ecf5eef638 Update stringtable.xml 2015-04-09 23:36:21 +02:00
licht-im-Norden87
3c4656522f Stringtable: German additions 2015-04-09 23:33:36 +02:00
licht-im-Norden87
00c37e0b9d Update stringtable.xml 2015-04-09 23:12:00 +02:00
jaynus
8fe11c36ee Linear altitude comparison. 2015-04-09 14:11:15 -07:00
licht-im-Norden87
2c7df9da6a Stringtable: German additions 2015-04-09 23:02:28 +02:00
Glowbal
84c8e02328 Merge pull request #396 from KoffeinFlummi/medicalCleanup 
Medical cleanup
 2015-04-09 22:13:31 +02:00
jaynus
198d4f3540 Fixed private variable overrides and timing failure. 2015-04-09 13:03:28 -07:00
PabstMirror
253614d442 Explosives: cancel placement when opening interact 
"zoomtemp" doesn't work for me, so this gives an additional way to
cancel.  It was also possible to start planting multiple explosives.
made a small change to make QGVAR(PlantingExplosive) always reset
 2015-04-09 14:48:27 -05:00
jaynus
01535c7f5c Merge remote-tracking branch 'origin/master' into allTheMissiles 
Conflicts:
	addons/wep_javelin/config.cpp
 2015-04-09 12:41:09 -07:00
Glowbal
d94943a9ff getting hitpoint damage on non existing hitpoint returns type instead of bool 2015-04-09 21:38:35 +02:00
Glowbal
093d340ee7 Changed: Dragging/carrying now works for units with broken legs 
Added unload and load of unconscious units
 2015-04-09 21:23:10 +02:00
ulteq
ab238cf404 Removed isDedicated checks 2015-04-09 20:39:38 +02:00
ulteq
5ff54f7d1c Implemented a new logic that decides when to use AB. 
*Added a new global variable ace_advanced_ballistics_enabled
*Added an updateTrajectoryPFH to the winddeflection (WD) module
*WD is now automatically disabled when AB is enabled
*The new updateTrajectoryPFH is called whenever AB aborts

-> Wind deflection is now always present (either through AB or WD)
-> AB no longer runs for non local units (unless they use high power optics)
 2015-04-09 20:27:10 +02:00
Glowbal
0926397ab4 Removed deadcode and obvious comments 2015-04-09 20:13:46 +02:00
Glowbal
39cbf21278 Removed deprecated carry functions 2015-04-09 20:12:30 +02:00
commy2
a6a19e956b flashsupressors for new weapons, #264 2015-04-09 19:59:08 +02:00
ulteq
5fe483cf33 Fixed incorrect function call 2015-04-09 19:12:39 +02:00
ulteq
377390d282 Added missing braces 2015-04-09 19:12:10 +02:00
jaynus
fe147c4986 Config expansion. 2015-04-09 09:39:23 -07:00
commy2
2d265ec6c2 prevent ai fro being stuck, #290 2015-04-09 16:54:50 +02:00
commy2
b41c6280ba prvent falling ai from being stcuk, fix #290 2015-04-09 16:52:59 +02:00
commy2
147fcdfa0c Merge pull request #392 from KoffeinFlummi/requiredaddons 
sorting out required addons for modularity
 2015-04-09 16:37:47 +02:00
esteldunedain
f0cc0941e5 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-09 10:05:38 -03:00
esteldunedain
8519bb04b7 Merge remote-tracking branch 'origin/removeRecoil' 
Conflicts:
	addons/recoil/config.cpp
 2015-04-09 10:05:14 -03:00
Nicolás Badano
c57044fd4a Merge pull request #390 from KoffeinFlummi/betterMapColors 
Improve map colors by taking them from A2
 2015-04-09 09:52:06 -03:00
esteldunedain
6447b39d1a Merge branch 'master' of github.com:KoffeinFlummi/ACE3 
Conflicts:
	addons/scopes/XEH_postInit.sqf
 2015-04-09 09:32:58 -03:00
esteldunedain
34639c153c Allow holding scope adjustment keys 2015-04-09 09:31:18 -03:00
KoffeinFlummi
3a871eed58 Merge branch 'master' into tools-cleanup 2015-04-09 13:37:19 +02:00
commy2
5ea35a01bb sorting out required addons for modularity 2015-04-09 13:23:29 +02:00
esteldunedain
99aa439561 Improve map colors taking them from A2 2015-04-09 01:28:36 -03:00
jaynus
bbfd28586b Apply ace_missileguidance to Titan. (Direct only) This is testing the extensible framework for mod makers. 2015-04-08 19:51:21 -07:00
PabstMirror
2033676e81 another undef to Make PBO-Project Happy 2015-04-08 18:20:00 -05:00
jaynus
5a9a8d239c Remove test parameters, timing correct. Attack profile selection working. 2015-04-08 15:52:58 -07:00
jaynus
0a1aae8553 Work save, timing correction. 2015-04-08 15:41:26 -07:00
jaynus
97230c2252 compensate for FPS lag. 2015-04-08 15:34:59 -07:00
jaynus
c89df1b04f Dir arc created. 2015-04-08 14:51:19 -07:00
jaynus
97febd6207 Disable debug, wtf math 2015-04-08 14:31:44 -07:00
ulteq
6626379a25 Added new 1.42 config data 2015-04-08 23:07:26 +02:00
jaynus
04b0efb22b Safer calling, build out attack profiles. 2015-04-08 13:57:08 -07:00
jaynus
cf876116a9 Working configuration based guidance framework. 2015-04-08 13:45:43 -07:00
commy2
3e3390750d manual merge 2015-04-08 22:01:41 +02:00
commy2
c5b38c8942 manual merge 2015-04-08 21:51:42 +02:00
commy2
1ae69d56ff Merge pull request #377 from KoffeinFlummi/142light 
142 directional light for map effects
 2015-04-08 21:46:48 +02:00
commy2
7346c194f4 Merge pull request #306 from KoffeinFlummi/optics 
Taosenai's Animated Optics req 1.42
 2015-04-08 21:41:12 +02:00
PabstMirror
c3564ee883 undef to Make PBO-Project Happy 2015-04-08 14:38:29 -05:00
jaynus
6f9203262a tweak default deflection values for testing 2015-04-08 12:32:33 -07:00
Glowbal
3702679ee4 fixed wrong value for radio disabled on waking up 2015-04-08 21:31:59 +02:00
ulteq
b5b15ba591 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics 2015-04-08 21:29:17 +02:00
ulteq
09cfddc338 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX 2015-04-08 21:28:50 +02:00
ulteq
a6e3d1917d Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500 2015-04-08 21:28:17 +02:00
jaynus
d2e3ea347a Merge remote-tracking branch 'origin/master' into allTheMissiles 2015-04-08 12:17:46 -07:00
PabstMirror
a4af1fcb30 Fix Marker Placement on UAV Map 2015-04-08 13:55:29 -05:00
jaynus
3946ee32d2 Fixes left/right issue. 2015-04-08 11:27:30 -07:00
commy2
3de3432664 Merge pull request #271 from KoffeinFlummi/142resting 
1.42 - Remove scripted weapon resting
 2015-04-08 20:26:13 +02:00
PabstMirror
2bc0976979 Merge pull request #277 from KoffeinFlummi/revert-276-revert-272-142menudeploy 
Revert "Revert "1.42 - cursor mode when bipod deployed""
 2015-04-08 13:26:05 -05:00
PabstMirror
023a2d2202 Merge pull request #267 from KoffeinFlummi/142Markers 
1.42 Marker Placement
 2015-04-08 13:24:55 -05:00
PabstMirror
176a39e86c Merge pull request #265 from KoffeinFlummi/142InventoryConfig 
1.42 Inventory Config
 2015-04-08 13:22:12 -05:00
PabstMirror
007e4fc234 Merge pull request #274 from KoffeinFlummi/142requiredaddons 
1.42 ensure ace is loaded after marksmen configs
 2015-04-08 13:21:33 -05:00
jaynus
bc7943d729 added todo 2015-04-08 09:18:11 -07:00
jaynus
87dac2c2ad Merge remote-tracking branch 'origin/master' into allTheMissiles 2015-04-08 08:55:14 -07:00
jaynus
177be598d7 Fixes: Laser designator now uses strongest ray result. 2015-04-08 08:48:08 -07:00
jaynus
64724737cd Code passing cleanup. 2015-04-08 08:35:24 -07:00
PabstMirror
af3d6a5113 #386 - Ace Options Menu on main menu 
Same limitations as CBA controls, needs a intro or mission loaded
Doesn't work with -skipintro command line.
 2015-04-08 10:33:12 -05:00
jaynus
61f5324d29 ACE_Settings entry for guidance. 2015-04-08 08:19:19 -07:00
jaynus
104dd2258e Guidance framework working. 2015-04-08 08:01:39 -07:00
ulteq
c1c5711e8d Fixed a typo 2015-04-08 13:58:22 +02:00
ulteq
823d834457 Replaced EGVAR(advanced_ballistics,Altitude) with EGVAR(weather,Altitude) 2015-04-08 12:56:34 +02:00
ulteq
e3626eca00 The winddeflection firedEH will now exit automatically, when the advanced_ballistics module is present. 2015-04-08 12:42:56 +02:00
ulteq
6d46567696 Overworked ATragMX canShow function 2015-04-08 11:44:09 +02:00
ulteq
f107b700a7 Fixed Kestrel4500 self interaction menu conditions 2015-04-08 11:26:12 +02:00
ulteq
f974e7a9a1 Removed duplicate Kestrel4500_ prefix 2015-04-08 11:25:15 +02:00
ulteq
9f2a862489 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500 2015-04-08 11:10:02 +02:00
ulteq
16ac43f733 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX 2015-04-08 11:08:53 +02:00
ulteq
78bb9193be Merge branch 'ATragMX' of https://github.com/KoffeinFlummi/ACE3 into ATragMX 
Conflicts:
	addons/atragmx/RscTitles.hpp
	addons/atragmx/functions/fnc_calculate_solution.sqf
	addons/atragmx/functions/fnc_calculate_target_range_assist.sqf
	addons/atragmx/functions/fnc_target_speed_assist_timer.sqf
 2015-04-08 11:08:28 +02:00
ulteq
15a594ccbc Removed duplicate ATragMX_ prefix 2015-04-08 11:05:28 +02:00
ulteq
4a469de0f8 Deleted an unused function 2015-04-08 11:01:53 +02:00
commy2
01a9374a26 Merge pull request #382 from KoffeinFlummi/disablebs 
disable cursor showing map position
 2015-04-08 10:48:31 +02:00
commy2
deece11689 remove debug 2015-04-08 10:47:56 +02:00
commy2
a47cdb9738 disable map cursor coordinates in mp 2015-04-08 10:45:57 +02:00
KoffeinFlummi
a209e49f1c Remove partname from patientInfoDisplay for basic. 2015-04-08 07:39:16 +02:00
KoffeinFlummi
1dcff94ec7 Remove hitpart from bandage action name 
Since the context of the interaction menu makes it clear what body part
you mean anyways, this is unnecessary.
 2015-04-08 07:35:31 +02:00
KoffeinFlummi
5bd1ee7ecd Do not use a treshold for unassigned damage. 2015-04-08 07:21:34 +02:00
esteldunedain
b18bcf8835 Add option to turn on/off cursor coordinates 2015-04-08 01:49:56 -03:00
commy2
691ab012b4 fix map loaded on preInit 2015-04-08 00:44:14 +02:00
commy2
4834facccf moving it to map 2015-04-08 00:30:36 +02:00
KoffeinFlummi
ce45237989 Report full version number in RPT for debugging 2015-04-08 00:27:00 +02:00
commy2
50dbbda8eb disable cursor showing map position 2015-04-08 00:20:43 +02:00
esteldunedain
ed3ac637d2 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-07 19:19:46 -03:00
PabstMirror
2f4335d3c2 #344 - Ignore missing ace_serverconfig on client 2015-04-07 17:14:27 -05:00
commy2
949c5d4333 manual merge 2015-04-07 23:26:16 +02:00
commy2
518c704db6 manual merge 2015-04-07 23:18:31 +02:00
esteldunedain
2d211e839f Further remove standalone { on code 2015-04-07 18:09:32 -03:00
commy2
2e66e57535 manual merge 2015-04-07 23:08:17 +02:00
esteldunedain
24750781aa Remove { on newlines 2015-04-07 18:03:30 -03:00
commy2
d1b8595c0e light intensity from object: handle campfires 2015-04-07 23:02:54 +02:00
ulteq
5dba9f7b3f Fixed inconsistent tabulation 2015-04-07 22:53:20 +02:00
PabstMirror
d060b13bbe #86 - Stretch gps info box to support 8 digits 2015-04-07 15:47:12 -05:00
ulteq
31b19a4ef3 Replaced tabs with spaces 2015-04-07 22:44:26 +02:00
ulteq
45e7194117 Fixed Readme 2015-04-07 22:40:27 +02:00
ulteq
4ea91d832e Fixed incorrect canShow function 2015-04-07 22:37:47 +02:00
commy2
b6c278e7d3 fix using efunc vs func 2015-04-07 22:33:35 +02:00
ulteq
07e6c89267 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX 2015-04-07 22:27:13 +02:00
ulteq
c3fbd8a195 Removed the old Kestrel module 2015-04-07 22:22:41 +02:00
commy2
96268b6407 directional light for map effects 2015-04-07 22:19:03 +02:00
ulteq
b60a8f2547 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics 2015-04-07 22:13:20 +02:00
ulteq
183034183e Resolved a minor issue between protractor and wind info 2015-04-07 22:02:38 +02:00
PabstMirror
6b0fb84f65 Cleanup / Headers 2015-04-07 15:01:44 -05:00
jaynus
bf70a9ba77 Tracers and colors 2015-04-07 12:59:35 -07:00
ulteq
ef3205e078 Replaced all <floats> with <NUMBER> 2015-04-07 21:54:29 +02:00
ulteq
c9ad2b279d Commented all advanced ballistics functions 2015-04-07 21:46:43 +02:00
jaynus
fa9cf0280c script error 2015-04-07 12:44:15 -07:00
commy2
88a5519465 cache the frames 2015-04-07 21:42:08 +02:00
PabstMirror
2ad9193475 Use DrawIcon for map tools 2015-04-07 14:38:35 -05:00
jaynus
d3d5554c49 Laser designation information localized to vehicle. 2015-04-07 12:35:34 -07:00
ulteq
a8cbcb14d3 Replaced tabs with spaces 2015-04-07 21:27:04 +02:00
ulteq
650c9592c8 Updated the readme 2015-04-07 21:24:09 +02:00
ulteq
26c8f9588a AdvancedBallistics is now always using the dll extension 2015-04-07 21:22:58 +02:00
commy2
14718eb5b4 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-07 21:22:21 +02:00
commy2
d825505aa0 cache light config properties 2015-04-07 21:22:00 +02:00
jaynus
0c3b51c28b Merge remote-tracking branch 'origin/master' into allTheMissiles 2015-04-07 12:12:05 -07:00
jaynus
2ea7ecdbf7 Working save. 2015-04-07 12:11:28 -07:00
Glowbal
14906c68c0 Merge pull request #374 from KoffeinFlummi/medicalImprovements 
Medical improvements
 2015-04-07 21:07:28 +02:00
Glowbal
ffbe9f0c71 Setting for getting rid of hitpoint damage after adv medical damage 2015-04-07 21:06:48 +02:00
ulteq
2a458f2e3d Removed Altitude and Latitude negation 2015-04-07 21:03:17 +02:00
ulteq
9fb640195a Removed weather hack 2015-04-07 21:02:57 +02:00
ulteq
b5b962bd4a Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into abIntegration 2015-04-07 20:59:37 +02:00
ulteq
5443d46f7b Default Altitude and Latitude are now read from the config 2015-04-07 20:59:05 +02:00
commy2
ba618a69ec Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-07 20:54:45 +02:00
commy2
722c2af4dc lightIntensity, handle soldier flashlights 2015-04-07 20:54:25 +02:00
Glowbal
c823826f17 Merge branch 'master' into medicalImprovements 2015-04-07 20:53:24 +02:00
ulteq
ab5518c35d Fixed a typo 2015-04-07 20:53:14 +02:00
Glowbal
2b341c2a8b left over CSE function calls removed 2015-04-07 20:50:44 +02:00
Glowbal
545014b073 missing return value 2015-04-07 20:47:36 +02:00
ulteq
2dfc9d7919 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX 2015-04-07 20:33:44 +02:00
ulteq
71886b7266 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500 2015-04-07 20:31:34 +02:00
ulteq
0a7552d46f Removed unnecessary canInteractWith check 2015-04-07 20:21:16 +02:00
ulteq
c94c1c1bcb Replaced tabs with spaces 2015-04-07 20:19:35 +02:00
Glowbal
ac3bda3135 improvements to displayPatientInformation. Bandaged wounds should be more clear now 2015-04-07 20:19:32 +02:00
ulteq
f6a9a007cc Fixed the readme 2015-04-07 20:11:50 +02:00
ulteq
a4e22986e0 Integrated the ATragMX into the ace interaction menu 2015-04-07 20:09:25 +02:00
esteldunedain
04d94bb7be Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-07 15:01:53 -03:00
esteldunedain
765ae4ee64 Merge branch 'master' into tabCleanup 
Conflicts:
	addons/explosives/functions/fnc_addClacker.sqf
	addons/explosives/functions/fnc_detonateExplosive.sqf
	addons/explosives/functions/fnc_getPlacedExplosives.sqf
	addons/explosives/functions/fnc_openDetonateUI.sqf
	addons/explosives/functions/fnc_openPlaceUI.sqf
	addons/explosives/functions/fnc_openTransmitterUI.sqf
	addons/explosives/functions/fnc_openTriggerSelectionUI.sqf
	addons/explosives/functions/fnc_placeExplosive.sqf
	addons/explosives/functions/fnc_place_Approve.sqf
	addons/explosives/functions/fnc_setPosition.sqf
 2015-04-07 15:00:56 -03:00
ulteq
a4c70fe616 Integrated the Kestrel 4500 into the ace interaction menu 2015-04-07 19:57:42 +02:00
Glowbal
526e24f133 formatting 2015-04-07 19:56:54 +02:00
Glowbal
3d82cb8eac Removed deprecated onTreatmentCompleted event 2015-04-07 19:54:24 +02:00
commy2
d34cfdb003 fix: day laser when being captured 2015-04-07 19:38:19 +02:00
ulteq
9fb26c2d18 Enabled the weather module 2015-04-07 19:21:07 +02:00
ulteq
f73bdfa148 Fixed several syntax errors in fnc_buttonPressed.sqf 2015-04-07 19:20:38 +02:00
Glowbal
7fb3ac6740 Added _x_ca suffixes to all item pictures 2015-04-07 19:16:56 +02:00
commy2
98f7125171 function to return light intensity recieved from another object 2015-04-07 18:54:53 +02:00
jaynus
6deff125ce Self designation lockdown and cleanup 2015-04-07 09:05:19 -07:00
ulteq
b62827c050 Added comments to all functions 2015-04-07 17:58:54 +02:00
jaynus
f973505746 DAGR and Hellfire modified config values. 2015-04-07 08:53:47 -07:00
ulteq
7d42eeed28 Fixed incorrect icon path 2015-04-07 17:45:52 +02:00
ulteq
0315219cf2 Added new Kestrel4500 branch: 
*TODO: Fix the dialog button actions (action="...") in RscTitles.hpp
 2015-04-07 17:43:54 +02:00
commy2
deabbcd840 add function that returns config properties of a vehicles light 2015-04-07 15:43:23 +02:00
commy2
5df25cf44d function to return all turned on lights of any objects 2015-04-07 15:06:27 +02:00
commy2
0d126dc562 function to return object's lights 2015-04-07 14:44:34 +02:00
commy2
bb8762f4b9 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-07 13:55:09 +02:00
commy2
ad5aad60c7 fix: ambient brightness can return values greater 1 2015-04-07 13:54:33 +02:00
Pierre Humberdroz (meat)
4c49765c8f translation changes 
#370
 2015-04-07 10:39:41 +02:00
bux578
92da20ce62 translations 
#367
 2015-04-07 10:02:33 +02:00
bux578
9ce2e38814 removed <orignal> language entry 2015-04-07 09:27:26 +02:00
KoffeinFlummi
8d5bdd2c01 Revert "fix shitty initSpeed definitions breaking SD mags, fix #182" 
This reverts commit 55f49eaa1c.
 2015-04-07 09:04:17 +02:00
jaynus
9aa84322c7 Magazine, Ammo and Missile breakout. 2015-04-06 23:15:26 -07:00
jaynus
2d019abede WIP Guidance rewrites. 2015-04-06 22:38:34 -07:00
jaynus
99008ac729 Merge pull request #332 from KoffeinFlummi/medicalBox 
Added: Generic placeholder medical box.
 2015-04-06 19:09:16 -07:00
jaynus
eb6fdc2e34 cleaner LOAL DAGR 2015-04-06 19:03:11 -07:00
jaynus
a744896b20 Fixed: jaynus fucked up. 2015-04-06 18:51:08 -07:00
jaynus
34444ebb32 Fixed: github merge error fixed. 2015-04-06 18:37:05 -07:00
jaynus
27caff5564 Fixed: Add platform velocity to FCS calculations; resolves #361 2015-04-06 18:36:39 -07:00
Glowbal
12493f8595 Improved wounds configuration (missing maxDamage values added) 2015-04-07 00:57:05 +02:00
Glowbal
c7549a13a4 Improved pain reduction 2015-04-07 00:41:53 +02:00
jaynus
446a30e4fc Merge pull request #352 from KoffeinFlummi/comancheFixes 
Goes along with FCS fixes, merging quickly due to overall fixes.
 2015-04-06 15:07:09 -07:00
jaynus
4a8f24b59c Merge pull request #356 from KoffeinFlummi/fcsMadness 
Fcs madness
 2015-04-06 15:00:24 -07:00
jaynus
e0605f9e81 Remove default hint for FCS but play sound, Resolves #317 2015-04-06 14:57:07 -07:00
jaynus
7fa8365d51 Remove debug, new Release build of extension. 2015-04-06 14:50:22 -07:00
esteldunedain
09461d94ef Rewritten changeProjectileDirection 2015-04-06 18:10:17 -03:00
ulteq
26186e1ea4 Removed model = ""; 2015-04-06 23:02:36 +02:00
esteldunedain
aec9962121 Fix changeProjectileDirection 2015-04-06 18:02:08 -03:00
ulteq
19cb19ab27 Finished merging ATragMX 
*TODO: Replace EGVAR(advanced_ballistics,AdvancedBallistics)
*TODO: Replace EGVAR(advanced_ballistics,AdvancedAirDragEnabled)
 2015-04-06 22:56:14 +02:00
esteldunedain
35129a7a41 Debug stuff for the velocity correction 2015-04-06 17:37:18 -03:00
Garth L-H de Wet
513ab25f54 Merge branch 'master' into explosiveInteraction 
Conflicts:
	addons/explosives/functions/fnc_placeExplosive.sqf
 2015-04-06 22:30:27 +02:00
Garth L-H de Wet
9d7d71b1b1 Changed the tabs to 4 spaces. Hopefully. 2015-04-06 22:20:11 +02:00
Garth "L-H" de Wet
e0b4efd9f1 Merge pull request #280 from KoffeinFlummi/explosiveInteraction 
Explosive interaction
 2015-04-06 22:12:04 +02:00
ulteq
ec846b24f2 The ATragMX GUI (ctrlShow) relies on using execVM instead of call 2015-04-06 22:11:06 +02:00
Garth L-H de Wet
44c597f7c5 Explosives, 2 spaces to 4 space tab. 2015-04-06 22:10:00 +02:00
jaynus
acf683e621 Call every 10th of a second. 2015-04-06 12:58:53 -07:00
jaynus
906612f954 Fixed: Gunner FOV, explosive rounds and FPS drop. 2015-04-06 12:54:06 -07:00
ulteq
91be37c6f3 Replaced all execVM occurrences 2015-04-06 21:41:07 +02:00
esteldunedain
04e9f28734 Make function handle negative numbers 2015-04-06 16:12:38 -03:00
ulteq
cab8603db6 Fixed several typos 2015-04-06 21:11:02 +02:00
commy2
c1799616c7 add function to convert numbers to string 2015-04-06 20:47:11 +02:00
ulteq
6578ff4559 *Replaced call compile preprocessFile with FUNC macro 
*Removed some unused files
*Fixed incorrect .paa filepath
*Fixed incorrect profileNamespace access
 2015-04-06 20:46:33 +02:00
jaynus
d6cf07a3b6 Changed: FCS update was not being delayed for laser. Delay of 0.5s added. 2015-04-06 11:44:17 -07:00
Glowbal
bdb5c8e728 Merge pull request #349 from KoffeinFlummi/medicalBugFixes 
Exit displayPatientInformation PFH when a different selection is selected.
 2015-04-06 19:49:12 +02:00
Glowbal
4c6dad69f9 Should fix #347. Could not reproduce but this at least fixes some issues (which most likely caused the error) 2015-04-06 19:43:27 +02:00
jaynus
1bb6be5654 Cleaning up of all tabs in source code files. 2015-04-06 09:22:43 -07:00
jaynus
bdcec243a8 Changed: Comanche Gatling HEDP effects and dispersion. 2015-04-06 09:14:56 -07:00
PabstMirror
c1abb2669d #340 - Fix stringtables 2015-04-06 11:03:04 -05:00
jaynus
c3dbcf1351 increase frequency of laser update. 2015-04-06 07:40:20 -07:00
commy2
796a430292 Merge pull request #326 from KoffeinFlummi/VectorFOSfix 
Fix for Vector Fall-of-Shot display
 2015-04-06 16:20:13 +02:00
commy2
1e497c228c switch sides of add/drop left/right 2015-04-06 16:18:59 +02:00
Glowbal
1c28e82725 Merge pull request #341 from KoffeinFlummi/medicalFixes 
Fixes for bodybag and support for radio mods in medical
 2015-04-06 16:17:08 +02:00
commy2
ebd1e555a3 fix: derp when switching control numbers 2015-04-06 16:07:52 +02:00
ulteq
1320176c12 Initial merge of the ATragMX - Ballistics calculator WIP) 2015-04-06 15:51:59 +02:00
Glowbal
76ad6b8294 Added missing main actions 2015-04-06 15:46:50 +02:00
Glowbal
ce4cdd3722 staged bodybag fixes 2015-04-06 15:11:54 +02:00
Glowbal
661d93e82c Working commit 2015-04-06 14:51:17 +02:00
Glowbal
8e176eff55 Fixed treatment locations 2015-04-06 14:32:37 +02:00
Glowbal
43b3190202 config fix 2015-04-06 14:14:00 +02:00
Glowbal
10a1108aae Added support for customizable treatment location limitation 2015-04-06 14:11:10 +02:00
Glowbal
2657677bd8 Added support for TFR/ACRE on unconscious 2015-04-06 14:09:59 +02:00
esteldunedain
be81e16c71 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-06 09:07:20 -03:00
esteldunedain
4cf2410622 Fix duplicated laser designator actions 2015-04-06 09:06:56 -03:00
Glowbal
0bcb7f76dc This should not be here 2015-04-06 13:12:40 +02:00
Glowbal
83c670576b fixed typeOf instead of typeName 2015-04-06 11:58:52 +02:00
esteldunedain
52918557f2 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into abIntegration 2015-04-06 00:30:29 -03:00
esteldunedain
5a0faf720f EFUNC(advanced_ballistics,calculateWindSpeed) 2015-04-06 00:27:33 -03:00
esteldunedain
7a1e905c79 Move Latitude and Altitude parameters to weather 2015-04-06 00:19:48 -03:00
esteldunedain
c73aff03bd displayWindInfo tab to space 2015-04-06 00:13:43 -03:00
esteldunedain
2d770eb355 Make wind in displayWindInfo dependant on wether AB is used or not 2015-04-06 00:12:50 -03:00
esteldunedain
caf52e8a2f Move wind display resources to weather 2015-04-06 00:12:22 -03:00
esteldunedain
6f89233e12 Move wind info display to weather 2015-04-06 00:02:34 -03:00
esteldunedain
33a87b0488 Reenable weather (disabled in 076c5abf88) 2015-04-05 23:56:24 -03:00
Glowbal
befb52e855 Merge pull request #260 from KoffeinFlummi/serverConfig 
Server Config support
 2015-04-06 01:42:33 +02:00
esteldunedain
038c871356 Make overheating use bullet mass in grains introduced by ab 2015-04-05 20:11:42 -03:00
esteldunedain
100686d34a Move ballistic data outside the advance_ballistics pbo, so: 
- it can be used by other pbos like overheating without it requiring ab.
- the tweaks to airfriction are available to basic wind_deflection too if ab is not present.
 2015-04-05 20:05:04 -03:00
jaynus
c87f2f8bcc Added: Generic placeholder medical box. 2015-04-05 15:16:32 -07:00
esteldunedain
b8c493a495 Merge branch 'master' into AdvancedBallistics 2015-04-05 19:05:12 -03:00
jaynus
8fa6ab38fd Merge branch 'serverConfig' of github.com:KoffeinFlummi/ACE3 into serverConfig 2015-04-05 14:08:54 -07:00
jaynus
d6632a0e45 Module should default to true. 2015-04-05 14:08:42 -07:00
jaynus
e3ad83e109 Merge pull request #286 from KoffeinFlummi/lasers 
Self designating lasers, Javelin Guidance, DAGR laser guidance, Comanche updated HUDS
 2015-04-05 13:26:54 -07:00
VKing
8255ff666d Fix long-standing typo (get it?) 2015-04-05 22:18:28 +02:00
VKing
8ad202b039 Fix Fall-of-Shot units being inverted 2015-04-05 22:16:47 +02:00
Glowbal
9e3bb8ac95 fixed triage card 2015-04-05 22:07:38 +02:00
jaynus
7d5fca3c5a DIR guidance on Javelin missiles/Titan. TODO: The guidance codes need re-works. 2015-04-05 12:55:17 -07:00
Glowbal
12d10b8bf7 Blood loss for basic (from AGM medical) 2015-04-05 21:38:15 +02:00
ulteq
93eaaeb8e2 Added new advanced_ballistics module 2015-04-05 21:08:55 +02:00
jaynus
788487baa5 Debug disable 2015-04-05 11:54:00 -07:00
jaynus
34b834e700 Rudimentary hold-tab lock on titan, sounds added, jink removed, state tracking. 2015-04-05 11:51:39 -07:00
Glowbal
147bb92541 Added setting to disable variable sync (recommended on) 2015-04-05 20:23:07 +02:00
Glowbal
7ffd690a71 Changed: IVs are now synced and medics can see a unit is receiving an IV 2015-04-05 20:11:54 +02:00
jaynus
278ffe7d65 save 2015-04-05 10:45:09 -07:00
Glowbal
89015c94d4 Removed rouge system chat and diag_log messages 2015-04-05 19:42:55 +02:00
Glowbal
ae2adc17b9 changed all medical items to inherit from ACE_ItemCore 2015-04-05 19:37:07 +02:00
Glowbal
2c0bec2b07 disabled injury visualization for bandaged wounds 2015-04-05 19:36:40 +02:00
Glowbal
171ebf827a No litter created when in vehicle 2015-04-05 19:28:57 +02:00
Glowbal
a0bbbdb0b7 fixed place in bodybag 2015-04-05 19:27:53 +02:00
Glowbal
f52891436a oops 2015-04-05 19:27:40 +02:00
Glowbal
ecf84ae039 Updated module classname to be inline with others 2015-04-05 19:27:28 +02:00
Glowbal
0f52059249 Fixed CPR script error 2015-04-05 19:27:09 +02:00
Glowbal
dca75c5557 Implemented bandaged wounds setting (adv) 2015-04-05 19:26:33 +02:00
Glowbal
e3e17d8fcb Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-05 15:51:42 +02:00
Glowbal
c210efcef0 fixed #312 Error occurred with undefined damageTypes. In this case; getting run over by a vehicle. 2015-04-05 15:51:28 +02:00
Glowbal
c514fde5d3 Not necessary here. Makes it only work once. 2015-04-05 15:13:34 +02:00
Glowbal
bae3826bdf Polished server config export 2015-04-05 14:48:23 +02:00
Glowbal
b6b880fba0 Merge pull request #310 from KoffeinFlummi/medicalActionsWhileBoarded 
Add medical actions while boarded.
 2015-04-05 14:36:17 +02:00
Glowbal
92bdae9321 Removed diag_log spam 2015-04-05 13:25:53 +02:00
Glowbal
32625b446b fixed animation being reset even when inside a vehicle 2015-04-05 13:03:09 +02:00
Glowbal
cf1f641424 Moved selfActions to a separate hpp file 2015-04-05 13:02:55 +02:00
Glowbal
f1a3d588ba Changed initialization order of config settings. 
ACE_Settings should never force any setting by default. Loading it first ensures that all settings from ACE_Settings exist. This way, ACE_ServerSettings will override ACE_Settings, even if no force is used. Mission settings will override the server config settings, if no force is used.

This ensures that all settings are of their correct type, in case an outdated or corrupt server config is used, as well as have their correct localized display name and description
 2015-04-05 12:38:10 +02:00
Glowbal
279641787d Added checks for enforce usage only in SP with settings enabled 2015-04-05 11:11:54 +02:00
Glowbal
202904f1f9 Using 1 and 0 instead of true and false for config export 2015-04-05 10:32:40 +02:00
jaynus
6288a809f7 actually final terminal decent. woops. 2015-04-04 22:36:09 -07:00
Glowbal
d487092d84 formatting 2015-04-05 02:33:45 +02:00
Glowbal
110635df7b improved formatting 2015-04-05 02:33:11 +02:00
Glowbal
a0af055917 export config should force the settings 2015-04-05 02:22:24 +02:00
Glowbal
7928ca71a5 Server side config export 2015-04-05 02:17:43 +02:00
jaynus
583acf6558 ctrlShow is not operational on ControlGroups in RscOptics. 2015-04-04 17:15:59 -07:00
jaynus
ab0d289762 Merge remote-tracking branch 'origin/master' into lasers 2015-04-04 16:56:03 -07:00
jaynus
aee7eb9406 Working save. 2015-04-04 16:55:53 -07:00
PabstMirror
75351f2a5b TapShoulder - fix hint message 2015-04-04 17:54:15 -05:00
esteldunedain
f417fa2285 Add medical actions while boarded. 2015-04-04 19:41:12 -03:00
PabstMirror
e03d3ed619 Merge pull request #284 from KoffeinFlummi/beltRepacking 
MagRepack - Belt Repacking / Child Actions
 2015-04-04 17:18:53 -05:00
esteldunedain
848b5133ef Remove debug chats for interact_menu 2015-04-04 19:15:29 -03:00
Glowbal
044d2551ce Merge branch 'master' into serverConfig 2015-04-04 23:00:47 +02:00
Glowbal
b18d704686 Merge pull request #300 from KoffeinFlummi/medicalImprovements 
Medical Litter & other additions
 2015-04-04 22:52:05 +02:00
Glowbal
7f9043897c wake up by epinephrine in revive state 2015-04-04 22:50:38 +02:00
Glowbal
551c36d690 fixed treatment didnt work inside vehicles 2015-04-04 22:48:52 +02:00
Glowbal
77d39877d2 Merge branch 'master' into medicalImprovements 2015-04-04 22:01:15 +02:00
Glowbal
a56e8745c3 fixed module settings 2015-04-04 21:59:18 +02:00
Glowbal
d37094dc7a Work around for self treatment when cursorMenu from interact is used. 
Executing it one frame later works fine, but otherwise the loading bar will fail.
 2015-04-04 21:52:00 +02:00
Glowbal
5c3ee0dd1a Added settings to modules & fixed medicalVehicle module 2015-04-04 21:51:18 +02:00
PabstMirror
6ec0859f85 MicroDAGR - Allow use in vehicles 
Can't show minimap display in turret view (cameraView = "gunner"), but
can bring up the interactive dialog
 2015-04-04 14:35:24 -05:00
Glowbal
89ec817ce3 Added setting for litter cleanup delay 2015-04-04 21:26:41 +02:00
Glowbal
1d33ce52b3 added support for adjustable settings for consumeItem and medicalLevel 2015-04-04 21:20:24 +02:00
Glowbal
93d9088410 fixed cardiac arrest 2015-04-04 21:20:03 +02:00
Glowbal
e3aaac7005 Only select primary weapon if no current weapon is selected 2015-04-04 20:49:30 +02:00
Glowbal
a7edd00420 removed useless doAnimation call when animation is not "unconscious" in unconscious state 2015-04-04 20:41:49 +02:00
Glowbal
2b9afcbb6c Now supports unconscious state fully 2015-04-04 20:37:25 +02:00
Nicolás Badano
5f4030469f Merge pull request #309 from KoffeinFlummi/closeInteractMenu 
Close interact menu when knocked out
 2015-04-04 15:35:00 -03:00
Glowbal
e78fc55b45 changed; When standing before treatment, the caller will now move into crouch instead of standing up again. 2015-04-04 20:21:52 +02:00
Glowbal
ddb01e7865 Improved unconscious wakeup animations 2015-04-04 20:21:06 +02:00
Glowbal
2420db78a1 CreateLitter now supports conditions and is selection specific. 
Format:
litter[] = {
   {"SelectionName", "Condition", {"litterClassname"} },
   ...
};

The array with litter classnames also support 2d arrays. ie:
{"SelectionName", "Condition", {{"litterClassname"}} }
Of array entries it will select a random classname.
 2015-04-04 20:20:29 +02:00
commy2
55d7c0f0e6 remove scripted recoil 2015-04-04 20:02:02 +02:00
commy2
8d0ee2d578 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into 142resting 2015-04-04 19:56:43 +02:00
PabstMirror
efe810ae4e Private Variables for localEvent 2015-04-04 12:08:59 -05:00
jaynus
9d06d7c7ca readme/author updates. 2015-04-04 09:09:42 -07:00
Glowbal
08e1949078 Improved patient unconscious animation 2015-04-04 18:08:41 +02:00
Glowbal
31b7ade057 Support unconscious animation for patient upon treatment 2015-04-04 17:33:20 +02:00
esteldunedain
d090b3328c - Close interact_menu when the player falls unconscious 
- Prevent all types of interactions while unconscious
 2015-04-04 12:25:49 -03:00
Glowbal
48758ff0e3 fixed incorrect typeNames 2015-04-04 16:59:52 +02:00
Glowbal
b54179696a fixed basic revive 2 2015-04-04 16:28:09 +02:00
Glowbal
18900cb82c fixed revive for basic 2015-04-04 16:27:44 +02:00
Glowbal
3a117e9b4d fixed incorrect unit used for fullheal (was healing caller) 2015-04-04 16:26:49 +02:00
commy2
e27c91710c Revert "Fixed: numerous player-based events were repeat invalid firing for null player object. This is now limited to only appropriate null-friendly events." 
This reverts commit 6864529d9c.
 2015-04-04 16:26:32 +02:00
commy2
1dea63067a Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into optics 2015-04-04 16:14:19 +02:00
Nicolás Badano
b78b93f2cd Merge pull request #303 from KoffeinFlummi/strongerTextShadow 
Stronger shadow for the interact_menu text
 2015-04-04 10:25:27 -03:00
commy2
d496cabbbb remove obsolete folder from TO_MERGE folder 2015-04-04 14:38:49 +02:00
commy2
a5b071912f CfgPreloadtextures for optics 2015-04-04 13:15:27 +02:00
Glowbal
914c5ffd0f fixed bandage optional parameter 2015-04-04 12:14:21 +02:00
Glowbal
7c296c413d Litter has a more random spread 2015-04-04 12:13:55 +02:00
Glowbal
d81dcba543 Added more litter variants 2015-04-04 12:13:42 +02:00
commy2
b7fa2bd8b3 disable pip scopes in arsenal 2015-04-04 12:06:20 +02:00
commy2
5fdd93587c localization 2015-04-04 09:16:41 +02:00
commy2
ea275b1e52 2d with and without PIP 2015-04-04 08:51:22 +02:00
PabstMirror
c055911231 Cleanup, remove debug spam 2015-04-04 00:52:21 -05:00
PabstMirror
9f60bf9906 Merge branch 'master' into disarmingTest 2015-04-04 00:09:36 -05:00
esteldunedain
a658cafb4e Remove line breaks from actions 2015-04-04 01:45:03 -03:00
esteldunedain
7617908ad3 Make menu open linearly to the right of the action point 2015-04-04 01:44:49 -03:00
commy2
98d217d97e handle 2d optics recoil 2015-04-04 06:19:19 +02:00
jaynus
2e6a9c4967 Placeholder sounds for jav/titan locking. accurate fire tweaks 2015-04-03 21:07:04 -07:00
esteldunedain
06f6039dca Stronger shadow for the interact_menu text 2015-04-04 01:04:32 -03:00
PabstMirror
6cd7ab2f7d Fix getChildren - condition/only show inv mags 2015-04-03 22:37:48 -05:00
jaynus
8710bee3b8 Titan Work. 2015-04-03 20:27:52 -07:00
esteldunedain
99a90bf539 Remove ace_recoil (#271) 2015-04-04 00:25:44 -03:00
jaynus
583347aaab tab cleanup, javelin work. 2015-04-03 17:28:33 -07:00
Glowbal
2645b102f0 Replaced waitAndExec for single PFH with 30s delay 2015-04-04 02:28:14 +02:00
PabstMirror
07dfe52133 Remove Duplicate Mortar Code (inherit from statics) 
Before an action added to staticWeapon wouldn't be applied to mk6 mortar
 2015-04-03 19:07:13 -05:00
esteldunedain
a5ff34e1d8 Keep cursored menus always centered. Fix #299. 2015-04-03 20:49:40 -03:00
Glowbal
83fbc1ff10 Added setting to toggle litter creation on/off 2015-04-04 01:47:56 +02:00
jaynus
65388e1146 Added: Image Assets 
Added: ACE_AIR_SAFETY weapon for all aircraft
Changed: ACE'ified Kimi code
 2015-04-03 16:46:37 -07:00
Glowbal
7f45d25ee5 Added litter for medical treatment 2015-04-04 01:42:13 +02:00
jaynus
1672a5f2f9 Added: Comanche HUD revamped+stabalized, awesomeness activated. 2015-04-03 16:17:26 -07:00
PabstMirror
824448833f Basic Test Mission 
Very simple test mission with creates, debug console enabled for all.
 2015-04-03 18:14:45 -05:00
Glowbal
4ac77bceab Model fixes and imports 2015-04-04 01:09:44 +02:00
Nou
fff8a240e3 Remove compensation for movement, instead use modelToWorldVisual 2015-04-03 15:31:44 -07:00
Glowbal
5e0f5b8b94 Added full heal/PAK for basic 2015-04-04 00:31:12 +02:00
Glowbal
7230687ea2 corrected revive setting classes 2015-04-04 00:30:59 +02:00
Nou
6541600d44 Switch everything to use modelToWorldVisual instead of modelToWorld. 2015-04-03 15:26:27 -07:00
Glowbal
d3c9d111e1 fullHeal now resets reviveState 2015-04-03 23:58:46 +02:00
Glowbal
4ddb496d8b Added max Revive lives 2015-04-03 23:56:32 +02:00
Nou
6c4dda2dc8 Use visual versions. 2015-04-03 14:40:01 -07:00
jaynus
735384cdb4 stabalize a little more and do some debug drawing. 2015-04-03 14:28:12 -07:00
esteldunedain
bd813d0d7a Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-03 18:22:47 -03:00
esteldunedain
2b4d806925 Reduce or eliminate backblast cause by terrain depending on relative slope. Fix #294 2015-04-03 18:22:04 -03:00
Glowbal
36288fce43 Updated medical action config. 
Added bodybag action
Added Tourniquet action to basic.
Added more displayNameProgress entries.
Removed deadcode
 2015-04-03 22:59:28 +02:00
Glowbal
a6ce961ca1 Usage of isBeingCarried and isBeingDragged 2015-04-03 22:45:16 +02:00
Glowbal
244bac8562 Merge branch 'master' into medicalAdvanced 2015-04-03 22:42:09 +02:00
Glowbal
05389e7e25 Implemented useItems for treatment (basic and adv) 
Will remove items on treatment start. Add again on treatmentFailure.
Based upon consumeItem config setting.
 2015-04-03 22:40:36 +02:00
commy2
9968bc132c get a pip scope to work 2015-04-03 22:30:29 +02:00
Glowbal
038ed5f23e Removed deprecated returnDamage parameters 2015-04-03 21:59:47 +02:00
Glowbal
1ef262c119 Support for enableOverdosing setting in advanced 2015-04-03 21:53:58 +02:00
Glowbal
c3ddbb4be7 Prevent the usage of the blood loss coefficient to increase blood volume on bleeding 2015-04-03 21:51:44 +02:00
Glowbal
ecf16ad9f1 fixed prevent instant death setting 2015-04-03 21:49:46 +02:00
PabstMirror
604e851423 Medical - isBeingCarried 2015-04-03 14:37:04 -05:00
Glowbal
d4a6dd1038 Removed the options to enable fractures and airway through mission module 2015-04-03 21:32:49 +02:00
Glowbal
1b02cb2e82 examine actions now use activity log 2015-04-03 21:03:39 +02:00
Glowbal
43efc21f27 Only display the activity log in the activity list. 2015-04-03 21:03:22 +02:00
Glowbal
8881de4a07 Removed activity log background, made wider. Added shadow to text. 2015-04-03 21:02:56 +02:00
Glowbal
8d7ac1f930 Added selected bodypart text 
Changed "No injuries on bodypart" to still display if the generic messages have entries
 2015-04-03 20:26:24 +02:00
PabstMirror
254a25b139 Medical - isBeingDragged func 2015-04-03 13:16:48 -05:00
Glowbal
b92978fb80 Now resets the proper hasMovedOut value 2015-04-03 20:11:20 +02:00
Glowbal
e68e487769 fixed units not moving out of unconscious animation 2015-04-03 20:07:39 +02:00
Glowbal
d5f0cf5cbd Incorrect value for airwayStatus 2015-04-03 20:06:53 +02:00
jaynus
ced44f8a9d Fixed: Reduce bouncing. 
TODO: wtf is going on with the lateral axis?
TODO: maybe dummy laser that doesnt show up as a target.
 2015-04-03 10:34:36 -07:00
commy2
025c1ef63f simplify optics 2015-04-03 19:25:28 +02:00
jaynus
368b51e0ee Fixed: Get in/out of vehicle automatically turns off lasers 2015-04-03 10:10:57 -07:00
Glowbal
14e00940cd fixed incorrect airwayStatus values for initialization (adv medical) 2015-04-03 18:59:22 +02:00
esteldunedain
d1d6252299 Nerf the backblast damage of the Titan and NLAW, adopting standard values for soft-launch launchers from the AGM_Compatibility project 2015-04-03 13:50:47 -03:00
jaynus
ca8537105f Merge branch 'lasers' of github.com:KoffeinFlummi/ACE3 into lasers 2015-04-03 09:49:56 -07:00
jaynus
84d801a45a Added: ace_fcs_forceUpdate event for forcing the FCS to update from self-designate 
Merged: in-vehicle interact for laser designator
Changed: Perf. tweaks on laser update times.
 2015-04-03 09:49:41 -07:00
esteldunedain
b0ac672c13 Only init each vehicle type once 2015-04-03 13:24:50 -03:00
jaynus
63c42e26c8 Merge branch 'lasers' of github.com:KoffeinFlummi/ACE3 into lasers 2015-04-03 09:16:03 -07:00
jaynus
f87ea5fe1c Merge branch 'lasers' of github.com:KoffeinFlummi/ACE3 into lasers 2015-04-03 09:03:14 -07:00
commy2
b0575bad21 improve infoDisplayChanged EH 2015-04-03 17:50:52 +02:00
esteldunedain
b7e3a94462 Add designator to the comanche's gunner 2015-04-03 12:44:09 -03:00
esteldunedain
c82cef1b28 - self designate capabilities read from config 
- add designator on/off actions to the interact_menu
 2015-04-03 12:43:41 -03:00
Nicolás Badano
63ac3bb768 Merge branch 'master' into lasers 
Conflicts:
	addons/common/XEH_preInit.sqf
 2015-04-03 10:40:11 -03:00
Glowbal
1d7f351cb5 Merge pull request #288 from KoffeinFlummi/Banana 
Added banana to curator item list
 2015-04-03 12:56:37 +02:00
Glowbal
4478602cfb Consistent use of quotes for localized text 2015-04-03 12:56:12 +02:00
commy2
6d3ddfeb5e 2d scripted optics 2015-04-03 12:33:12 +02:00
Garth L-H de Wet
7c73f7479e Used a more suitable icon for taking explosives. 2015-04-03 09:51:32 +02:00
Glowbal
8226edc6cb Fixed module function call 
Wind deflection module was using the incorrect function name,
 2015-04-03 09:43:06 +02:00
Glowbal
368002cc79 fixed undefined _selectionName variable #289 2015-04-03 08:48:10 +02:00
Glowbal
ffcc01ef74 Removed rouge systemChat message on unconsciousness #292 2015-04-03 08:45:02 +02:00
PabstMirror
98428c42f5 #291 - RemoveDeadBodiesDisconnected 2015-04-03 01:05:14 -05:00
PabstMirror
33ee7dc07c iMenu - Add some localization and fix veh icons 2015-04-03 00:42:25 -05:00
PabstMirror
e99e35d70b mdagr - remove unneeded error msg 2015-04-02 22:37:00 -05:00
PabstMirror
7c121e6a80 Missing, unused stringtable 2015-04-02 22:32:16 -05:00
jaynus
19bc75dacd Merge remote-tracking branch 'origin/ballistics_effects' into lasers 2015-04-02 16:44:00 -07:00
jaynus
8a18d18c08 doubleplusgood all munition TTL for range. 2015-04-02 16:35:19 -07:00
Glowbal
2d0e8dea7e Added banana to curator item list 2015-04-03 01:27:22 +02:00
jaynus
6864529d9c Fixed: numerous player-based events were repeat invalid firing for null player object. This is now limited to only appropriate null-friendly events. 2015-04-02 16:20:22 -07:00
jaynus
d81d1b3176 Added: ACE Event stack debugging output, use DEBUG_EVENTS in main\script_debug 
Added: PFH Perfcounter tracking+output, use ENABLE_PERFORMANCE_COUNTERS in main\script_debug and then call ace_common_fnc_dumpPerformanceCounters
 2015-04-02 16:05:21 -07:00
commy2
ba00a31523 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-03 00:41:43 +02:00
commy2
3b23006797 fix error when aborting mission 2015-04-03 00:41:11 +02:00
PabstMirror
1c66cb9818 StaticWeapon classname 2015-04-02 17:25:05 -05:00
Glowbal
045ea02da0 Changed: CPR is now only possible when a unit is in cardiac arrest (Adv) 2015-04-03 00:10:12 +02:00
Glowbal
b399768798 Changed postInit wound sync to playerChanged eventhandler. 2015-04-03 00:04:41 +02:00
commy2
88b9d0899f shortdot scope onDraw 2015-04-03 00:03:08 +02:00
Glowbal
c174ccf396 fixed script error when performing treatment with secondary weapon selected 2015-04-02 22:58:00 +02:00
Glowbal
57b093f845 Added minimum lethal damage for injury types in adv medical 2015-04-02 22:57:35 +02:00
Glowbal
b267a52ec6 Fixed support for custom damage types 2015-04-02 22:57:02 +02:00
Glowbal
6f4b53ed9e Correct use of medical handleDamage calls 2015-04-02 22:56:23 +02:00
Glowbal
6f630d4c03 Changed setUnconscious contract to support a minimum unconscious time 2015-04-02 22:55:23 +02:00
Glowbal
c6c04442c1 GForces now uses correct unconscious function 2015-04-02 22:54:39 +02:00
commy2
646a4b5bd1 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-02 22:40:47 +02:00
commy2
35ad71bbfd add testing scope 2015-04-02 22:40:21 +02:00
Garth L-H de Wet
703bc24657 Made picking up explosives use the new AddToInventory function from common. 2015-04-02 21:44:33 +02:00
Garth L-H de Wet
1e8a8e79fe Merge branch 'master' into explosiveInteraction 2015-04-02 21:30:08 +02:00
jaynus
b88d1b4cac Begin time to live changes for extended range rounds. 2015-04-02 10:45:52 -07:00
jaynus
0ca1703048 Slight tweak to deflection. 2015-04-02 10:41:54 -07:00
jaynus
596854a264 Moved getTurretDirection to common. 
Tweak creation of action (fucking actions?!) :( :( :(
 2015-04-02 10:05:50 -07:00
jaynus
c83e602028 Merge remote-tracking branch 'origin/master' into lasers 2015-04-02 09:35:51 -07:00
jaynus
ec64a1b0ca Changed: Laser functionality tweaking 
Changed: DAGR deflection refinement
Clean up of tabs
 2015-04-02 09:35:36 -07:00
PabstMirror
ec59397e4f Fix playerTurretChanged event 2015-04-02 11:15:31 -05:00
jaynus
b0926a542c Merge pull request #282 from KoffeinFlummi/AddItemToInventory 
Added a function that will add the passed item to the unit or place it i...
 2015-04-02 08:42:48 -07:00
commy2
f2d802eb90 make getGunner work in person turret turret units (commander FFV) and for foot soldiers 2015-04-02 13:52:22 +02:00
commy2
d8e0c54406 function to log ace config entries 2015-04-02 10:27:21 +02:00
commy2
2fd2e313f2 sort stuff 2015-04-02 08:44:58 +02:00
commy2
8fde553731 getItemType more relyable after potential arma updates 2015-04-02 08:16:13 +02:00
commy2
191126ecd6 update getItemType 2015-04-02 07:37:44 +02:00
PabstMirror
a92a541234 Headers 2015-04-01 23:05:41 -05:00
jaynus
cc27ff63d6 finalized. works for weapons/mags/items. Optional container also works. 2015-04-01 16:51:34 -07:00
jaynus
5d6495dafe Merge remote-tracking branch 'origin/master' into AddItemToInventory 2015-04-01 16:42:24 -07:00
PabstMirror
c9352e1970 And This 2015-04-01 15:18:39 -05:00
commy2
411fb6bc62 getText vs. getNumber 2015-04-01 22:13:37 +02:00
PabstMirror
4e66aea25d Make it work 2015-04-01 15:09:05 -05:00
commy2
a14cc0853e function to return item type 2015-04-01 21:52:56 +02:00
Garth L-H de Wet
452947148a Random clean ups and explosive can now detonate with their object. 
Defuse object doesn't get cleaned up on it's own. But if a player comes near it with interact menu on it will get cleaned up.
 2015-04-01 20:43:18 +02:00
PabstMirror
1303f59cd8 opps 2015-04-01 13:09:22 -05:00
PabstMirror
0d27806571 Repack Mag Child Actions 2015-04-01 13:09:03 -05:00
Glowbal
7252966a78 Replaced advanced wounds event sync by regular setvariable public 2015-04-01 20:03:44 +02:00
Glowbal
635f3e31c9 Disable medical carry and drag 2015-04-01 19:56:00 +02:00
jaynus
bd1f69d8a2 assign container 2015-04-01 10:37:47 -07:00
commy2
b66bb4ffd6 add functions to get cfg type of items and objects 2015-04-01 19:36:11 +02:00
jaynus
46a761a1c8 canAdditem works on weapons. 2015-04-01 10:35:22 -07:00
jaynus
de920e8874 Final cleanup. 2015-04-01 10:34:38 -07:00
jaynus
ec6fb6fcb8 containerize. 2015-04-01 10:34:16 -07:00
jaynus
c3f915a0ac tabs because 2015-04-01 10:22:27 -07:00
jaynus
37bbbc607f derp. 2015-04-01 10:20:58 -07:00
jaynus
46284622b3 Optional container variable for adding item to a specific container (vest/backpack/uniform) 2015-04-01 10:20:24 -07:00
Garth L-H de Wet
7d5555a2e0 Renamed functions to be more inline with their purpose. 
Removed legacy code.
 2015-04-01 19:09:19 +02:00
Garth L-H de Wet
e06e7a2a51 Added a function that will add the passed item to the unit or place it in a ground holder if the unit has no space. 2015-04-01 18:48:46 +02:00
PabstMirror
43a9e7bfc8 #176 - Belt Repacking 2015-04-01 11:21:30 -05:00
PabstMirror
0daa029622 Show Vehicle Name/Icon for interaction 2015-03-31 23:56:41 -05:00
PabstMirror
41489e271c Merge pull request #261 from KoffeinFlummi/attachCleanup 
Attach cleanup
 2015-03-31 19:46:25 -05:00
Nicolás Badano
0d8bd0bc80 Merge pull request #279 from KoffeinFlummi/fixesInteractionConditions 
Fixed various interaction conditions
 2015-03-31 20:10:05 -03:00
Garth L-H de Wet
c020128f0e Made explosives use children action points rather than the listbox at all points. 
Added the ability to defuse on explosives. "on explosives", there is a helper object that handles defusing.

Known issue, it appears that the attachTo explosives don't detonate. This means the currently approach should be changed to a object variable method, instead of an attached object method.
 2015-03-31 23:20:32 +02:00
Nicolás Badano
e38f48d7ad Remove debug stuff 2015-03-31 18:16:53 -03:00
Nicolás Badano
1def2bd2b4 Fix bugs with interaction with vehicles and passengers 2015-03-31 18:09:29 -03:00
Nicolás Badano
4381f164d1 Fix the self interaction menu of vehicles 2015-03-31 18:09:23 -03:00
Nicolás Badano
149fd13fce Prevent the interact menu from closing dialogs opened by the actions 2015-03-31 18:09:20 -03:00
Nicolás Badano
9a182b98b6 Fix the FCS keybinds 2015-03-31 18:09:14 -03:00
Garth L-H de Wet
613257141b Merge branch 'removedExpPlaceMenu' into explosiveInteraction 
Conflicts:
	addons/explosives/CfgVehicles.hpp
	addons/explosives/functions/fnc_openPlaceUI.sqf
 2015-03-31 19:29:09 +02:00
Garth L-H de Wet
8158a3e841 Fixed small errors caused by working blind. 2015-03-31 19:26:38 +02:00
Garth L-H de Wet
9c13a87d83 Merge branch 'master' into explosiveInteraction 2015-03-31 17:21:55 +02:00
Garth L-H de Wet
37fe824426 Added pickup action to put down explosives. 2015-03-31 17:12:12 +02:00
PabstMirror
146812b5e6 Dragging - Detect static weapon disassembled 
Static weapons can still be disassembled at any time during dragging.
This just adds a simple distance check and drops if object moves away
from player.
 2015-03-30 21:51:11 -05:00
Nicolás Badano
1e0ece9fa2 Revert "Revert "1.42 - cursor mode when bipod deployed"" 2015-03-30 17:32:55 -03:00
Nicolás Badano
d9bfb84675 Revert "1.42 - cursor mode when bipod deployed" 2015-03-30 17:31:50 -03:00
Nicolás Badano
a7f1e58dcf Merge pull request #272 from KoffeinFlummi/142menudeploy 
1.42 - cursor mode when bipod deployed
 2015-03-30 17:26:18 -03:00
PabstMirror
ee961ed1e6 Fix Dropping Unique Magazines 2015-03-29 14:47:57 -05:00
PabstMirror
e65d74f43d Merge branch 'master' into disarmingTest 2015-03-29 14:41:15 -05:00
commy2
d2e6d5887a Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-03-29 21:23:20 +02:00
commy2
54369b772f fix: crate instantly drops when trying to pick up with lowered weapon 2015-03-29 20:46:29 +02:00
PabstMirror
1e2b47d6e7 Wirecutters - use new createAction system 2015-03-29 12:08:01 -05:00
PabstMirror
24b47584a2 InteractMenu - Fix Actions Added to Objects 2015-03-29 12:04:57 -05:00
PabstMirror
209bdc8dfd Merge pull request #257 from KoffeinFlummi/captivesFixRespawn 
Captives fix respawn Fix #230
 2015-03-29 11:23:33 -05:00
commy2
6ca84c3d31 delete obsolete ammo configs 2015-03-29 14:25:13 +02:00
commy2
33f0ff9b82 1.42 ensure ace is loaded after marksmen configs 2015-03-29 14:19:01 +02:00
commy2
4a9124c170 changed behavior of silencers from Marksmen 2015-03-29 14:09:51 +02:00
PabstMirror
95a9daf18b Minor Header Correction 2015-03-28 19:08:25 -05:00
commy2
e574d19844 1.42 - cursor mode when bipod deployed 2015-03-28 16:24:17 +01:00
commy2
c3b9d42834 prepare realistic names for marksman 2015-03-28 12:39:51 +01:00
commy2
b10d3b26ce replace variables with new scripting commands 2015-03-28 11:23:13 +01:00
commy2
6c8064097f delete old resting, farewell 2015-03-28 11:19:39 +01:00
commy2
86e5896c73 intendation 2015-03-28 09:05:58 +01:00
commy2
d959aa1619 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-03-28 08:38:37 +01:00
commy2
53aaeaacd5 fix #263 2015-03-28 08:38:16 +01:00
commy2
23cd523108 fix more inheritance 2015-03-28 08:06:08 +01:00
commy2
853c4d8dca 142 - fix inheritance changes 2015-03-28 07:50:52 +01:00
PabstMirror
40ccf7b241 Captives - Should disable reloading 2015-03-28 01:46:13 -05:00
commy2
772551cbb3 fix broken hungarian string 2015-03-28 07:39:23 +01:00
commy2
d7aaead032 remove obsolete function for channel 2015-03-28 07:04:50 +01:00
commy2
7486ae3036 ace_common_fnc_currentChannel is no longer relyable 2015-03-28 06:55:46 +01:00
PabstMirror
4e4834974a cleanup debug 2015-03-27 23:26:41 -05:00
PabstMirror
aa5a580645 Cleanup 2015-03-27 23:24:11 -05:00
PabstMirror
909f53753a Fix JIP Marker SYnc 2015-03-27 23:19:03 -05:00
PabstMirror
e5cbca02e4 Show placement angle in preview 2015-03-27 22:55:19 -05:00
PabstMirror
24bba5dea6 Headers 2015-03-27 20:51:30 -05:00
commy2
e7ec618f97 function decription 2015-03-28 02:10:04 +01:00
commy2
d12ba196c5 function to return attachments, muzzles with magazines and ammo, moved stuff around 2015-03-28 01:43:30 +01:00
PabstMirror
63b7f0a755 Marker Fixes for 1.42 WIP 2015-03-27 19:22:49 -05:00
commy2
66c026d4a0 refueling the uav didn't work on UAVs local to server or HC 2015-03-28 00:30:51 +01:00
PabstMirror
1695837e0c 1.42 Inventory Config 2015-03-27 13:10:55 -05:00
commy2
5f1201d75a fix unexpected stringtable format 2015-03-27 19:08:01 +01:00
PabstMirror
47c72ac4ae Disable Debug Laser / Commenting 2015-03-27 12:08:05 -05:00
PabstMirror
4d62865ea2 Stop placement on interact_menu open 2015-03-27 11:53:04 -05:00
PabstMirror
91a1ed3264 Cancle attach action 2015-03-27 11:36:31 -05:00
PabstMirror
86c7776802 and this 2015-03-27 11:14:19 -05:00
PabstMirror
f43666eb93 Use CBA PFEH instead of BI stacked 2015-03-27 11:14:04 -05:00
Glowbal
7a091215e1 Draft #188 2015-03-27 16:26:18 +01:00
PabstMirror
51e8dbf53f misc 2015-03-27 00:12:39 -05:00
PabstMirror
d03e474075 Replace selection dialog with interact children 2015-03-27 00:02:54 -05:00
PabstMirror
efe57461b5 misc 2015-03-26 20:05:30 -05:00
Glowbal
4336cf0fc1 Merge pull request #258 from KoffeinFlummi/BananaPort 
Banana
 2015-03-27 00:04:53 +01:00
PabstMirror
9ae4f39d05 Binary Seach for attach pos 2015-03-26 17:49:11 -05:00
Glowbal
f652ae89d1 Banana 2015-03-26 23:14:22 +01:00
PabstMirror
559f0dbaea Unconc - dropping object handled in dragging 2015-03-26 16:32:44 -05:00
PabstMirror
6a71a04ad9 opps 2015-03-26 15:52:30 -05:00
PabstMirror
de644ba9b0 Medical - Reset captive status for respawning unit 2015-03-26 15:49:08 -05:00
PabstMirror
048be00a0f Medical - QGVAR(isUnconscious) -> "ACE_isUnconscious" 2015-03-26 15:47:08 -05:00
PabstMirror
2eefb1265d Medical - morphine icon for left leg 2015-03-26 15:16:28 -05:00
PabstMirror
3f137d357d Medical - carryObj func moved 2015-03-26 15:05:50 -05:00
PabstMirror
14cbceef97 Rerun set func when respawn into captive unit 2015-03-26 14:21:26 -05:00
commy2
9fcb193064 Merge pull request #243 from KoffeinFlummi/mediccarry 
refining carrying injured persons
 2015-03-26 18:04:35 +01:00
commy2
e129d139d7 indentation 2015-03-26 18:03:13 +01:00
commy2
355dfc0988 Merge pull request #254 from KoffeinFlummi/noidle 
remove idle animations for players with lowered weapon
 2015-03-26 18:01:20 +01:00
commy2
c68430cb38 Merge pull request #255 from KoffeinFlummi/norearm 
hide rearm action for players
 2015-03-26 18:01:01 +01:00
commy2
d9e59aba3e Merge pull request #256 from KoffeinFlummi/hitreactions 
fall down after getting shot while moving
 2015-03-26 17:56:51 +01:00
commy2
0a0e7c8a0c disable user input was broken 2015-03-26 17:32:00 +01:00
commy2
9a0f0cb47b stuff from medical 2015-03-26 16:58:41 +01:00
commy2
cf2b7d3bfb private 2015-03-26 15:19:13 +01:00
commy2
20dd8f34fc fall down after getting shot while moving 2015-03-26 15:06:51 +01:00
commy2
164e8f95c9 hide rearm action for players 2015-03-26 14:14:56 +01:00