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
4,748 Commits 73 Branches 88 Tags 752 MiB
f8003fd865
Commit Graph

3961 Commits

Author SHA1 Message Date
jaynus
ddaf05262e Merge pull request #638 from FreeZbe/patch-15 
French : update stringtable
 2015-04-15 12:29:02 -07:00
jaynus
0a3a650437 Merge pull request #634 from FreeZbe/patch-11 
French : update stringtable
 2015-04-15 12:28:26 -07:00
FreeZbe
5a7ad82170 French : update stringtable 2015-04-15 21:26:12 +02:00
jaynus
2d189e6199 Merge branch 'master' of github.com:acemod/ACE3 2015-04-15 12:26:03 -07:00
jaynus
10cf02e856 Slower climb phase.Refs #630 2015-04-15 12:25:57 -07:00
FreeZbe
18c65108c3 French : update stringtable 2015-04-15 21:24:24 +02:00
Nicolás Badano
3e205a70d8 Merge pull request #636 from FreeZbe/patch-13 
French : update stringtable
 2015-04-15 16:18:58 -03:00
Nicolás Badano
e6cc26cc96 Merge pull request #635 from FreeZbe/patch-12 
French : update stringtable
 2015-04-15 16:18:39 -03:00
Nicolás Badano
1678a6d695 Merge pull request #628 from ruPaladin/master 
Russian translation fixes
 2015-04-15 16:17:59 -03:00
FreeZbe
56f6c60e1a French : update stringtable 2015-04-15 21:17:35 +02:00
FreeZbe
df61f5c995 French : update stringtable 2015-04-15 21:15:57 +02:00
FreeZbe
c0dbf10971 French : update stringtable 2015-04-15 21:14:00 +02:00
jaynus
5bcb0ec493 Forgot to set terminal on short-range attacks. Fixes #630 2015-04-15 12:09:47 -07:00
commy2
f40373bb78 Merge pull request #550 from acemod/rallypointfix 
fix rallypoints being broken, fix #522
 2015-04-15 21:03:13 +02:00
FreeZbe
550c32e801 French : update stringtable 2015-04-15 20:53:41 +02:00
commy2
d68cc8f40e sync rallypoint marker on jip 2015-04-15 20:50:03 +02:00
ulteq
3ca37baf44 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-15 20:33:19 +02:00
ulteq
3a062a4ff9 Fixed incorrect Mk319 Mod 0 BC/airFriction 2015-04-15 20:33:11 +02:00
FreeZbe
bc5b9bdfe9 French : update / fix strintable 2015-04-15 20:11:08 +02:00
PabstMirror
e54d8dc827 ProgressBar - Fixed Alignment 2015-04-15 12:55:20 -05:00
PabstMirror
134f48ba55 Merge pull request #602 from acemod/nametagsIsSpeakingPerf 
Nametags - isSpeaking reduce network traffic
 2015-04-15 12:55:15 -05:00
ulteq
d9b3255e21 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-15 19:51:40 +02:00
ulteq
3cff85e85d Added Mk319 Mod 0 ammo and magazines 2015-04-15 19:51:34 +02:00
Glowbal
c88479d54d staged work 2015-04-15 19:45:42 +02:00
commy2
18be5276a9 rally point moved eh, markers at rallypoint positions 2015-04-15 19:18:42 +02:00
jaynus
743a6d82a5 Merge branch 'master' of github.com:acemod/ACE3 2015-04-15 10:11:18 -07:00
jaynus
25b7f779f1 Difficulty magic. 2015-04-15 10:11:13 -07:00
ruPaladin
26d53d255f Update stringtable.xml 2015-04-15 20:08:39 +03:00
ulteq
396bd3954e Fixed a typo 2015-04-15 19:04:41 +02:00
ruPaladin
fe72eef3da Update stringtable.xml 2015-04-15 20:02:41 +03:00
ulteq
b5a82e313e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-15 19:00:24 +02:00
ulteq
0c4734637b Fixed the GM6 barrel length and updated the magazines array 2015-04-15 19:00:14 +02:00
ruPaladin
92031cc354 Update stringtable.xml 2015-04-15 19:59:45 +03:00
ulteq
f8061922f7 Added ACE_10Rnd_338_API526_Mag, ACE_5Rnd_127x99_Mag, ACE_5Rnd_127x99_AMAX_Mag 2015-04-15 18:59:41 +02:00
ulteq
e0c34f22bf Added ACE_338_Ball_API526 and updated some airFriction values 2015-04-15 18:59:11 +02:00
ruPaladin
3773238e25 Update stringtable.xml 2015-04-15 19:56:34 +03:00
jaynus
2e3545f3d0 Merge branch 'master' of github.com:acemod/ACE3 2015-04-15 09:55:48 -07:00
jaynus
ea2281616e Enable all variants of Titan. Can now vanilla-lock in cadet mode. 2015-04-15 09:55:40 -07:00
ulteq
64d6bbaf26 Fixed an incorrect BC in an ATragMX gun profile 2015-04-15 18:55:20 +02:00
ruPaladin
7051152d93 Update stringtable.xml 2015-04-15 19:53:42 +03:00
ruPaladin
d8eb564c65 Update stringtable.xml 2015-04-15 19:52:29 +03:00
ruPaladin
252fb67119 Update stringtable.xml 2015-04-15 19:50:32 +03:00
PabstMirror
e84689a771 #544 - Change ERROR warning to debug trace 2015-04-15 11:46:06 -05:00
PabstMirror
6ea38a9946 Only check A3 VON if no radio mods running 2015-04-15 11:34:27 -05:00
Nicolás Badano
fecb2f37c0 Merge pull request #621 from ruPaladin/patch-5 
Kestrel 4500NV translation to Russian
 2015-04-15 13:28:44 -03:00
Nicolás Badano
0a6604a94f Merge pull request #622 from ruPaladin/patch-6 
addons/interact_menu translation to Russian
 2015-04-15 13:28:33 -03:00
jaynus
a5700540bb Merge pull request #623 from ruPaladin/patch-7 
addons/weather/ translation to Russian
 2015-04-15 09:28:04 -07:00
Nicolás Badano
7589b8b13d Merge pull request #626 from ruPaladin/patch-11 
addons/medical translation to Russian
 2015-04-15 13:27:22 -03:00
jaynus
5923f246fd Fixed: only exit on shooter. 2015-04-15 09:25:19 -07:00
jaynus
c793df4848 Changed: Safety mode on Titan, it now doesnt show as unloaded Fixed: Some TOP shots would miss, Fixed: Lock constraints would show on fast weapon switch. 2015-04-15 09:10:00 -07:00
ruPaladin
a3965424b9 addons/medical translation to Russian 2015-04-15 19:09:10 +03:00
Marco
ad67fca8f4 Update stringtable.xml 2015-04-15 17:45:48 +02:00
Ivan Navarro Cabello
40b784fb7a update stringtable 
added spanish translate
 2015-04-15 17:41:10 +02:00
ruPaladin
9caba1e3a3 addons/weather/ translation to Russian 2015-04-15 18:29:38 +03:00
ruPaladin
64504a9515 addons/interact_menu translation to Russian 2015-04-15 18:27:28 +03:00
ruPaladin
6fca601759 Kestrel 4500NV translation to Russian 2015-04-15 18:24:57 +03:00
jaynus
0d28a890e1 Fixes: Cycle fire mode on Titan was not working. Closes #603 2015-04-15 08:19:21 -07:00
Legolasindar
bbc24b6d02 Update stringtable.xml 
added spanish translate
 2015-04-15 16:49:43 +02:00
commy2
9c1b40f5a3 preparing for improved positions of action points 2015-04-15 16:40:20 +02:00
ulteq
98d0c06ce3 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-15 16:22:50 +02:00
ulteq
95b04d0840 Added custom airFriction values for the new marksmen ammo types. 2015-04-15 16:22:42 +02:00
commy2
6710040633 toLower in, always follow your own advice 2015-04-15 16:13:53 +02:00
KoffeinFlummi
250d6acb22 Merge https://github.com/Legolasindar/ACE3 into spanish-merge 2015-04-15 16:09:40 +02:00
commy2
bf8f9b4818 all I need is a $ 2015-04-15 15:34:01 +02:00
KoffeinFlummi
1fc546a700 Merge branch 'polish-merge' 2015-04-15 15:10:41 +02:00
KoffeinFlummi
79934cfb78 Merge https://github.com/Coren4/ACE3 into polish-merge 2015-04-15 15:10:28 +02:00
ulteq
1e326c17ad Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-15 15:06:35 +02:00
commy2
eecf405fda Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix 2015-04-15 15:06:29 +02:00
ulteq
238cf1cc63 Added keybinds for ATragMX and Kestrel 4500 (empty by default) 2015-04-15 15:06:28 +02:00
commy2
5eededd3e1 Recoil overhaul initial commmit 2015-04-15 15:01:07 +02:00
Nicolás Badano
69489df910 Merge pull request #610 from ramius86/patch-3 
Update stringtable.xml
 2015-04-15 09:57:27 -03:00
Nicolás Badano
527385e6e1 Merge pull request #609 from ramius86/patch-2 
Update stringtable.xml
 2015-04-15 09:57:15 -03:00
KoffeinFlummi
21305629ed Merge branch 'patch-1' of https://github.com/nomisum/ACE3 into german-merge 2015-04-15 14:53:27 +02:00
commy2
e3d1946924 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix 2015-04-15 14:37:49 +02:00
KoffeinFlummi
8b915380b7 Merge branch 'hungarian-merge' 2015-04-15 13:55:02 +02:00
KoffeinFlummi
2ffbccbf20 Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge 2015-04-15 12:59:56 +02:00
ulteq
9f289e1721 Fixed incorrect return values in some key handlers: 
*Wind info
*Protractor
 2015-04-15 12:53:02 +02:00
ulteq
42dbd8f5d2 Continued work on the magazine classes: 
*Fixed Katiba using the wrong magazine
*Added ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim
*Added ACE_10Rnd_338_300gr_HPBT_Mag
*Changed some of the .338 magazine initSpeeds to match the new Mar-10 barrel length
*Added the new caseless green ir dim magazine to the ammo crates
*Allowed the Mar-10 to shoot .300 Win Mag
 2015-04-15 12:30:48 +02:00
