Jonathan Pereira
59d0e6e788
Merge remote-tracking branch 'refs/remotes/acemod/master'
2016-03-01 07:50:57 -03:00
SilentSpike
d36543d3a9
Merge pull request #3069 from GitHawk/rearm
...
Fix scope of rearm dummy objects
2015-12-22 18:42:52 +00:00
Githawk
2432ac3319
Changed scope for carried objects
2015-12-22 17:54:16 +01:00
Githawk
499301e73e
Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm
2015-12-22 17:53:15 +01:00
Thomas Kooi
792da96a5f
Merge pull request #3065 from acemod/tabs-are-our-enemy
...
Tabs are our enemy
2015-12-21 17:08:30 +01:00
Glowbal
e828076377
Add error on tab in sqf files to sqf validator
2015-12-21 17:06:04 +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
Jonathan Pereira
ef12439ca8
Merge remote-tracking branch 'refs/remotes/acemod/master'
2015-12-18 14:30:58 -02:00
Jonathan Pereira
40b717fd94
Merge remote-tracking branch 'refs/remotes/acemod/master'
2015-12-18 14:02:02 -02:00
Thomas Kooi
90387eaf5b
Merge pull request #3023 from acemod/disablestaminabar
...
add function to retrieve the control of the stamina bar
2015-12-16 10:39:26 +01:00
Thomas Kooi
c911fcdafc
Fix travis configuration
...
Travis yml was using invalid notification configuration for slack.
2015-12-14 14:08:50 +01:00
Thomas Kooi
ef1d7f4fdb
Change Travis notifications on success disabled
...
We only need to know if a build failed, since that is when action needs to be taken
2015-12-14 12:42:37 +01:00
Glowbal
c689cbfdfe
Add release branch to travis
2015-12-13 15:41:37 +01:00
Glowbal
f485ae41b1
Add travis notification for private slack
2015-12-13 15:39:33 +01:00
Glowbal
d159c2738c
Fix travis notifications
2015-12-13 14:56:04 +01:00
commy2
bd3c79f739
add function to retrieve the control of the stamina bar
2015-12-12 20:25:42 +01:00
bux578
e9a669b03b
Merge pull request #2996 from havena/patch-1
...
fix Unexpected stringtable format
2015-12-09 20:42:33 +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
dec74a9d2d
Merge pull request #2964 from acemod/fixUnload
...
Fix refuel unconc error - Man unloading for air
2015-12-07 19:08:25 -06: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
5237ed15dd
Merge pull request #2955 from acemod/configcleanup
...
Vehicles config cleanup, fix #2897
2015-12-06 11:26:15 +01:00
commy2
9fa62c6d2a
clean up vehicles config
2015-12-06 11:18:07 +01:00
Joko
55f6237b88
Merge pull request #2948 from gienkov/removeOriginal
...
remove Original entries
2015-12-05 22:33:58 +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
IngoKauffmann
a7dff52d6a
Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm
2015-12-05 16:00:23 +01: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
4d20615c29
Merge pull request #2911 from acemod/checkPBOsNonSchedul
...
Remove Sleep/WaitUntil from checkPBO
2015-12-04 21:24:42 +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
deb87ef968
Update readme for 3.4
2015-12-01 16:54:01 -06:00
PabstMirror
9136129732
Fix readme again
2015-12-01 16:13:06 -06:00
