Commit Graph

8174 Commits

Author SHA1 Message Date
PabstMirror
db50b5313d getName can return raw or sanatized html tags 2015-12-11 12:01:50 -06:00
PabstMirror
c7b6375092 Sanitize less/greater-than symbol to square
Fix #2912
The raw `<` showed up in nametags and anything besides strucText
`[ / ]` is fairly close and will work in either text mode.
2015-12-10 23:29:05 -06:00
bux
8e6a057f52 fix common stringtable 2015-12-10 18:48:00 +01:00
PabstMirror
f3b7b3b94f Merge pull request #2994 from acemod/microDagrListBoxKeyblock
MicroDagr - Prevent Home Key being blocked
2015-12-10 09:20:06 -06:00
PabstMirror
a71cce1981 Merge pull request #2987 from acemod/gesturesCleanup
Setting For Gestures - Fix BI* gestures
2015-12-10 09:19:35 -06:00
commy2
f0642950e3 Merge pull request #3005 from acemod/cleanupFCS2
code cleanup fcs
2015-12-10 16:05:21 +01:00
commy2
077b9827e8 code cleanup fcs 2015-12-10 16:00:14 +01:00
commy2
48e9a257f7 Merge pull request #3004 from acemod/markerscleanup2
code cleanup markers
2015-12-10 15:36:04 +01:00
commy2
7748131e73 code cleanup markers 2015-12-10 15:32:31 +01:00
commy2
f64f4f4c4b Merge pull request #3003 from acemod/tweaklasersize
tweak size of laserpointer - release
2015-12-10 15:27:45 +01:00
commy2
a08cf69149 tweak size of laserpointer, fix #2975 2015-12-09 22:56:14 +01:00
PabstMirror
3ae7cd15bd cleanup stringtable phrasing 2015-12-09 12:27:47 -06:00
PabstMirror
3d560108a3 Setting For Gestures - Fix BI* gestures 2015-12-08 23:08:09 -06:00
PabstMirror
0eed4799af MicroDagr - Prevent Home Key being blocked
Fix #2974
2015-12-08 21:31:03 -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
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
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
Thomas Kooi
80463aff73 Merge pull request #2906 from acemod/fixRepairWithNoHitpoints
Remove error and don't exit if veh has no hit points
2015-12-01 20:45:56 +01: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
SilentSpike
acb24d04e6 Merge pull request #2896 from voiperr/saymyname
Add voiperr to authors.txt
2015-11-30 02:52:07 +00:00
voiper
675006a22f Add name to authors.txt 2015-11-29 16:56:48 -08:00
Thomas Kooi
02eee05cf4 Merge pull request #2884 from acemod/speedLimiterUGVFix
fix that in UGV dont work speedLimiter
2015-11-29 12:41:13 +01:00
Thomas Kooi
081106d6a3 Merge pull request #2892 from acemod/TheHidden
Remove nametags and actions on hidden units
2015-11-29 12:38:27 +01:00
bux578
35ecef454f Merge pull request #2825 from gienkov/pl-translation
pl translation
2015-11-29 07:35:04 +01:00
PabstMirror
8d2b612570 Remove nametags and actions on hidden units
Fix #2596
2015-11-28 21:35:25 -06:00
SilentSpike
c426bfc9c1 Merge pull request #2888 from acemod/repairPositions
Define custom repair points for a few vehicles
2015-11-28 20:09:37 +00:00
Thomas Kooi
5282e95668 Merge pull request #2876 from acemod/medicalTranslateHP
Medical Fixes
2015-11-28 20:58:08 +01:00
Thomas Kooi
ced94d73a7 Merge pull request #2797 from ColdEvul/RoadBarrierRoadCone
[REMADE] RoadCone_F and its inhered RoadBarrier_F intractable
2015-11-28 20:51:39 +01:00