Commit Graph

9066 Commits

Author SHA1 Message Date
commy2
5b85f6087b Merge pull request #2899 from acemod/fix_capitalization
fix capitalization
2015-11-30 18:32:34 +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
commy2
34d351c652 fix exitWith capitalization 2015-11-30 17:14:05 +01:00
commy2
0b84bb514b fix Cfg capitalization 2015-11-30 17:09:26 +01:00
commy2
dcf0a68b80 Revert "fix Cfg capitalization"
This reverts commit 43bda9c462.
2015-11-30 17:00:32 +01:00
commy2
43bda9c462 fix Cfg capitalization 2015-11-30 16:52:20 +01:00
commy2
ca9b909e75 fix CBA_fnc capitalization 2015-11-30 16:45:20 +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
commy2
ae1f35c042 remove superfluous private 2015-11-29 16:55:44 +01:00
commy2
caa5585044 simplify getRandomAnimation in sitting 2015-11-29 16:50:08 +01:00
commy2
ff4406e411 manual merge, more selectRandom command useage 2015-11-29 16:48:23 +01:00
commy2
e5c4d35969 1.55 use new selectRandom command 2015-11-29 16:33:25 +01: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
Thomas Kooi
d7a19cf0a6 Merge pull request #2882 from acemod/fixUGVNametag
fix UGV Nametag issue
2015-11-28 20:50:23 +01:00
Thomas Kooi
7dd0af33b4 Merge pull request #2871 from acemod/cleanupLaserpointer
cleanup laserpointer
2015-11-28 20:43:31 +01:00
Thomas Kooi
c132ef86cf Merge pull request #2133 from jonpas/dynamicViewDistance
Mk 1 eyeballs Integration
2015-11-28 20:40:29 +01:00
Thomas Kooi
e669f3e2cb Merge pull request #2699 from BaerMitUmlaut/disable-nvgs-in-sight
Disable nvgs in sight
2015-11-28 20:37:30 +01:00
gienkov
f25a181d8e fix my error 2015-11-28 20:37:29 +01:00
Thomas Kooi
cef01baf0b Merge pull request #2856 from acemod/isEqualTypeRepalcement
1.54 - Replace typeName with isEqualType
2015-11-28 20:36:07 +01:00
Thomas Kooi
b807d1db48 Merge pull request #2886 from acemod/bandageReopen
Add all wound types to bandage treatment configs
2015-11-28 20:32:13 +01:00
Thomas Kooi
f6619cfa87 Merge pull request #2889 from acemod/mention-build-failed
Add mention when make fails to build all pbos.
2015-11-28 20:31:29 +01:00
Glowbal
94cf661e44 Add mention when make fails to build all pbos.
- Prints all failed modules when make has completed
- No longer prints green OK text if a single module fails
- Gives a count of how many modules have failed to build

This is done to prevent overlooking of a failed pbo in the build process, since there is a huge amount of modules being build.
2015-11-28 19:40:59 +01:00
SilentSpike
a8cf9c6f48 Fix missing boolean inversion 2015-11-28 13:58:56 +00:00
gienkov
2c83fe4a11 refuel translation fixes 2015-11-28 13:45:59 +01:00
gienkov
a906c180ce remove alpha entries 2015-11-28 13:34:54 +01:00
PabstMirror
a42c2153cc Error handling for bad setting values array 2015-11-28 01:57:15 -06:00
PabstMirror
f676e6d9c9 Add some more typeNames replacements 2015-11-27 21:23:27 -06:00
PabstMirror
5850f78c1f Merge branch 'master' into isEqualTypeRepalcement 2015-11-27 21:08:21 -06:00
gienkov
adae379445 fixes 2015-11-27 21:55:05 +01:00
gienkov
b091b73e24 fixes 2015-11-27 21:54:04 +01:00
gienkov
3250245587 3.4.0 translations and fixes 2015-11-27 21:50:57 +01:00
PabstMirror
6031eb8c6e Add all wound types to bandage treatment configs
Fix by adding all config entries;
instead of trying to modify classname
2015-11-27 14:19:26 -06:00
gienkov
7eecff4296 Merge remote-tracking branch 'origin' into pl-translation
Conflicts:
	addons/captives/stringtable.xml
	addons/map_gestures/stringtable.xml
	addons/zeus/stringtable.xml
2015-11-27 21:19:25 +01:00