ulteq
bd5ed13621 Added ACE_65x39_Caseless_green_Tracer_Dim 2015-04-15 12:27:20 +02:00
Marco
bc62891122 Update stringtable.xml 
Italian
 2015-04-15 11:24:20 +02:00
Marco
76ff1da57a Update stringtable.xml 
Italian
 2015-04-15 11:19:54 +02:00
Marco
47f8161855 Update stringtable.xml 
Italian
 2015-04-15 11:18:22 +02:00
Marco
924cd80e60 Update stringtable.xml 
ITalian
 2015-04-15 11:13:47 +02:00
Marco
cb2e1c5116 Update stringtable.xml 
Italian
 2015-04-15 11:13:19 +02:00
Marco
5238647021 Update stringtable.xml 
Italian
 2015-04-15 11:12:15 +02:00
Marco
f931c1a42c Update stringtable.xml 
Italian
 2015-04-15 11:10:05 +02:00
Marco
96be1baddc Update stringtable.xml 
Italian
 2015-04-15 11:08:43 +02:00
Marco
8c0f52e615 Update stringtable.xml 
Italian
 2015-04-15 11:08:04 +02:00
Marco
d1936d8e1b Update stringtable.xml 
Italian
 2015-04-15 11:06:42 +02:00
Marco
5c7b8247c5 Update stringtable.xml 
Italian
 2015-04-15 11:05:57 +02:00
Marco
6e7c1ce9d2 Update stringtable.xml 
Ita
 2015-04-15 11:04:18 +02:00
Marco
544894a05e Update stringtable.xml 
Italian
 2015-04-15 10:59:44 +02:00
Marco
9a8dd905f2 Update stringtable.xml 2015-04-15 10:56:39 +02:00
Marco
eceb759523 Update stringtable.xml 
Italian
 2015-04-15 10:53:35 +02:00
Marco
b28ef3d22d Update stringtable.xml 
Italian
 2015-04-15 10:52:40 +02:00
Marco
45fec0409d Update stringtable.xml 
Italian
 2015-04-15 10:51:26 +02:00
Marco
c9e452a000 Update stringtable.xml 
Italian
 2015-04-15 10:48:52 +02:00
Marco
aaee9c72c1 Update stringtable.xml 
Italian translation
 2015-04-15 10:44:13 +02:00
Marco
f328d302e1 Update stringtable.xml 
Italian translation
 2015-04-15 10:42:25 +02:00
Marco
2daa0e2d29 Update stringtable.xml 
Italian translation
 2015-04-15 10:32:01 +02:00
Marco
532ee16411 Update stringtable.xml 
Italian translation
 2015-04-15 10:30:56 +02:00
Marco
af3fdf9b91 Update stringtable.xml 
Italian translation
 2015-04-15 10:28:09 +02:00
commy2
09289fbf48 only on server though 2015-04-15 08:34:30 +02:00
commy2
6c4e50a98d localized names for rallypoints, auto assign slot of group leader at the start of the mission as JIP persistant rallypoint mover slot 2015-04-15 08:31:40 +02:00
commy2
44fad81fe1 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix 2015-04-15 06:51:59 +02:00
esteldunedain
69aef53f5b Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-15 01:34:10 -03:00
esteldunedain
25e8e93fd0 Add back stringtables for the list menu 2015-04-15 01:32:42 -03:00
Nicolás Badano
d7a0503dbc Merge pull request #600 from acemod/lmbmenu 
disable firing if menu is opened, fix #368, close #483
 2015-04-15 01:29:39 -03:00
esteldunedain
5faf4b7dfa Remove comment 2015-04-15 01:27:29 -03:00
PabstMirror
a36739c697 Merge pull request #418 from acemod/flashbangTweaks 
Flashbang tweaks
 2015-04-14 23:23:15 -05:00
esteldunedain
a9f44530c9 Move the function that prevents firing while the interact_menu is open to the interact_menu pbo 2015-04-15 01:20:20 -03:00
PabstMirror
1f51a3fc8a Never use this func anywhere 2015-04-14 23:10:05 -05:00
PabstMirror
428688422e Missing stringtable for listMenu 2015-04-14 22:47:57 -05:00
Niko Lehtovirta
df8a958c42 Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-15 06:45:42 +03:00
commy2
d6a293c573 disable firing if menu is opened 2015-04-15 05:19:03 +02:00
esteldunedain
7ad9238bbf Fixes 2015-04-14 23:32:03 -03:00
esteldunedain
c6c7ef7c79 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-14 23:22:35 -03:00
esteldunedain
c397246534 Fix the fov test. Issue not fixed 2015-04-14 23:22:08 -03:00
jaynus
57acee0f89 Changed: Cleaned up Missile guidance setting for AI, SCALAR. 2015-04-14 19:19:14 -07:00
esteldunedain
53ce7d0be4 Increase the tolerance to 2m 2015-04-14 23:12:48 -03:00
esteldunedain
7a606a2352 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-14 22:54:10 -03:00
esteldunedain
ee34078960 Add early visibility check to interact menu 2015-04-14 22:53:10 -03:00
PabstMirror
00b9e2d72c draw3d 2015-04-14 20:49:44 -05:00
PabstMirror
91c8c89e87 Only sync A3 VON status over network 2015-04-14 20:47:07 -05:00
jaynus
b307b4bc4b Fixed: Flummi missed 2 isClientSettable renames. 2015-04-14 18:38:52 -07:00
jaynus
ad95105508 Added and enabled AMG for AI. 2015-04-14 18:25:02 -07:00
jaynus
ef6d090238 Fixed: JAV_DIR was erroring. 2015-04-14 18:18:38 -07:00
jaynus
37de67395f Fixed: issue where Javelin wouldn't hit > 1500 2015-04-14 18:18:27 -07:00
commy2
2940d1f83c base rallypoints create a respawn marker if none is present in the mission 2015-04-15 03:10:17 +02:00
PabstMirror
1488ba2aac #595 - Hide ace optino button if no world loaded 
I wanted to use a rscMapControl onDraw, but it throws an error
onMouseMoving seems odd, but it works and I don't have to overload
onLoad
 2015-04-14 19:52:35 -05:00
commy2
e1926c6af1 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix 2015-04-15 02:12:16 +02:00
jaynus
b39209cc28 BAD @esteldunedain! BAD DOGGY! 2015-04-14 17:09:13 -07:00
commy2
29633d763a Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix 2015-04-15 02:05:55 +02:00
jaynus
fb6553a7a7 Only show distance if laser is on. 2015-04-14 16:57:01 -07:00
commy2
4cdf61ab9e fix misc issues with rallypoints 2015-04-15 01:50:58 +02:00
Grzegorz
d538cd257c PL translation fix 
Typo, wrote Mk248 Mod 0, should be Mk248 Mod 1
 2015-04-15 01:44:33 +02:00
Nicolás Badano
10b1587453 Merge pull request #592 from gienkov/master 
PL translation
 2015-04-14 20:36:25 -03:00
jaynus
934f2ce097 Display current laser code. Standardize GVARs 2015-04-14 16:29:49 -07:00
esteldunedain
88b78ad3ca Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-14 20:21:39 -03:00
esteldunedain
ee04ea2f41 Allow actions on coordinates instead of selections 2015-04-14 20:21:11 -03:00
jaynus
2ec74a6a3e align correctly, create event, remove FCS from laserDesignator. 2015-04-14 16:20:03 -07:00
jaynus
971566fc3e Laser code dialog entry. ACTUALLY HIDE THE DAMN LASER 2015-04-14 16:05:01 -07:00
Grzegorz Sikora
3543b9c806 PL Translation 
Some french, german and russian entries were listed twice, had to remove
one of two here and there so this list is for revision by different
translators
 2015-04-15 00:43:42 +02:00
jaynus
81e61e2f04 Added non-radio speaking event to ACRE isSpeaking functionality. Why is this propegating a setVariable every speaking event though? ACRE already propegates that. Closes #591 2015-04-14 15:30:04 -07:00
esteldunedain
2ff6eef792 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-14 19:18:08 -03:00
esteldunedain
ad750977e0 Fix ACRE volume on medical unconsciousness 2015-04-14 19:17:05 -03:00
jaynus
10bb77e738 Merge branch 'master' of github.com:acemod/ACE3 2015-04-14 15:11:55 -07:00
jaynus
c136b78fc8 rename 20mm 2015-04-14 15:11:49 -07:00
esteldunedain
495c822061 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-14 19:10:31 -03:00
esteldunedain
6f4bb48489 Merge branch 'master' into linearMenuExperiment 
Conflicts:
	addons/attach/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/overheating/stringtable.xml
	extensions/CMakeLists.txt
 2015-04-14 19:09:57 -03:00
commy2
7c5a6538a9 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix 2015-04-15 00:06:12 +02:00
jaynus
36ebb96531 Merge branch 'master' of github.com:acemod/ACE3 2015-04-14 14:58:29 -07:00
jaynus
85c10328ae missed one. 2015-04-14 14:58:19 -07:00
Felix Wiegand
5d8dd701d2 Merge pull request #518 from acemod/basic-medical-tweaks 
Basic medical tweaks
 2015-04-14 23:49:00 +02:00
