Thomas Kooi
40afa45417
Merge pull request #3058 from freghar/isturnedout
...
fix inverted isTurnedOut for map lighting
2015-12-31 13:03:42 +01:00
bux
23bec6d9a8
Merge master into branch
2015-12-31 10:20:47 +01:00
bux
0e8eb5fac4
Remove obsolete hotkey entries
2015-12-30 11:23:52 +01:00
bux
d6c5643790
improve code style
2015-12-30 09:43:19 +01:00
bux
2a6042bf61
add interaction position and defuse object position
...
and reduce interaction distance
2015-12-30 09:11:57 +01:00
bux
112c002b0b
remove ace_offset entry
...
Ported from AGM and simply renamed. It wasn't even used in AGM.
2015-12-29 20:57:55 +01:00
Githawk
2432ac3319
Changed scope for carried objects
2015-12-22 17:54:16 +01:00
Glowbal
c1fa81f28b
Fix tabs in sqf files
2015-12-21 17:05:48 +01:00
jokoho48
0addb592d3
remove Unused Varaible in AB
...
fix private in AB
2015-12-21 02:29:10 +01:00
freghar
a383da5b2d
fix inverted isTurnedOut for map lighting
...
According to the comment, the idea is to provide unobscured map when
inside an enclosed vehicle (!isTurnedOut).
Signed-off-by: freghar <freghcz@gmail.com>
2015-12-20 11:53:08 +01:00
commy2
bd3c79f739
add function to retrieve the control of the stamina bar
2015-12-12 20:25:42 +01:00
havena
6f0568c370
fix Unexpected stringtable format
...
Unexpected stringtable format inside <Text ID="STR_ACE_Common_CheckPBO_Action_WarnPerm"><German>
2015-12-09 20:18:15 +01:00
PabstMirror
cae9f436f6
Merge branch 'release'
2015-12-08 15:14:33 -06:00
Glowbal
0599b35fc6
Bump version to 3.4.1
2015-12-08 14:47:48 +01:00
PabstMirror
38bf869f07
Also Fix Rearm
2015-12-07 14:07:03 -06:00
PabstMirror
cd68f9b320
Fix refuel unconc error - Man unloading for air
2015-12-07 13:54:41 -06:00
Thomas Kooi
05c56f73b5
Change disable NVG with sights by default
...
As discussed on Slack, we are changing the default behaviour infavor of excepted gameplay.
2015-12-07 18:33:20 +01:00
PabstMirror
39edd205f0
Merge pull request #2942 from acemod/CzechTables
...
Czech Translations - Update
2015-12-07 09:32:00 -06:00
bux578
fbde1dd794
Merge pull request #2941 from acemod/DieStringtables
...
Update German Stringtables
2015-12-07 10:27:11 +01:00
bux578
821ccf5726
fix medical menu stringtable name
2015-12-07 10:21:48 +01:00
bux578
af31d43567
fix german typos
2015-12-07 10:20:35 +01:00
PabstMirror
358228f5bb
Cleanup De Stringtables
2015-12-06 15:03:15 -06:00
commy2
9fa62c6d2a
clean up vehicles config
2015-12-06 11:18:07 +01:00
gienkov
f6e7cad678
remove Original entries
2015-12-05 22:08:39 +01:00
PabstMirror
b13656e54b
addDamageToUnit - Disable debug / testing code
2015-12-05 12:19:34 -06:00
Thomas Kooi
761d6e28d8
Merge pull request #2939 from acemod/fixMicroDagrDefines
...
MicroDagr - Add #undef to config for pboProject
2015-12-05 11:29:25 +01:00
Thomas Kooi
8e88740730
Merge pull request #2924 from acemod/woundReopeningArray
...
Don't update openWounds if not bandaged
2015-12-05 11:28:56 +01:00
ProfessorCZ
cf41ac5fba
Czech Translations - Update
2015-12-04 22:28:10 -06:00
licht-im-Norden87
291f4df072
Update German Stringtables
...
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
kommas...........................................................................................................................................................
Rallypoint
Update stringtable.xml
slideshow, not finished yet
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
What does Curator mean in this context?
l. 294, l 302
cargo
Update stringtable.xml
Update stringtable.xml
I left a few things out. I'd like if someone gives me advice
Z.698 Pionier oder Instandsetzer o.Ä. Was genau ist die deutsche Bezeichung der Klasse in ACE bzw Arma?
Z.707 Ich habe mich einfach mal auf Mechatroniker festgelegt, da Reperaturspezialist sich doch ein wenig ungelenk anhört...
Update stringtable.xml
Habe engineer als Pionier übersetzt (halte es selbst für etwas unpassend) Der specialist ist bei mir zum Mechatroniker geworden.
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Fix Mistakes from merge
Fix Empty Entries
Fix Mistake
Fix
2015-12-04 22:06:44 -06:00
PabstMirror
f5aae81465
MicroDagr - Add #undef to config for pboProject
...
#2936
2015-12-04 20:08:30 -06:00
PabstMirror
43a168f0b9
Flashbangs - Make event radius match effect radius
2015-12-04 15:16:17 -06:00
commy2
e418cfcf11
Merge pull request #2935 from acemod/fixbinoculars2
...
Fix binocular related bugs
2015-12-04 21:27:53 +01:00
commy2
5d43fa93c6
fix FUNC(binocularMagazine), fix #2916 , fix #2917 , fix #2918 , fix #2922 , fix #2928 , fix #2933
2015-12-04 19:37:37 +01:00
PabstMirror
875b3980ac
Don't update openWounds if not bandaged
...
Fix #2921
2015-12-03 15:23:38 -06:00
PabstMirror
91ace4fc9b
Fix whitelist string -> array error in checkPbo
...
Fix #2913
Use splitString instead of call compile to convert string into an array
2015-12-02 23:58:41 -06:00
PabstMirror
c928a0d6cb
Remove Sleep/WaitUntil from checkPBO
...
Fix #2910
2015-12-01 22:50:28 -06:00
PabstMirror
46c43b56db
Merge branch 'release'
2015-12-01 15:54:57 -06:00
PabstMirror
419af195e9
#2902 - Remove error and don't exit if veh has no hit points
...
B_UAV_01_F has no hitpoints and would throw error
Don't exit so "fullRepair" action still gets added
2015-12-01 13:43:27 -06:00
Glowbal
dacfe4d6cb
Bump version to 3.4.0
2015-12-01 17:05:08 +01:00
commy2
861262e41c
revert false captitalization change
2015-11-30 17:56:25 +01:00
commy2
411a8d58f3
fix more setVariable and getVariable capitalization
2015-11-30 17:53:57 +01:00
commy2
5a1aae6028
manual merge
2015-11-30 17:44:15 +01:00
commy2
e422388484
fix waitUntil capitalization
2015-11-30 17:28:01 +01:00
commy2
a9ebcf8543
fix setVariable and getVariable capitalization
2015-11-30 17:27:09 +01:00
commy2
d037f00a92
fix forEachIndex capitalization
2015-11-30 17:25:16 +01:00
commy2
b3950bd7f0
fix forEach capitalization
2015-11-30 17:23:48 +01:00
commy2
a8228f60c2
fix configFile capitalization
2015-11-30 17:23:02 +01:00
commy2
2b05f6f451
fix isNil capitalization
2015-11-30 17:22:16 +01:00
commy2
5e41643cff
fix pushBack capitalization
2015-11-30 17:21:28 +01:00
commy2
d9b90258bc
fix typeOf capitalization
2015-11-30 17:19:57 +01:00
