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
SilentSpike
0ffb9ea5ad
Define custom repair points for a few vehicles
...
Some helicopters have the main rotor point on the tip of a single blade which can be problematic depending on the orientation of the helicopter so those have been moved to the center (to match others). The tail rotor is also in the complete wrong position for some.
2015-11-27 20:06:57 +00:00
ViperMaul
8d4364350c
Fix for "double semicolon detected" error
2015-11-27 10:43:30 -08:00
jokoho48
76435ec228
posible fix for overlapping Speedlimiters
2015-11-27 15:48:03 +01:00
PabstMirror
e51f658ce0
Try base wound class in bandage treatment configs
...
Gets the correct wound for the bandage treatment config
Used for selecting most effective bandage and reopening
_className was something like "velocityWoundMedium"
but configs only had base class "velocityWound"
2015-11-26 23:18:39 -06:00
jokoho48
f364c2a5c3
fix some stuff i mixed up
2015-11-26 23:44:42 +01:00
jokoho48
5f2840bf39
fix that in UGV dont work speedLimiter
2015-11-26 23:39:17 +01:00
jokoho48
5df7eba1eb
remove debug Code
2015-11-26 22:27:46 +01:00
jokoho48
59708ec2f7
fix UGV Nametag RPT Issue #2873
2015-11-26 22:24:06 +01:00
jokoho48
52a6eddb44
fix missing PBOPREFIX
2015-11-26 20:53:14 +01:00
jokoho48
ace7894dbf
fix missing Simicolon in RHS AFRF Comp
2015-11-26 20:35:45 +01:00
PabstMirror
4aeeefdfe8
Fix UBC and increase Heli_04 Pod interaction distance
2015-11-26 11:47:25 -06:00
PabstMirror
a5c45c137f
Medical - addDamageToUnit Helper
2015-11-26 09:53:12 -06:00
Thomas Kooi
581f71f8a1
Merge pull request #2141 from GitHawk/refuel
...
Adding vehicle refueling
2015-11-26 16:16:13 +01:00
Thomas Kooi
bba0e999ff
Merge pull request #2164 from GitHawk/rearm
...
Adding vehicle rearming
2015-11-26 16:15:09 +01:00
Thomas Kooi
60684c584a
Merge pull request #2382 from TheMagnetar/master
...
Removed pedantic errors and redefinition of M_PI variable
2015-11-26 16:14:09 +01:00
Thomas Kooi
81ab280cb4
Merge pull request #2670 from acemod/simplifyFragConfig
...
Simplify frag config
2015-11-26 16:13:21 +01:00
Thomas Kooi
15267c0433
Merge pull request #2219 from acemod/handSignals
...
Hand signals enhancement
2015-11-26 16:04:41 +01:00
PabstMirror
ca0cfc9bbf
Merge pull request #2861 from acemod/repairRebass
...
Repair Overhaul
2015-11-25 17:00:32 -06:00
PabstMirror
988a5c76bb
Medical - 1.54 Changes
...
1.54 Armor
Translate selectiosn to hitpoints
Calc newDamage using hitIndex (because sel is translated)
Fix isFalling never being reset
Cache hitpointIndex to reset damage
Normalize Limb Armor to 1.54
Cleanup
Cleanup
2015-11-25 11:49:20 -06:00
PabstMirror
0b9044e3c7
Merge pull request #2753 from acemod/showHudSetter
...
Showhud setter
2015-11-25 11:16:21 -06:00
PabstMirror
ac6390c0b3
Add array info to header
2015-11-25 11:07:56 -06:00
PabstMirror
185cae2fe5
Remove Old Gestures from interaction
2015-11-25 11:00:45 -06:00
PabstMirror
095252ef76
Cleanup
...
revert `format ["'%1'", QGVAR()];` as it crashes the game
2015-11-25 10:16:37 -06:00
SilentSpike
c731d83642
Merge pull request #2848 from acemod/fixForEachDeleteAt
...
fix Issue with forEach Loops and deleteAt Index
2015-11-25 14:00:37 +00:00
Thomas Kooi
08c5374a99
Merge pull request #2390 from BaerMitUmlaut/pass-magazine
...
Added interaction to quickly pass a magazine
2015-11-25 14:04:07 +01:00
PabstMirror
36bf2d9cb5
Merge pull request #2803 from BaerMitUmlaut/remove-team-synching
...
Remove manual team synching
2015-11-24 21:37:50 -06:00
PabstMirror
20bf90f3e9
Medical - Fix Hitpoints Macro when building
2015-11-24 16:30:09 -06:00
PabstMirror
575fabb69d
#2872-Map time support for subclasses of ItemWatch
2015-11-24 16:17:06 -06:00
jokoho48
fd1c38c612
Merge branch 'master' of https://github.com/acemod/ACE3 into handSignals
2015-11-24 22:44:32 +01:00