Commit Graph

2259 Commits

Author SHA1 Message Date
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
Asgar
16b2311376 Added German translation for a couple of things, 2015-04-10 14:21:55 +02: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
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
Legolasindar
cf769e09fb Update stringtable.xml
Add spanish translation
2015-04-10 12:46:31 +02:00
Legolasindar
52d476abd3 Update stringtable.xml
Added spanisth translation, and two lines of english translation
2015-04-10 12:29:44 +02:00
Jo David
c258c6c00d fixing translation 2015-04-10 09:05:37 +02:00
Jo David
33a14076fc Merge branch 'master' of https://github.com/acemod/ACE3 into translations
Conflicts:
	addons/captives/stringtable.xml
	addons/medical/stringtable.xml
2015-04-10 09:01:24 +02:00
jaynus
6286d59bd9 Remove NVG from gunner optics on comanche. 2015-04-09 23:29:37 -07:00
jaynus
9e7d4c25bb Removes old value of stabalizing which broke gunner. Fixes #412 2015-04-09 23:28:41 -07:00
commy2
d5f190dff8 fix: getGunner returns null object when throwing grenades, planting explosives 2015-04-10 06:47:31 +02:00
commy2
105184ce88 fix: getGunner returns null object if pilot uses manual fire if no gunner is present 2015-04-10 06:36:09 +02:00
Anthariel
04bf321099 Update stringtable.xml
Added: French Translation (100%)
2015-04-10 06:31:42 +02:00
Anthariel
81122e0839 Update stringtable.xml
Added: French Translation (100%)
2015-04-10 06:30:49 +02:00
Anthariel
b5841f8f09 Update stringtable.xml
Added: French Translation (100%)
2015-04-10 06:28:59 +02:00
Anthariel
dd8f9cd8d6 Update stringtable.xml
Added: French Translation (100%)
2015-04-10 06:27:04 +02:00
Anthariel
0191abc529 Update stringtable.xml
Added: French Translation (100%)
2015-04-10 06:25:05 +02:00
Anthariel
523417ba3c Update stringtable.xml
Added: French Translation (100%)
2015-04-10 06:23:13 +02:00
Anthariel
0c851a6d9a Update stringtable.xml
Added: French Translations (100%)
2015-04-10 06:22:26 +02:00
Anthariel
95e53fd1bf Update stringtable.xml
Added: French Translations (~85%)
2015-04-10 06:20:04 +02:00
Anthariel
d6b2d13a72 Update stringtable.xml
Added: French Translation (95%)
2015-04-10 06:00:22 +02:00
commy2
5fe33fb1db rename cfgAce_Triggers to ACE_Triggers 2015-04-10 05:56:19 +02:00
Anthariel
0d8145073f Update stringtable.xml
Added: French Translation (100%)
2015-04-10 05:54:45 +02:00
Anthariel
627f8fb41b Update stringtable.xml
Added: French Translation (100%)
2015-04-10 05:53:29 +02:00
Anthariel
87f5873c2a Update stringtable.xml
Added: French Translation (90%)
Fixed: Uknow to Unknow (line 101)
2015-04-10 05:50:08 +02:00
PabstMirror
26d282c224 Explosives: Fix cursor interaction menu breaking 2015-04-09 22:46:19 -05:00
Anthariel
fb8c49135e Update stringtable.xml
Added: French Translation (100%)
2015-04-10 05:43:42 +02:00
Anthariel
d9986c6959 Update stringtable.xml
Added: French Translation (75%)
2015-04-10 05:40:22 +02:00
Anthariel
7280148f91 Update stringtable.xml
Added: French Translation (100%)
2015-04-10 05:37:10 +02:00
Anthariel
949cee6df4 Update stringtable.xml
Added: French Translation (100%)
2015-04-10 05:35:56 +02:00
Anthariel
e6adddb7fa Update stringtable.xml
Added: French Translations (100%)
2015-04-10 05:34:09 +02:00
Anthariel
29f06a7bd8 Update stringtable.xml
Added: French Translation (100%).
2015-04-10 05:29:00 +02:00
Kavinsky
a118cae13d unified ACE_Attachable config entry now ACE_Attachable its a string and hold the effect for the item 2015-04-10 04:36:28 +02:00
Kavinsky
b49fec58e6 Updated stringtable 2015-04-10 04:35:21 +02:00
Grzegorz
311e018ba7 weaponselect PL translation 2015-04-10 04:33:13 +02:00
Grzegorz
bf6984400f medical PL translation
like a boss
2015-04-10 04:30:39 +02:00
Kavinsky
adaee74a57 removed config redundancy 2015-04-10 04:00:26 +02:00
Kavinsky
999ad49fd0 removed duplicated debugging error 2015-04-10 03:58:14 +02:00
Grzegorz
3ffd7ac8c7 attach PL translation 2015-04-10 03:57:55 +02:00
Grzegorz
37be4f9e53 captives PL translation 2015-04-10 03:56:24 +02:00
Grzegorz
95be641918 common PL translation 2015-04-10 03:52:30 +02:00
Kavinsky
049edd1483 Added ACE Attach posibility to add more types of attachable items 2015-04-10 03:49:50 +02:00
Grzegorz
dcc07c84bc disposable PL translation 2015-04-10 03:43:34 +02:00
Grzegorz
6be80caf2e dragging PL translation 2015-04-10 03:41:12 +02:00
Grzegorz
d0787ab2d8 explosives PL translation 2015-04-10 03:40:03 +02:00
Grzegorz
ae1b2f04b0 fcs PL translation 2015-04-10 03:39:05 +02:00
Grzegorz
022e17417f frag PL translation 2015-04-10 03:37:30 +02:00
Grzegorz
2925100ec6 frag PL translation 2015-04-10 03:36:32 +02:00
Grzegorz
d874140268 hearing PL translation 2015-04-10 03:33:40 +02:00
Grzegorz
e907553abc interact_menu PL translation 2015-04-10 03:28:14 +02:00
Grzegorz
2984aa2e8c interaction PL translation 2015-04-10 03:26:03 +02:00
Grzegorz
aaa4dcba2c inventory PL translation 2015-04-10 03:19:37 +02:00
Grzegorz
e13199af2a laser_selfdesignate PL translation 2015-04-10 03:15:28 +02:00
Grzegorz
8b6ac39d1d laserpointer PL translation 2015-04-10 03:13:59 +02:00
Grzegorz
e0a2a144c5 logistics_wirecutter 2015-04-10 03:10:05 +02:00
Grzegorz
685d21169d magazinerepack PL translation
Had to make some shifts in lines 70 and 93 to make it sound good in PL
2015-04-10 03:03:03 +02:00
Grzegorz
6cbb6206c1 microdagr PL translation
fixed typo in line 119
2015-04-10 02:47:19 +02:00
Grzegorz
0f9614eb4f nametags PL translation
SoundWaves :)
2015-04-10 02:36:23 +02:00
Nicolás Badano
357fd1969b Merge pull request #406 from Legolasindar/patch-4
Spanish: Update stringtable.xml
2015-04-09 21:24:19 -03:00
Nicolás Badano
7e6e0d0ecd Merge pull request #402 from Legolasindar/patch-2
Update stringtable.xml
2015-04-09 21:24:00 -03:00
Grzegorz
5255c91408 optionsmenu PL translation 2015-04-10 02:20:22 +02:00
Grzegorz
03faa32cef overheating PL translation 2015-04-10 02:07:19 +02:00
Grzegorz
d193fd513f realisticnames PL translation 2015-04-10 02:02:59 +02:00
Grzegorz
a150ab43e1 Update stringtable.xml 2015-04-10 01:53:28 +02:00
Grzegorz
f61832f735 reload PL translation 2015-04-10 01:44:43 +02:00
jaynus
c1089dfffa Working save, distance shots are off. 2015-04-09 16:43:05 -07:00
Legolasindar
2a5e416dfc Update stringtable.xml
fixed spanish terms
2015-04-10 01:40:22 +02:00
Legolasindar
e63b9c7aa9 Update stringtable.xml
added spanish translation
2015-04-10 01:38:31 +02:00
Grzegorz
ce46961ef1 reloadlaunchers PL translation 2015-04-10 01:38:13 +02:00
Legolasindar
2456660867 Update stringtable.xml 2015-04-10 01:36:42 +02:00
Grzegorz
08590d98a3 respawn PL translation 2015-04-10 01:35:09 +02:00
Legolasindar
5a849fe8a4 Update stringtable.xml
added spanish translation
2015-04-10 01:33:08 +02:00
jaynus
2e9f6a7058 Better projected up/down. 2015-04-09 16:31:14 -07:00
Legolasindar
2542f994d6 Update stringtable.xml
added spanish translation
2015-04-10 01:29:52 +02:00
Grzegorz
aa8275460f weaponselect PL translation 2015-04-10 01:29:26 +02:00
Legolasindar
5f5ce47bec Update stringtable.xml
fixed one term in spanish
2015-04-10 01:26:06 +02:00
Grzegorz
df3927324a wep_javelin PL translation 2015-04-10 01:24:58 +02:00
Legolasindar
65b3566d41 Update stringtable.xml
fixed spanish terms.
2015-04-10 01:24:37 +02:00
Legolasindar
b8b151e62e Update stringtable.xml
added spanish terms
2015-04-10 01:20:39 +02:00
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
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
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
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
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
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
esteldunedain
b18bcf8835 Add option to turn on/off cursor coordinates 2015-04-08 01:49:56 -03:00
commy2
691ab012b4 fix map loaded on preInit 2015-04-08 00:44:14 +02:00
commy2
4834facccf moving it to map 2015-04-08 00:30:36 +02:00
KoffeinFlummi
ce45237989 Report full version number in RPT for debugging 2015-04-08 00:27:00 +02:00
commy2
50dbbda8eb disable cursor showing map position 2015-04-08 00:20:43 +02:00
esteldunedain
ed3ac637d2 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-07 19:19:46 -03:00
PabstMirror
2f4335d3c2 #344 - Ignore missing ace_serverconfig on client 2015-04-07 17:14:27 -05:00
commy2
949c5d4333 manual merge 2015-04-07 23:26:16 +02:00
commy2
518c704db6 manual merge 2015-04-07 23:18:31 +02:00
commy2
2e66e57535 manual merge 2015-04-07 23:08:17 +02:00
commy2
d1b8595c0e light intensity from object: handle campfires 2015-04-07 23:02:54 +02:00
PabstMirror
d060b13bbe #86 - Stretch gps info box to support 8 digits 2015-04-07 15:47:12 -05:00
commy2
b6c278e7d3 fix using efunc vs func 2015-04-07 22:33:35 +02:00
commy2
96268b6407 directional light for map effects 2015-04-07 22:19:03 +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
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
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
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
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
Glowbal
ac3bda3135 improvements to displayPatientInformation. Bandaged wounds should be more clear now 2015-04-07 20:19:32 +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
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
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
jaynus
f973505746 DAGR and Hellfire modified config values. 2015-04-07 08:53:47 -07: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
esteldunedain
aec9962121 Fix changeProjectileDirection 2015-04-06 18:02:08 -03: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
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