jaynus
df3c8155a0 Merge branch 'master' of github.com:acemod/ACE3 2015-04-14 14:45:30 -07:00
jaynus
c6943fbdaf fixes to ACRE volume, and this transform should really be in set/get global volume. Closes #588 2015-04-14 14:45:21 -07:00
commy2
4c6cc8dddf merging stringtables 2015-04-14 23:22:25 +02:00
KoffeinFlummi
9b80245479 Fix speed limiter not working 2015-04-14 23:13:02 +02:00
KoffeinFlummi
8b1bce3b3d Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-14 23:00:59 +02:00
KoffeinFlummi
9e64538bc7 Fix minor adjustment strings 2015-04-14 23:00:17 +02:00
KoffeinFlummi
f07949cf19 Remove some old todos 2015-04-14 22:57:18 +02:00
KoffeinFlummi
676f7c8732 Remove hitpart from action names for non-self 2015-04-14 22:50:06 +02:00
KoffeinFlummi
13d7649c4a Buff colour flashing effect 2015-04-14 22:49:26 +02:00
KoffeinFlummi
2391c5e6d6 Tweak crate names 2015-04-14 22:34:19 +02:00
KoffeinFlummi
91e25dc215 Missing stringtable entries 2015-04-14 22:34:08 +02:00
ulteq
8aad369ed3 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-14 22:23:56 +02:00
ulteq
035ed573b8 Reworked the magazine configs 2015-04-14 22:23:36 +02:00
ulteq
1d64b8c36e Added the new magazines into various ammo boxes 2015-04-14 22:22:36 +02:00
ulteq
e214511e36 Added new magazine classes: 
*ACE_100Rnd_65x39_caseless_mag_Tracer_Dim
*ACE_200Rnd_65x39_cased_Box_Tracer_Dim
*ACE_30Rnd_556x45_Stanag_Mk262_mag
*ACE_30Rnd_556x45_Stanag_Mk318_mag
*ACE_10Rnd_762x51_M118LR_Mag
*ACE_20Rnd_762x51_M118LR_Mag
*ACE_20Rnd_762x67_Mk248_Mod_0_Mag
*ACE_20Rnd_762x67_Mk248_Mod_1_Mag
*ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag
*ACE_30Rnd_65x47_Scenar_mag
*ACE_10Rnd_762x54_Tracer_mag
 2015-04-14 22:19:51 +02:00
ulteq
f0a716fee8 Added new ammo classes: 
*762x67mm Mk248 Mod 0
*762x67mm Mk248 Mod 1
*762x67mm Berger Hybrid OTM
*65x47mm Scenar
 2015-04-14 22:17:27 +02:00
KoffeinFlummi
7af6ea36a6 Fix missing pain effect option name 2015-04-14 22:07:43 +02:00
KoffeinFlummi
348bf611f8 Merge branch 'master' into basic-medical-tweaks 2015-04-14 21:55:45 +02:00
KoffeinFlummi
684c36f8a5 Add pain effect option 2015-04-14 21:49:56 +02:00
Nicolás Badano
462947a04c Merge pull request #585 from acemod/fix-clientSetable 
Fix spelling of "isClientSetable"
 2015-04-14 16:48:50 -03:00
KoffeinFlummi
ebcdafe610 Fix spelling of "isClientSetable" 2015-04-14 21:43:19 +02:00
KoffeinFlummi
e7807c009f Use playerInventoryChanged instead of Take 
This makes sure to also fire when other mods, like TFAR (when adding
backpacks) add items via script.
 2015-04-14 21:28:18 +02:00
Glowbal
af255604ac Switched to event based sync system for open wounds 2015-04-14 21:17:36 +02:00
jaynus
2f2eab87e2 Merge branch 'master' of github.com:acemod/ACE3 2015-04-14 11:42:38 -07:00
jaynus
739807303b Fix script error for canceling designation and dying while designating. 2015-04-14 11:42:26 -07:00
KoffeinFlummi
71b19b4621 Remove duplicate bleeding code 2015-04-14 20:40:38 +02:00
KoffeinFlummi
ba377dfd3a Show seperate message for "scratches"; localize 2015-04-14 20:40:17 +02:00
KoffeinFlummi
c6118901b4 Merge branch 'master' into basic-medical-tweaks 2015-04-14 20:35:17 +02:00
KoffeinFlummi
7ca36cdb65 Always show wounds, even for very low damage 2015-04-14 20:28:19 +02:00
KoffeinFlummi
a4c93ab2e2 Add seperate crates for basic and advanced 2015-04-14 20:28:00 +02:00
KoffeinFlummi
c379f2775e Style fixes 2015-04-14 20:27:42 +02:00
jaynus
0ae27d16c5 Merge pull request #580 from acemod/seeker_fov 
Seeker FOV check optimizations
 2015-04-14 11:19:00 -07:00
jaynus
24830f815f random lock interval was causing phasing. 2015-04-14 11:18:16 -07:00
ulteq
cf7caf4549 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-14 20:18:03 +02:00
ulteq
837f155ad7 Fixed incorrect key handler return value 2015-04-14 20:17:54 +02:00
jaynus
1dd41a00ba integration. 2015-04-14 10:51:53 -07:00
jaynus
226312c504 Merge remote-tracking branch 'origin/master' into seeker_fov 
Conflicts:
	addons/missileguidance/functions/fnc_checkSeekerAngle.sqf
 2015-04-14 10:47:40 -07:00
jaynus
511ca860e0 Merge pull request #579 from acemod/moreJavelinLockingFixes 
More javelin locking + UI fixes
 2015-04-14 10:40:51 -07:00
jaynus
fb5b524023 Loosen DAGR curve 2015-04-14 10:39:00 -07:00
jaynus
f0940707be Disable locking on unloaded. Closes #539 2015-04-14 10:27:37 -07:00
jaynus
6f3ce27894 Javelin refined, working, locking fixes, UI fixes, missile guidance rewrite 2015-04-14 10:25:08 -07:00
jaynus
c436541f1c Reworked, fun fun. 2015-04-14 09:36:39 -07:00
jaynus
376f924999 Finish guidance rewrite. 2015-04-14 08:24:13 -07:00
Nicolás Badano
a93cb310d4 Merge pull request #513 from acemod/mainCleanup 
ACE_Main major cleanup
 2015-04-14 10:25:14 -03:00
esteldunedain
c827c72412 AB and Kestrel: Move macros from defines.h to script_component 2015-04-14 10:22:26 -03:00
KoffeinFlummi
57c526c04d Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-14 15:12:46 +02:00
KoffeinFlummi
c1fccecb21 Merge branch 'patch-4' of https://github.com/ruPaladin/ACE3 into russian-merge 2015-04-14 15:12:24 +02:00
Nicolás Badano
85d253cdc1 Merge pull request #574 from gienkov/master 
Advanced Ballistics PL translation
 2015-04-14 10:10:59 -03:00
KoffeinFlummi
b563bf8a8e Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge 2015-04-14 15:04:42 +02:00
KoffeinFlummi
63fe4118d4 Merge https://github.com/FreeZbe/ACE3 into french-merge 2015-04-14 14:48:13 +02:00
commy2
ea7659a36e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix 2015-04-14 13:36:02 +02:00
commy2
f89e02a5ca fix no laser in ffv slots 2015-04-14 13:24:17 +02:00
commy2
83ce3fa2bd remove drawline3d 2015-04-14 13:14:37 +02:00
ulteq
994071960c Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-14 12:52:30 +02:00
ulteq
1a39005e72 Removed debug output. 2015-04-14 12:52:21 +02:00
KoffeinFlummi
96319c8799 Merge https://github.com/ruPaladin/ACE3 into russian-merge 2015-04-14 12:50:14 +02:00
Coren4
83c8abb3ba Update stringtable.xml 2015-04-14 12:41:35 +02:00
ulteq
44232987b0 Commented out deprecated icon paths 2015-04-14 12:34:27 +02:00
ulteq
3d558f376f Fixed some icon path names 2015-04-14 12:16:29 +02:00
Grzegorz Sikora
1be197728e AdvBal PL translation 2015-04-14 11:42:52 +02:00
ulteq
864a3c3cda Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500 
Conflicts:
	addons/weather/XEH_postInit.sqf
 2015-04-14 11:14:27 +02:00
ulteq
5a7078ad2c Removed a deprecated workaround 2015-04-14 11:12:58 +02:00
ulteq
9f0388fa12 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics 2015-04-14 11:09:38 +02:00
ulteq
983a36e52d Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX 2015-04-14 11:06:32 +02:00
ulteq
d931745f5c Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into largerScopeaAdjustments 2015-04-14 11:02:37 +02:00
ulteq
2f39067cb3 Removed TABs 2015-04-14 10:47:09 +02:00
jaynus
22d90fee9a Begin modelToWorld work. 2015-04-13 16:47:09 -07:00
jaynus
761fef39c8 working save. 2015-04-13 15:34:51 -07:00
commy2
3da3543381 toggle laser vs ir laser 2015-04-14 00:32:09 +02:00
Harakhti
e7e46b3b59 Translation: S to W 
That's all I've found so far.
 2015-04-14 00:05:39 +02:00
Harakhti
8bfd915ec4 Translation: N to R 
This was a lot more fun than the previous two were. 12 folders left...
 2015-04-13 23:45:44 +02:00
commy2
c95bd42a19 Merge pull request #548 from acemod/opticsfix 
fix misc issues with optics, fix #537
 2015-04-13 23:22:12 +02:00
ulteq
acc021c11c Replaced TABs and newline braces 2015-04-13 23:10:55 +02:00
Harakhti
1b60a335a5 Translation: J to M 
I feel burned out. This was very specifically long and tedious.
 2015-04-13 23:03:09 +02:00
commy2
b72366f0f6 hide laser beam during day 2015-04-13 22:34:43 +02:00
commy2
ada62fca7d reloading launchers didn't work on remote clients 2015-04-13 21:38:01 +02:00
ulteq
c2ac7fc547 Removed magazines module 2015-04-13 21:37:19 +02:00
ulteq
33a06c5706 Updated stringtable 2015-04-13 21:36:47 +02:00
ulteq
2332f19274 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics 
Conflicts:
	addons/ballistics/stringtable.xml
	addons/magazines/CfgAmmo.hpp
	addons/magazines/CfgMagazines.hpp
	addons/magazines/CfgVehicles.hpp
	addons/magazines/CfgWeapons.hpp
	addons/magazines/newclasses.txt
 2015-04-13 21:35:53 +02:00
ulteq
1073f4e484 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX 
Conflicts:
	AUTHORS.txt
 2015-04-13 21:33:12 +02:00
ulteq
032d745334 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into largerScopeaAdjustments 2015-04-13 21:32:09 +02:00
ulteq
fa88ab484e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500 
Conflicts:
	addons/kestrel/stringtable.xml
 2015-04-13 21:31:04 +02:00
Nicolás Badano
db6361a086 Merge pull request #565 from Kllrt/master 
Added another new CZ strings
 2015-04-13 16:25:32 -03:00
ulteq
ea78a6325f Changed the module setting defaults 2015-04-13 21:20:07 +02:00
ulteq
1b2691ff1c Fixed incorrect calculation of the scope adjustment limits 2015-04-13 21:17:30 +02:00
Kllrt
1c611ba2db Added another new CZ strings 2015-04-13 21:15:04 +02:00
ulteq
8edb2d2c49 Complete overhaul of all ammo/magazine and weapon classes: 
*Merged the magazines- into the ballistics module
*Adjusted all magazine class initSpeeds
*Adjusted all weapon class initSpeeds
 2015-04-13 21:08:31 +02:00
commy2
804079cfae manual merge 2015-04-13 20:20:55 +02:00
Harakhti
3c3f6ba4c3 Translation: A to I 
Some parts filled out, other parts corrected or stylized.
 2015-04-13 19:28:58 +02:00
commy2
bd168981e2 how do I merge 2015-04-13 19:23:42 +02:00
bux578
0e6eb46bb4 Merge pull request #560 from gienkov/master 
Further PL translation fixes
 2015-04-13 19:18:54 +02:00
commy2
fa64225e55 Merge pull request #505 from acemod/muteunit 
Muteunit framework, fix #473
 2015-04-13 19:18:45 +02:00
commy2
f48b6dc77a Merge pull request #519 from acemod/marksmenai 
increase engagement ranges / burst mode on new mmg / full auto dmr
 2015-04-13 19:18:40 +02:00
Grzegorz
2cd456432e Update stringtable.xml 2015-04-13 19:17:42 +02:00
Grzegorz
5269f32d62 weird but fixed 
Something went wrong there, but fixed
 2015-04-13 19:11:39 +02:00
jaynus
ff858c1194 Begin stateful guidance. Re-write of TOP down because it wasnt even running. LIN was default. but it was broken anyways. 2015-04-13 09:56:15 -07:00
jaynus
e5d8fe2634 Guidance timing per FPS fixes. 2015-04-13 09:24:28 -07:00
jaynus
3e7c8ca634 remove optic debug. 2015-04-13 09:03:19 -07:00
Grzegorz Sikora
ac886828b0 Fixes 2015-04-13 18:02:48 +02:00
jaynus
6aa9f5bcbc NFOV/WFOV 2015-04-13 09:01:18 -07:00
jaynus
c66f99faac Fixed: Locking reticles would lock out-of-order. Fixed: Locking was hard. Fixes #539 2015-04-13 08:59:36 -07:00
jaynus
2d6b2f9a1a I had accidently commented out seeker FOV on the Titan rockets. 2015-04-13 08:33:03 -07:00
Grzegorz
ec381699ca fix missing class 
Am I doin it right?
Works for me.
 2015-04-13 16:48:14 +02:00
bux578
cba66366bd fix invalid xml 2015-04-13 15:25:51 +02:00
bux578
8c24d9ec35 fix invalid xml, fix duplicate keys 2015-04-13 15:25:30 +02:00
ulteq
c12cc24a78 TABS: 
* "kill them with fire"
* "then kill them again, with a rusty spoon"
 2015-04-13 14:48:31 +02:00
ulteq
d8c23c2a64 Merged advanced_ballistics\CfgWeapons.cpp into ballistics\CfgWeapons.hpp 2015-04-13 14:46:21 +02:00
Niko Lehtovirta
21c9272293 Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-13 15:37:38 +03:00
KoffeinFlummi
363a6b3738 Fix erroneus tag in nametags stringtable 
Re: f6c7d444
 2015-04-13 14:32:55 +02:00
KoffeinFlummi
8d4003a396 Merge https://github.com/HerrStein/ACE3 into german-merge 2015-04-13 14:21:00 +02:00
KoffeinFlummi
f6c7d444e1 Merge https://github.com/Anthariel/ACE3 into french-merge 2015-04-13 13:31:48 +02:00
commy2
f94b4befef initial commit 2015-04-13 13:04:23 +02:00
KoffeinFlummi
b93cf4fb4a Merge branch 'polish-merge' 2015-04-13 13:01:17 +02:00
KoffeinFlummi
118b5509ea Merge https://github.com/gienkov/ACE3 into polish-merge 2015-04-13 13:00:59 +02:00
ulteq
5354d6578b Simplified the AB PFH massively 2015-04-13 12:56:53 +02:00
ulteq
63760acc4f Added an error message when the ab extension is missing 2015-04-13 12:56:18 +02:00
ulteq
c8aa3032fe Added some sanity checks to the module setting initialization 2015-04-13 12:54:06 +02:00
commy2
fce7c4d0be manual merge 2015-04-13 12:52:47 +02:00
commy2
0214d891e1 fix misc issues with optics, fix #537 2015-04-13 12:04:43 +02:00
ulteq
4355df118c Refactored the Kestrel4500 Code. 2015-04-13 11:53:19 +02:00
Kllrt
915ac46e04 Very small typo in CZ translation 
-.-
 2015-04-13 11:00:47 +02:00
ruPaladin
ccc2124abe Russian translation for addons/interaction 
Fix for addons/interaction translation.
 2015-04-13 11:53:15 +03:00
PabstMirror
bf3e3d3b64 #542 - ACE_fakeWeapon not found 2015-04-13 03:46:42 -05:00
ulteq
c98422b2c6 Shrinked some of the .paa files 2015-04-13 10:45:37 +02:00
ulteq
deadbd9414 Reduced the amount of LOD levels of the Kestrel 2015-04-13 10:39:31 +02:00
ulteq
939365a376 New texture for the Kestrel model 2015-04-13 10:39:14 +02:00
PabstMirror
7111cdd8ff #540 - remove debug spam 2015-04-13 03:16:33 -05:00
PabstMirror
2a015482a1 Old Interaction Events (1713999 is long dead) 2015-04-13 01:03:08 -05:00
PabstMirror
878bdadbb3 Switch clientInit to postInit 2015-04-13 00:46:45 -05:00
PabstMirror
70dbae5a25 #527 - Unconscious switching groups 2015-04-13 00:32:07 -05:00
PabstMirror
669dbe10c9 BecomeLeader - Don't create new group 2015-04-13 00:23:00 -05:00
Nou
b58598c6aa Woops, missing ) 2015-04-12 21:47:27 -07:00
PabstMirror
b50a7a0147 Try to fix degree symbol (encoding issue) 2015-04-12 22:56:46 -05:00
PabstMirror
7719da2f66 Javelin Localiztion 2015-04-12 22:45:55 -05:00
PabstMirror
36b92b3d44 Don't do client stuff on dedicated. 2015-04-12 22:44:19 -05:00
Nou
4c74ff8717 FOV check made faster. 2015-04-12 19:49:14 -07:00
Nou
dc5028275a Seeker FOV implemented, fast FOV check. 2015-04-12 19:16:58 -07:00
Anthariel
3e8c8384cf Update stringtable.xml 
Missing translation
 2015-04-13 02:24:13 +02:00
Anthariel
8339d15087 Update stringtable.xml 
Added: French translations (note, I've already removed a % at the line 30
 2015-04-13 02:21:57 +02:00
Anthariel
7a8cd684a3 Update stringtable.xml 2015-04-13 02:19:58 +02:00
Anthariel
2939862e8c Update stringtable.xml 2015-04-13 02:12:56 +02:00
Anthariel
d9f9dffbc0 Update stringtable.xml 2015-04-13 02:11:12 +02:00
Anthariel
e176df4636 Update stringtable.xml 2015-04-13 02:10:23 +02:00
Anthariel
7523dd011f Update stringtable.xml 2015-04-13 02:06:17 +02:00
Anthariel
161866a8e5 Update stringtable.xml 2015-04-13 02:05:36 +02:00
Anthariel
67be340360 Update stringtable.xml 2015-04-13 02:05:15 +02:00
Nou
8df26b3246 Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-12 17:03:16 -07:00
Nou
98acdc4089 M22 binocular mil reticle ported from ACE2. 2015-04-12 17:03:11 -07:00
Anthariel
77058857e6 Update stringtable.xml 
Wrong translation
 2015-04-13 02:02:19 +02:00
jaynus
7c6b84b1f1 Begin laserdesignator UI changes. 2015-04-12 16:52:10 -07:00
jaynus
0c3caffe89 Merge pull request #501 from acemod/network_lasers 
Break all the lasers. Continuing expansion work is in #535
 2015-04-12 16:47:24 -07:00
jaynus
fd4cb50d3d Remove thermal, prep for coding. 2015-04-12 16:44:39 -07:00
jaynus
db5d54dffd Only allow for laser designator for vanilla compensation. 2015-04-12 16:38:43 -07:00
Anthariel
0e925bc006 Update stringtable.xml 2015-04-13 01:31:49 +02:00
Anthariel
bd28f08559 Update stringtable.xml 2015-04-13 01:30:50 +02:00
Anthariel
c2253cf199 Update stringtable.xml 2015-04-13 01:30:16 +02:00
PabstMirror
74967910a3 opps 2015-04-12 18:27:55 -05:00
PabstMirror
d50bff866b addToInventory use addMagazineArray -maybe fix #530 2015-04-12 18:27:25 -05:00
jaynus
9a25fb4f2f Remove debug. 2015-04-12 16:19:18 -07:00
jaynus
4bd489cd96 Fixed: Javelin CLU UI should have been a PFH not a draw. Migrated. Closes #531 2015-04-12 16:18:39 -07:00
Anthariel
9bb865a73f Update stringtable.xml 2015-04-13 01:18:24 +02:00
Anthariel
2ec9b94083 Update stringtable.xml 
Fixed: Wrong translation (thx Dirtyhank)
 2015-04-13 01:18:04 +02:00
Anthariel
638868b3da Update stringtable.xml 
Added: French translation (100%).
 2015-04-13 00:41:50 +02:00
ulteq
95e7f66a46 Added a model for the Kestrel 4500 
*We might want to use a smaller one in the future ...
 2015-04-13 00:17:59 +02:00
PabstMirror
807ebd8bfe Resave reticle_titan in objectBuilder 2015-04-12 17:14:30 -05:00
ulteq
2040f4dcc3 Improved the wind speed calculation if AB is not enabled 2015-04-12 23:25:58 +02:00
ulteq
3c25fd4008 Fixed a typo 2015-04-12 23:20:54 +02:00
ulteq
e3aa9b3d22 Added a RSC preload class 2015-04-12 23:20:27 +02:00
jaynus
509b5e1a05 Integration of lasers for vanilla laser designation as well. Remove debug. 2015-04-12 14:12:21 -07:00
jaynus
c9e2eb0869 Changed: no-crosshair reticle for Titan by BlackPixxel 2015-04-12 14:05:12 -07:00
ulteq
7797cd9a38 Added missing abs() 2015-04-12 23:03:20 +02:00
jaynus
2317a3c988 Visually hide laser targets. 2015-04-12 14:03:15 -07:00
ulteq
705017f222 Implemented the Kestrel4500 spinning wheel animation 2015-04-12 22:54:36 +02:00
licht-im-Norden87
075b52c1ff Update stringtable.xml 2015-04-12 22:53:02 +02:00
jaynus
2e83e56a73 Seeker integration. 2015-04-12 13:02:09 -07:00
PabstMirror
38c3f43dd6 Fix UBC 
Updating base class Turrets->, by
z\ace\addons\missileguidance\config.bin/CfgVehicles/B_Heli_Attack_01_F/Turrets/
 2015-04-12 14:39:49 -05:00
jaynus
5251de8447 break out seeker angle check. more laser code cleanup. 2015-04-12 12:16:26 -07:00
simon84
51bc7208bc German translation 
Some german translations and corrections
 2015-04-12 20:52:15 +02:00
jaynus
9287d6fe44 Remove dead code. 2015-04-12 11:46:28 -07:00
jaynus
7f0e54b9c3 More defaults. 2015-04-12 11:43:37 -07:00
jaynus
197b13e6d9 Use current codes for FCS updates. 2015-04-12 11:41:50 -07:00
jaynus
9273a32d23 code cleanup, default laser parameters, getVariable self designation specifics. 2015-04-12 11:38:07 -07:00
jaynus
6be8cc8d84 Removed: Laser visuals 
Updated: comments and function defs
Changed: pass function name, not full code.
 2015-04-12 11:29:33 -07:00
jaynus
887e1d1d99 Remove optional laser visual. 2015-04-12 11:14:12 -07:00
jaynus
16cd05edc8 Merge branch 'network_lasers' of github.com:acemod/ACE3 into network_lasers 2015-04-12 11:01:27 -07:00
jaynus
01797fd3b9 Integarate laser code into SALH guidance + self_designate. Note todo items. 2015-04-12 11:01:22 -07:00
Nou
4a23b8be00 Allow string function names. 2015-04-12 10:52:50 -07:00
nomisum
ca27e6eb5a fixed typo 
`Erweitertes Raketenlenksystem` shoud be a nominalization
 2015-04-12 19:52:37 +02:00
ulteq
40e013ed6d Added SORD interface (Connection to the Vectronix Vector LRF) 2015-04-12 19:51:13 +02:00
nomisum
b1c29f82c2 improved/added german translation 
Imho `Raketenlenksystem` is the best fitting german translation for missile guidance. `Raketenlenkung` sounds a bit too colloquial.
 2015-04-12 19:41:44 +02:00
commy2
10c32f264e increase engagement ranges / burst mode on new mmg / full auto dmr 2015-04-12 18:21:28 +02:00
Anthariel
45f3300967 Update stringtable.xml 
Added: Missing french translation.
 2015-04-12 18:20:32 +02:00
Anthariel
8d79fd242a Update stringtable.xml 
Added: Some missing french translations. (I took 10 minutes to translate the banana description (-:)
 2015-04-12 18:18:52 +02:00
Anthariel
3db8f4ad44 Update stringtable.xml 
Added: Some missing french translation.
 2015-04-12 18:10:41 +02:00
Anthariel
3ee421a233 Update stringtable.xml 
Wrong french translation for the line 173.
 2015-04-12 18:08:06 +02:00
KoffeinFlummi
664cc7077d Reduce blood loss rate 2015-04-12 18:06:57 +02:00
KoffeinFlummi
6062128436 Remove tourniquet option, add check pulse/response 2015-04-12 18:01:29 +02:00
KoffeinFlummi
f794eaac43 Merge branch 'master' into basic-medical-tweaks 
Conflicts:
	addons/medical/ACE_Medical_Actions.hpp
	addons/medical/functions/fnc_handleDamage_basic.sqf
	addons/medical/stringtable.xml
 2015-04-12 18:00:22 +02:00
Anthariel
3f84ac4817 Update stringtable.xml 2015-04-12 17:59:53 +02:00
Anthariel
3842272c43 Update stringtable.xml 
Fixing French & English translation error that I've made on the line : 780 and 781 (thanks KoffeinFlummi)
 2015-04-12 17:55:53 +02:00
ulteq
6b44a3f3f9 Updated the module settings init script 2015-04-12 16:31:12 +02:00
ulteq
e003db2454 Fixed a typo 2015-04-12 16:27:24 +02:00
ulteq
e99fb398ae Added simulation interval setting to the ab module 2015-04-12 16:25:01 +02:00
ulteq
8f2261acdd Removed debug output 2015-04-12 16:19:39 +02:00
ulteq
ebb34a4f21 New default simulation interval of 0.05s 2015-04-12 16:19:32 +02:00
ulteq
aff9d7c554 Fixed a syntax error / Removed debug output 2015-04-12 16:17:49 +02:00
esteldunedain
d6ec8d771e Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-12 11:14:31 -03:00
esteldunedain
91df52056b Only display "Surrender" action if the player is not holding a weapon. 2015-04-12 11:13:54 -03:00
ulteq
9f0a2c8b80 The terrain init script now aborts if no extension is found 2015-04-12 16:10:45 +02:00
esteldunedain
3ee18f9a3a Readd CfgModuleCategories.hpp 2015-04-12 11:06:25 -03:00
esteldunedain
e7f9245d7e ACE_Main major cleanup 2015-04-12 10:54:18 -03:00
licht-im-Norden87
fef0d690f8 Update stringtable.xml 2015-04-12 15:25:18 +02:00
licht-im-Norden87
36ba507ab5 Update stringtable.xml 2015-04-12 14:52:37 +02:00
bux578
9184ef479a add disarm icon, add action psd, move icon files 2015-04-12 14:47:08 +02:00
Glowbal
019163c9ce Merge pull request #489 from acemod/medicalPerformanceImprovements 
Medical performance improvements
 2015-04-12 14:44:18 +02:00
licht-im-Norden87
94eb4f3dd5 Update stringtable.xml 2015-04-12 14:42:15 +02:00
Ivan Navarro Cabello
e7a8dde782 update stringtable for spanish 
added new spanish terms
 2015-04-12 14:41:50 +02:00
licht-im-Norden87
38955692ff Update stringtable.xml 2015-04-12 14:40:04 +02:00
licht-im-Norden87
dbc7026d94 ..... 2015-04-12 14:38:04 +02:00
licht-im-Norden87
b144a42e63 Update stringtable.xml 2015-04-12 14:30:40 +02:00
Legolasindar
2c0e93271c Update stringtable.xml 
added spanish translate
 2015-04-12 14:29:47 +02:00
KoffeinFlummi
8f2a1735ae Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-12 14:28:28 +02:00
KoffeinFlummi
614afa8537 Merge https://github.com/Kllrt/ACE3 into czech-merge 
Conflicts:
	addons/attach/stringtable.xml
	addons/captives/stringtable.xml
	addons/common/stringtable.xml
	addons/dragging/stringtable.xml
	addons/explosives/stringtable.xml
	addons/goggles/stringtable.xml
	addons/grenades/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/kestrel/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/logistics_uavbattery/stringtable.xml
	addons/logistics_wirecutter/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/maptools/stringtable.xml
	addons/medical/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/nametags/stringtable.xml
	addons/optionsmenu/stringtable.xml
	addons/overheating/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/reload/stringtable.xml
	addons/reloadlaunchers/stringtable.xml
	addons/weaponselect/stringtable.xml
	addons/wep_javelin/stringtable.xml
	addons/winddeflection/stringtable.xml
 2015-04-12 14:27:59 +02:00
Legolasindar
4bb9f0cf77 Update stringtable.xml 
added spanish translate
 2015-04-12 14:27:42 +02:00
licht-im-Norden87
a04abcf972 Update stringtable.xml 2015-04-12 14:25:41 +02:00
FreeZbe
45ff6c7ce9 French: (Nearly) Complete French translations 
Some entries (3 or 4) are still missing.
I dont understand what you mean / what the input is related to.
 2015-04-12 14:15:45 +02:00
licht-im-Norden87
400b8f4270 Update stringtable.xml 2015-04-12 14:14:48 +02:00
licht-im-Norden87
8f88158a2e Update stringtable.xml 2015-04-12 14:13:38 +02:00
licht-im-Norden87
88a71042e3 Update stringtable.xml 2015-04-12 14:12:05 +02:00
licht-im-Norden87
a3f97efbc3 Update stringtable.xml 
What does WDG and MGRS mean?
 2015-04-12 14:07:49 +02:00
licht-im-Norden87
e4ec9d14d4 Update stringtable.xml 2015-04-12 14:00:56 +02:00
licht-im-Norden87
15e9b2cccc Update stringtable.xml 2015-04-12 13:59:09 +02:00
Legolasindar
b665781399 Update stringtable.xml 
updated spanish translation and added some english missed translation
 2015-04-12 13:58:06 +02:00
licht-im-Norden87
6b39edbddf Update stringtable.xml 2015-04-12 13:58:02 +02:00
commy2
56de4f05f3 scripts for vector illum, renaming some files 2015-04-12 13:56:01 +02:00
licht-im-Norden87
a01c4a0e0b Update stringtable.xml 2015-04-12 13:55:55 +02:00
licht-im-Norden87
2222192aee Update stringtable.xml 2015-04-12 13:51:47 +02:00
licht-im-Norden87
7eaee37ff6 Update stringtable.xml 2015-04-12 13:48:59 +02:00
licht-im-Norden87
d0fb387255 Update Stringtable: Disarming 2015-04-12 13:45:47 +02:00
nic547
0f1115c33b Added new Ammotypes into the AGM crate 2015-04-12 13:08:50 +02:00
commy2
83e634be8a illuminate vector number textures at night 2015-04-12 12:54:36 +02:00
ulteq
9fd19563a3 Fixed several syntax errors 2015-04-12 12:52:13 +02:00
ulteq
fd737f3f95 Minor code optimization 2015-04-12 12:36:05 +02:00
ulteq
cf88adb794 Replaced wind with ACE_wind 2015-04-12 12:34:42 +02:00
ulteq
85a7bea42b Added wind deflection module settings: 
*simulationInterval
*simulationRadius
 2015-04-12 12:33:09 +02:00
ulteq
a993f2d5f1 Minor code optimization 2015-04-12 12:15:39 +02:00
ulteq
cb0df8783a Fixed a calculation error 2015-04-12 12:09:55 +02:00
commy2
7b0e7a1efb Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-12 12:04:07 +02:00
commy2
f16d5398f4 enable vector on ffv positions, fix #506 2015-04-12 12:03:49 +02:00
ulteq
1c8da72716 Removed debug output 2015-04-12 11:59:45 +02:00
ulteq
879c6b42b9 Finished the advanced ballistics module settings 2015-04-12 11:59:02 +02:00
ulteq
c532742a5b Overworked the module settings (WIP) 2015-04-12 11:48:21 +02:00
commy2
e87f491470 mute implementation in noradio, handle post init on remote units 2015-04-12 11:17:58 +02:00
Kllrt
be8ff39767 Fixed broken missileguidaince stringtable.xml 
sry
 2015-04-12 10:58:00 +02:00
commy2
54f29d75f5 functions to mute unit 2015-04-12 10:05:49 +02:00
Glowbal
6bfd3e5c74 Merge pull request #481 from acemod/FixUnconciousAnimWhileCarrying 
Fixed breaking of unconscious animation on drop object.
 2015-04-12 09:48:27 +02:00
commy2
018854a7c3 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into muteunit 2015-04-12 09:15:45 +02:00
PabstMirror
78b64ea273 Missing English 2015-04-12 01:36:41 -05:00
bux578
2fc7f44c39 french translation, tabler 4 spaces test 2015-04-12 07:50:23 +02:00
bux578
0e3d971274 Fix translations error 2015-04-12 07:46:43 +02:00
esteldunedain
dfea99debf Switch "Team" for "Group" 2015-04-12 01:32:03 -03:00
esteldunedain
0565eb6c74 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into linearMenuExperiment 
Conflicts:
	addons/laser_selfdesignate/stringtable.xml
 2015-04-12 01:26:55 -03:00
esteldunedain
654ab4daf5 Remove >> from attach actions 2015-04-12 01:24:42 -03:00
esteldunedain
0420a94938 Streamline Team management actions 2015-04-12 01:19:38 -03:00
esteldunedain
630a2a0f7a Make the list menu optional via a client setting 2015-04-12 01:15:38 -03:00
esteldunedain
01bc6b233a Merge branch 'breakLineExtension' into linearMenuExperiment 
Conflicts:
	addons/interact_menu/functions/fnc_renderIcon.sqf
 2015-04-12 00:21:05 -03:00
esteldunedain
7b797d906f Merge branch 'master' into linearMenuExperiment 
Conflicts:
	addons/interact_menu/functions/fnc_renderIcon.sqf
	addons/overheating/stringtable.xml
 2015-04-12 00:19:33 -03:00
Nou
40c5de8cfb Reduce default number of rays, make it an argument for shootCone. Accuracy is still the same with 3 to 8, just better FPS. Rangefinders should probably use a higher number (8 is good, 24+1 rays in total per shot). 2015-04-11 20:14:03 -07:00
Nou
db3f816843 Reduce default number of rays, make it an argument for shootCone. Accuracy is still the same with 3 to 8, just better FPS. Rangefinders should probably use a higher number (8 is good, 24+1 rays in total per shot). 2015-04-11 20:13:52 -07:00
PabstMirror
18cd0e7f39 Use DisableAI from common 2015-04-11 21:48:12 -05:00
PabstMirror
c3c815db8d Better LOS check 2015-04-11 21:42:57 -05:00
esteldunedain
df17df61f9 Improve the way lines are split 2015-04-11 23:39:06 -03:00
KoffeinFlummi
59952441d8 Merge branch 'patch-2' of https://github.com/licht-im-Norden87/ACE3 into german-merge 2015-04-12 06:22:17 +02:00
KoffeinFlummi
362753209e Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-12 05:40:24 +02:00
KoffeinFlummi
c6efd4e546 Merge https://github.com/EpMAK/ACE3 into russian-merge 2015-04-12 05:39:46 +02:00
KoffeinFlummi
5108137302 Merge https://github.com/Ricciardino/ACE3 into italian-merge 2015-04-12 04:38:46 +02:00
PabstMirror
8fc3b53507 Use new medical func 2015-04-11 21:22:34 -05:00
PabstMirror
3be70556ab Medical: adjustPainLevels from outside functions 2015-04-11 21:21:33 -05:00
KoffeinFlummi
5101a21beb Remove "Original" stringtable entries 2015-04-12 04:21:06 +02:00
Nou
e4c459132b Merge branch 'master' into network_lasers 2015-04-11 18:36:57 -07:00
Nou
8386c0e22a Seeker system and network enabled laser simulation. 2015-04-11 18:36:10 -07:00
licht-im-Norden87
a30eabfb1d Update stringtable.xml 2015-04-12 03:30:11 +02:00
licht-im-Norden87
bd673d3374 Update stringtable.xml 2015-04-12 03:28:12 +02:00
licht-im-Norden87
bd07e18b43 Update stringtable.xml 2015-04-12 03:26:45 +02:00
esteldunedain
d06e1b4a2a Break line extension 2015-04-11 22:22:19 -03:00
PabstMirror
350a79c8a4 #498 - Use cursor mode when scoped 2015-04-11 19:44:42 -05:00
Felix Wiegand
0531f2cc12 Merge pull request #493 from FreeZbe/patch-7 
Update stringtable.xml
 2015-04-12 01:14:40 +02:00
esteldunedain
a01864319a Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-11 19:34:53 -03:00
esteldunedain
488000bdf3 Rename "Check Temperature" to "Check Weapon Temperature" and move it inside the equipment submenu. Close #494 2015-04-11 19:34:29 -03:00
PabstMirror
baf4b0146e Missing semmicolon 2015-04-11 16:50:35 -05:00
PabstMirror
0805d5b640 Update UAV battery icon from AGM 2015-04-11 16:48:49 -05:00
ulteq
ef0884c49d Added comments to all ATragMX functions 2015-04-11 23:40:46 +02:00
FreeZbe
3ff6abde71 Update stringtable.xml 2015-04-11 23:18:51 +02:00
jaynus
2a2f96a034 ACRE API functions and core functions were incorrect. 2015-04-11 14:10:30 -07:00
jaynus
458c49b0a7 Merge remote-tracking branch 'origin/master' into javelinLocking 
Conflicts:
	addons/common/XEH_preInit.sqf
 2015-04-11 14:01:47 -07:00
jaynus
6e28b3b9b7 Disable gates (reload) 2015-04-11 13:59:17 -07:00
jaynus
d744074b2f localization. 2015-04-11 13:48:46 -07:00
Glowbal
e00f0ea4c3 No longer creates a new waitAndExec for every handleDamage call 2015-04-11 22:47:10 +02:00
jaynus
2418d99f97 Finalizes port. Closes #75 2015-04-11 13:41:00 -07:00
jaynus
75216c2f8b readme, authors. 2015-04-11 13:39:16 -07:00
jaynus
2999ff55e1 Working javelin targeting and gating. Still has red center target optic because I cant do optic p3d's. TODO: We need an optic p3d. 2015-04-11 13:37:55 -07:00
ulteq
05f14d6242 Added AdvancedBallistics module options 2015-04-11 22:34:19 +02:00
Glowbal
97fa40b4c1 Make use of new global variables for selections and hitpoints 2015-04-11 22:31:38 +02:00
Glowbal
6cc115a628 We already determine the new damage in caching, so we will use that value instead of recalculating it here 2015-04-11 22:31:17 +02:00
Glowbal
e8d2a00994 Added GVAR(HITPOINTS) and GVAR(SELECTIONS) variables 
No longer have to recreate the selection and hitpoint arrays every time
 2015-04-11 22:30:52 +02:00
Glowbal
c69f71ba71 formatting 2015-04-11 22:29:32 +02:00
Glowbal
51906e341d Removed unused variables 2015-04-11 22:29:11 +02:00
jaynus
505005891d Remove debug, targeting constraints working. 2015-04-11 12:42:30 -07:00
Glowbal
082ab5155e Minor performance improvements 
Before avg: 0.0858495ms
After avg: 0.0701045ms
 2015-04-11 21:27:49 +02:00
PabstMirror
f5cce94b91 Merge pull request #136 from acemod/disarmingTest 
Unit Disarming/DropGear Merge
 2015-04-11 14:14:22 -05:00
ulteq
e108598b36 Added a model for the ATragMX 2015-04-11 21:01:38 +02:00
nic547
63e5247d3b more ammotypes for the mags 2015-04-11 21:00:41 +02:00
EpMAK
21abff3713 Revert "Revert "Russian Translation"" 
This reverts commit ea04f4ab3e.
 2015-04-11 21:33:34 +03:00
EpMAK
ea04f4ab3e Revert "Russian Translation" 
This reverts commit 17a552bb80.
 2015-04-11 21:33:07 +03:00
Glowbal
66bd7e7e5f fixed #457 2015-04-11 20:32:07 +02:00
commy2
b9077888aa unmute handleing 2015-04-11 20:26:43 +02:00
jaynus
458958ef09 Target gating implemented. 2015-04-11 11:17:34 -07:00
Glowbal
24765741ab Enabled setAccTime fix from commy 2015-04-11 20:05:22 +02:00
jaynus
aa53a1815c scaling. 2015-04-11 10:58:27 -07:00
jaynus
fb6c99d69b re-path. Wtf safezones. 2015-04-11 10:56:58 -07:00
Glowbal
dd7e746368 formatting 2015-04-11 19:52:30 +02:00
ulteq
5c5f41cf5b AB is now disable by default 2015-04-11 19:51:58 +02:00
ulteq
9893d940df Disabled advanced scope zeroing if AB is not enabled 2015-04-11 19:47:14 +02:00
ulteq
1ff7218903 Change the Kestrel 4500 behavior 'back to normal' when AB is disabled 2015-04-11 19:44:38 +02:00
jaynus
efaee770bb rename wep_javelin to javelin 2015-04-11 10:44:13 -07:00
Kllrt
12f87013b2 Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-11 19:38:28 +02:00
Niko Lehtovirta
4b50d760e9 fixed to use proper 4-space tabbing 2015-04-11 20:36:38 +03:00
Niko Lehtovirta
0e0935ac01 Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-11 20:28:04 +03:00
ulteq
2b0a0145c5 Removed the last spawn/sleep commands from AB 2015-04-11 18:39:15 +02:00
Felix Wiegand
0bf32bfb3a Merge pull request #476 from acemod/dropbackpack 
function to drop backpack
 2015-04-11 18:23:27 +02:00
commy2
e1bf475355 Merge pull request #419 from acemod/cfgtriggers 
rename cfgAce_Triggers to ACE_Triggers
 2015-04-11 18:19:36 +02:00
ulteq
44198b18d7 Rewrite of the terrain initialization: 
*Replaced spawn/sleep with a PFH
 2015-04-11 18:18:38 +02:00
commy2
4dc38ca7ee Merge pull request #395 from acemod/flashsup 
flashsupressors for new weapons, #264
 2015-04-11 18:18:05 +02:00
Kllrt
56681e632d Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-11 16:36:31 +02:00
Kllrt
38adfbcb70 Added missing CZ strings and made little revision 2015-04-11 16:33:00 +02:00
commy2
761e4aec64 edit description 2015-04-11 16:27:04 +02:00
esteldunedain
dec5aa3ec5 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-11 11:12:56 -03:00
esteldunedain
b8e0388581 Fix nearestObjects with getPos choking over seawater. Fix #465 2015-04-11 11:12:40 -03:00
commy2
62b45a8a07 initial commit 2015-04-11 15:59:21 +02:00
commy2
9cf44b1d32 initial commit 2015-04-11 15:46:41 +02:00
ulteq
23733263ea Updated the extension file name 2015-04-11 15:06:30 +02:00
nic547
a37cd51fe7 more stuff 
- added more ammotypes
- stringtable now follows guideline
 2015-04-11 15:02:56 +02:00
ulteq
d7a40bfba2 Replaced all execVM calls with FUNC() 2015-04-11 14:51:40 +02:00
ulteq
a36bd588d5 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into largerScopeaAdjustments 2015-04-11 14:31:23 +02:00
ulteq
fee65cd56f Overhauled the scope adjustment module: 
*Added configs for the new marksmen scopes
*Introduced minor and major steps
*Introcuded a new increment config (ACE_ScopeAdjust_Increment)
*Changed the default zero range to 100m
*Added a zero reference setting
*Added an interaction menu entry to update the zero reference setting
 2015-04-11 14:02:44 +02:00
Niko Lehtovirta
4a7358e05a Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-11 14:30:40 +03:00
commy2
5a5a1fd66a ACE_optic_SOS_PIP - iron sight was missing, fix #470 2015-04-11 13:18:45 +02:00
VyMajoris
9d326ce9a5 Added - Portuguese translation to magazineRepack 2015-04-11 03:10:39 -03:00
VyMajoris
31a9897952 Added - Portuguese translation to wirecutter 2015-04-11 03:07:15 -03:00
PabstMirror
b5e5359795 CursorCentered - Localizations 2015-04-11 00:35:18 -05:00
PabstMirror
ae064359f6 Remove Debug 2015-04-10 23:51:07 -05:00
PabstMirror
0edcf03e12 Handle Vehicle Attunation 2015-04-10 23:21:54 -05:00
PabstMirror
dac3047fca Use AllVehicles Instead of CAManBase 2015-04-10 22:16:33 -05:00
PabstMirror
787df67248 Merge branch 'master' into disarmingTest 2015-04-10 19:20:34 -05:00
Tenga
e7b5218d52 Altimeter fix, division by zero when no time has passed (game paused, etc.) 2015-04-11 00:14:06 +02:00
jaynus
4188893839 Move spatial model translations to ace_common 2015-04-10 14:23:55 -07:00
jaynus
0a88220fc2 Constraints work, added worldToScreenBounds to common. 2015-04-10 14:20:06 -07:00
jaynus
721898d9fb Constraint dialogs working. 2015-04-10 13:57:44 -07:00
commy2
11ad74735c Merge pull request #458 from Tenga/master 
Formatting fixes for fnc_isFeatureCameraActive and fnc_externalCamera
 2015-04-10 22:12:55 +02:00
PabstMirror
adc7db9ae9 #456 - Fix AI rotating while dead (disableAI func) 
Still some small head movements, but I don't know how to fix that.
 2015-04-10 15:02:40 -05:00
Tenga
b710c2543e Return the newline to fnc_externalCamera.sqf 2015-04-10 21:59:28 +02:00
commy2
2a72e183b1 Merge pull request #450 from Tenga/master 
Count the commander camera as a 3rd person camera
 2015-04-10 21:54:52 +02:00
Tenga
229590ed20 Formatting fixes for fnc_isFeatureCameraActive and fnc_externalCamera 2015-04-10 21:54:47 +02:00
Tenga
c8cff6e91c - Added isFeatureCameraActive to ace_common 
- ace_goggles_fnc_externalCamera now checks for cameras made by a BI feature
 2015-04-10 21:48:24 +02:00
jaynus
83b453a294 Merge pull request #379 from acemod/allTheMissiles 
Merging for current builds needing at least better guidance and fixed locking modes. Also allowing for mod-makers to see and utilize the new locking framework.
 2015-04-10 12:48:10 -07:00
jaynus
8429b262f2 more debug removal, backup vanilla usage. 2015-04-10 12:40:58 -07:00
PabstMirror
661ddc3562 #441 - Crash with no model on ace_fakeweapon 2015-04-10 14:35:08 -05:00
FreeZbe
4a996bf147 Update stringtable.xml 2015-04-10 21:22:07 +02:00
esteldunedain
ee8af7f153 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-10 16:21:27 -03:00
esteldunedain
d6e70cfe6b Merge branch 'patch-3' of https://github.com/Legolasindar/ACE3 into Legolasindar-patch-3 
Conflicts:
	addons/common/stringtable.xml
	addons/explosives/stringtable.xml
	addons/frag/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/logistics_wirecutter/stringtable.xml
	addons/medical/stringtable.xml
 2015-04-10 16:20:18 -03:00
FreeZbe
e09a3b29d7 Update stringtable.xml 2015-04-10 21:20:09 +02:00
jaynus
5577a541ca Add example. 2015-04-10 12:19:02 -07:00
jaynus
0225cb510c Add missile strings. 2015-04-10 12:16:18 -07:00
Riccardo Petricca
d9e78e511e Added italian translation to the last terms. 
Added italian translation to the last added terms.
 2015-04-10 21:13:03 +02:00
jaynus
391b1556cb Disable all debug. 2015-04-10 12:12:25 -07:00
FreeZbe
4dbba270f9 Translations fixes 2015-04-10 21:07:38 +02:00
nic547
a4b9090e34 Added new ammotypes for both types of .388 ammo 2015-04-10 21:01:49 +02:00
jaynus
bcb7d18e7e remove debug. 2015-04-10 11:57:50 -07:00
jaynus
c28ac5b4a9 Compensate for target velocity. 2015-04-10 11:40:18 -07:00
jaynus
5083a5a0d2 Javelin locking fire modes were reversed. 2015-04-10 11:37:03 -07:00
ruPaladin
8ea96b3086 Update stringtable.xml 2015-04-10 21:21:40 +03:00
ulteq
127d100628 Overworked the scope adjustment keybinds: 
*Fixed duplicate actionIDs
*Introduced minor/major steps
*Reset the stringtable.xml
 2015-04-10 20:17:26 +02:00
PabstMirror
db5861da52 #428 - GJ Git 2015-04-10 13:05:39 -05:00
PabstMirror
33570c94e4 #428 - Only work on locked vehicles. 2015-04-10 13:05:39 -05:00
Tenga
eec5f458db Count the commander camera as a 3rd person camera 2015-04-10 20:05:33 +02:00
PabstMirror
97e277d710 #448 - Adjust Nightvision in vehicles 2015-04-10 12:55:42 -05:00
jaynus
c428bf051f placeholder model for hellfire, optics refreshing on titan 2015-04-10 10:42:02 -07:00
esteldunedain
b44f22c262 Add 1 mil scope adjustment keybinds 2015-04-10 14:41:34 -03:00
ruPaladin
d198cb25e9 Update stringtable.xml 2015-04-10 20:37:21 +03:00
commy2
ec29cdd731 remove forgotten debug item, .MD for optics, fix #439 2015-04-10 19:34:44 +02:00
ruPaladin
9c8c38aaae Update stringtable.xml 2015-04-10 20:28:05 +03:00
ruPaladin
a3a40a711c Update stringtable.xml 2015-04-10 20:24:23 +03:00
ruPaladin
100954da06 Update stringtable.xml 2015-04-10 20:19:19 +03:00
jaynus
2fe55b3117 Attack profile buildout. 2015-04-10 10:14:30 -07:00
commy2
5d097c4dd9 add comment explaining why isNumber is used 2015-04-10 19:11:51 +02:00
ulteq
2c4c6763c3 Removed deprecated CSE code (EnableForAI module option) 2015-04-10 19:02:32 +02:00
EpMAK
17a552bb80 Russian Translation 
Russian translation of stringtables: new lines + old lines fixed a bit,
realistic names for armory are not yet filled.
 2015-04-10 19:55:57 +03:00
EpMAK
68d08b8c7b Revert "Translation" 
This reverts commit fab5605ad5.
 2015-04-10 19:46:18 +03:00
commy2
c03ee8e9c6 lowercase gps 2015-04-10 18:34:26 +02:00
commy2
dc49f2c71e rewrite assigned item fix 2015-04-10 18:31:43 +02:00
FreeZbe
31a08d22d8 Translation changes 2015-04-10 18:18:45 +02:00
ulteq
9604699f26 Replaced QUOTE(GVAR(...)) with QGVAR(...) 2015-04-10 18:11:01 +02:00
ulteq
4e50760064 Fixed a syntax error 2015-04-10 18:08:38 +02:00
commy2
5ff1d9863d remove +2 offset for check temperature, also fix the shade of grey, #431 2015-04-10 17:48:21 +02:00
commy2
fc98e78a53 hide check temperature action when empty weapon is selected, #431 2015-04-10 17:36:58 +02:00
FreeZbe
62bb1c6907 Translation changes 2015-04-10 17:11:15 +02:00
FreeZbe
6de5cd76dc Translation changes 2015-04-10 17:10:51 +02:00
commy2
c7ad94efbf renamed hpp to ACE_Triggers 2015-04-10 17:09:48 +02:00
commy2
5c12b22666 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into cfgtriggers 2015-04-10 17:07:47 +02:00
Grzegorz
584c77a0b6 microdagr PL translation 
fixes
 2015-04-10 17:07:40 +02:00
EpMAK
fab5605ad5 Translation 
Russian translation of the texts
 2015-04-10 17:51:48 +03:00
ulteq
37804f01f6 Fixed a nasty typo 2015-04-10 16:48:58 +02:00
ulteq
013c56f070 Replaced an outdated ATragMX 'AdvancedBallistics detection routine' 2015-04-10 16:48:45 +02:00
FreeZbe
3541500947 Translation changes 2015-04-10 16:41:51 +02:00
Grzegorz
a95b0b051c inventory PL translation 2015-04-10 16:33:09 +02:00
Grzegorz
439dfa7b3c laser_selfdesignate PL translation 
fixes
 2015-04-10 16:31:47 +02:00
FreeZbe
8fc73af1c4 Translation update 
Addition of french translation
 2015-04-10 16:26:09 +02:00
ulteq
6d40859ec2 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500 
Conflicts:
	addons/kestrel/config.cpp
 2015-04-10 15:51:22 +02:00
ulteq
87406d739d Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX 2015-04-10 15:49:14 +02:00
ulteq
ad8e6450eb Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics 2015-04-10 15:44:33 +02:00
ulteq
f07d743c1d Fixed Kestrel4500 not working when bipod is deployed 2015-04-10 15:26:56 +02:00
Niko Lehtovirta
9f2f660b89 fixed PFH to use EFUNC(common,waitAndExecute) 2015-04-10 16:23:27 +03:00
ulteq
25ec665f45 Fixed the ATragMX 'AdvancedBallistics detection routine' 2015-04-10 15:17:16 +02:00
ulteq
ad3c9493d7 Fixed ATragMX not working when bipod is deployed 2015-04-10 15:09:38 +02:00
ulteq
c7db3dbffe Renamed canShow function to fit the rest of the functions 2015-04-10 15:09:18 +02:00
ulteq
f003ff590e Fixed the target speed assist feature: 
*Replaced while/sleep with a PFH
 2015-04-10 15:02:45 +02:00
Asgar
16b2311376 Added German translation for a couple of things, 2015-04-10 14:21:55 +02:00
Niko Lehtovirta
b318d2cced Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-10 15:10:47 +03:00
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
Niko Lehtovirta
f0468fa7c8 Changed spawn code on respawn to PFH format 2015-04-10 14:21:52 +03: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
VyMajoris
baf015ff5a Added - Portuguese Translation to logistics_uavbattery 
The correct translation of "UAV" to Portuguese is indeed "VANT", but this term is not used as "UAV" is. In reality, most Portuguese speaking people knows what an "UAV" is but if you use the Portuguese translation they have no idea of what you are talking about.

Another alternative is to use the word "Drone". Everyone knows what a drone its, however, I find that the "UAV" is more in terms with the authenticity aspect of ACE3, since it the military uses the word "UAV" instead of "Drone"


Also, it seems that somebody wrote  "UAV's" instead of "UAVs". If you intentd to use the plural, you should not use the Apostrophe. I am not correcting this since I am not sure if indeed this was intended for plural or not.
 2015-04-10 05:22:46 -03:00
VyMajoris
599ae092da Changed - added dot on description 2015-04-10 05:09:43 -03:00
VyMajoris
a0a0cfbfbd Added - Portuguese translation to laserpointer 2015-04-10 05:07:44 -03:00
VyMajoris
37858ec430 Added - Portuguese translation to laser_selfdesignate 2015-04-10 05:04:15 -03:00
VyMajoris
f7166047dc Added - Portuguese translation to Kestrel ApproximateTemp 2015-04-10 05:01:11 -03: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
VyMajoris
ec8e2707f8 Added - Portuguese translation to inventory 2015-04-09 23:05:47 -03:00
Kavinsky
adaee74a57 removed config redundancy 2015-04-10 04:00:26 +02:00
VyMajoris
c260ff89ba Added - Portuguese Translation to Interact_menu 2015-04-09 23:00:13 -03: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
VyMajoris
be7a579f7d Added - Portuguese translation to LaseTarget 
There is no way to translate Lase Target in a faithful way to portuguese. If "Marcar com laser" is too big, "Marcar Alvo" is a solid alternative for all intents and purposes...
 2015-04-09 22:50:35 -03: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
VyMajoris
4198a942b3 Added/Changed - explosives Portuguese Translation 
Added "Dead Man's Switch" and "Explosives_Pickup" PT translation and corrected some stuff.
 2015-04-09 22:42:21 -03: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
VyMajoris
c8c183863c Changed - Dragging drop Portuguese Translation 
Changed from "Largar" to "Soltar". "Largar" seems a little to harsh when dealing with humans.

"STR_ACE_Dragging_UnableToDrag" Commented code unchanged
 2015-04-09 22:28:45 -03: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
VyMajoris
0dbb4579c4 Added - Portuguese translation Disposable 2015-04-09 22:25:37 -03:00
Grzegorz
aaa4dcba2c inventory PL translation 2015-04-10 03:19:37 +02:00
VyMajoris
b8f2bd9636 Added - Portuguese translation to cargo door 
Confused if it is a ramp or a door. Translated to as if it is a door. Should work.
 2015-04-09 22:18:46 -03:00
VyMajoris
f98b9c27c6 Added - Portuguese translation to Captive surrendering 
I need more context on "STR_ACE_Captives_Zeus_OnlyInfentry" and "STR_ACE_Captives_Zeus_OnlyAlive" to translate.
Are those texts talking to the player or is just a description for an action?
 2015-04-09 22:16:14 -03: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
VyMajoris
c1941f2719 Added - Portuguese translation to common/Stringtable 
I see that the english description for the banana is from the Wikipedia. If wanted I can use the portuguese version from Wikipedia.
 2015-04-09 22:12:54 -03: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
VyMajoris
ae7af34a11 Added - Portuguese translation to common/Stringtable 
Everything translated. Even the banana.
 2015-04-09 20:53:44 -03: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
VyMajoris
ac5589c1c1 Added - Portuguese translation to Captive surendering 
Need more context to translate STR_ACE_Captives_Zeus_OnlyAlive and STR_ACE_Captives_Zeus_OnlyInfentry.
 2015-04-09 20:30:09 -03: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
VyMajoris
f0a97bd855 Added - Portuguese translation to Attach Failed 2015-04-09 20:20:08 -03: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
commy2
623ab02a12 fix falling over static weapons 2015-04-08 13:06:06 +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
PabstMirror
03dbe8e6c5 Make it optional 2015-04-07 22:57:58 -05:00
PabstMirror
ce70c72cd6 wip1 2015-04-07 22:44:41 -05:00
PabstMirror
eaeda54f8c Remove Dialog Check so it works inside veh 2015-04-07 19:41:48 -05:00
PabstMirror
656fa8868a Module Icons 2015-04-07 19:37:46 -05:00
PabstMirror
71d609f8e0 Private Variables 2015-04-07 19:30:07 -05:00
PabstMirror
65d61ad1e3 opps 2015-04-07 19:22:33 -05:00
PabstMirror
b9341033d7 Rangetable for vanilla ballistics 2015-04-07 19:19:08 -05: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
PabstMirror
d295ee6980 Localization / Headers 2015-04-06 01:05:28 -05: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
PabstMirror
2ada87e3ac Rangetable Item 2015-04-05 18:05:23 -05: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
PabstMirror
a8b000c159 Some Headers 2015-04-05 17:50:07 -05:00
PabstMirror
5c5b8f656e Tweak Air to match known data 2015-04-05 17:37:11 -05:00
jaynus
c87f2f8bcc Added: Generic placeholder medical box. 2015-04-05 15:16:32 -07:00
PabstMirror
c768ef65b2 Tweaking PowderEffects/AirRestitance 2015-04-05 17:07:55 -05:00
esteldunedain
b8c493a495 Merge branch 'master' into AdvancedBallistics 2015-04-05 19:05:12 -03:00
PabstMirror
3e77eb9737 Rangetable Builder and Prepcalc 2015-04-05 16:28:12 -05: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
PabstMirror
61a0ae1aec Rangetable Dialog 2015-04-05 15:48:56 -05: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
PabstMirror
3d9da5f142 Make Mils Toogle Self Action 2015-04-05 15:00:59 -05:00
jaynus
7d5fca3c5a DIR guidance on Javelin missiles/Titan. TODO: The guidance codes need re-works. 2015-04-05 12:55:17 -07:00
PabstMirror
34a86e0db3 Fix Heading Mils 2015-04-05 14:48:26 -05:00
Glowbal
12d10b8bf7 Blood loss for basic (from AGM medical) 2015-04-05 21:38:15 +02:00
PabstMirror
0281897a3d Show Charge - Cleanup Settings 2015-04-05 14:34:39 -05: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
PabstMirror
e71378f9b3 AirResit Module Setting / Charge Display ctrl 2015-04-05 12:40:48 -05: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
PabstMirror
1726b787f7 AirRestitance/Wind Effects 2015-04-05 03:02:24 -05:00
PabstMirror
518f2077fe Disable ArtyComputer 2015-04-05 02:27:13 -05:00
PabstMirror
dab4822876 Settings / Module 2015-04-05 02:18:51 -05:00
PabstMirror
e6c7758d3f Prototype - Show Mils on mk6 2015-04-05 01:57:24 -05: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