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
PabstMirror
72fe95c797
Add "isNotInZeus" to canInteractWith
...
Re-fix #1951 (CTRL+V from climb blocking paste in zeus)
2015-12-30 01:48:43 -06:00
PabstMirror
1e29c0286f
Remove Keybinds/Events for Zeus now handeld in CBA
...
Close #2937
2015-12-30 01:07:55 -06: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
Thomas Kooi
6a21b7da1e
Merge pull request #3083 from acemod/remCupCompat
...
CUP compat no longer needed: CUP makes their own
2015-12-29 12:15:07 +01:00
PabstMirror
44568ec94e
CUP compat no longer needed: CUP makes their own
...
ref
https://forums.bistudio.com/topic/179326-community-upgrade-project-cup/
2015-12-28 21:27:47 -06:00
PabstMirror
dc60860421
Fix Third Person Goggle Effect Not Displaying
...
#3074
2015-12-26 23:31:49 -06: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
Githawk
d16417a00b
Changed scope on nozzle
2015-12-22 17:49:58 +01:00
Githawk
ebb28177b1
More fixes to make jerryCan work
2015-12-21 17:54:52 +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
Githawk
d9e7a43bf7
Fixes error with new interact_menu
2015-12-21 16:53:25 +01:00
Githawk
a8b306b201
Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel
2015-12-21 16:01:42 +01:00
jokoho48
0addb592d3
remove Unused Varaible in AB
...
fix private in AB
2015-12-21 02:29:10 +01:00
Ken
543f13c754
More Fixes
2015-12-20 14:37:14 -06:00
PabstMirror
bba908fcae
Better fix for M_PI definition
...
Just use #define _USE_MATH_DEFINES for cmath
2015-12-20 13:50:13 -06: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
PabstMirror
683f45682a
Fix Eotvos effect
2015-12-20 02:16:29 -06:00
PabstMirror
9b0641c06f
Add nil return for count
2015-12-19 21:17:36 -06:00
PabstMirror
74aec45921
Fix medical menu not closing on range, litter dir
...
- Medical Menu didn't close when target moved out of range
- Litter was always created in the same direction
2015-12-19 20:50:57 -06:00
PabstMirror
4d041c3c94
Merge pull request #3049 from acemod/fixlaserdesignator
...
Remove undefined laser selfdesignate macro
2015-12-18 12:09:04 -06:00
Jonathan Pereira
ad48f51ec7
Added PT-BR translations
...
All remaining translations of gestures, hearing, interact_menu,
interaction, nightvision, rearm, refuel, viewdistance were done!
2015-12-18 15:14:19 -02:00
PabstMirror
c53a0541a4
Add support for non local Zeus RC in common-isPlayer
2015-12-18 11:08:10 -06:00
Jonathan Pereira
db7074b6cf
Removed duplicated German entry
2015-12-18 14:45:20 -02: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
VKing
d36988852d
Oops bollocks
2015-12-18 16:31:01 +01:00
VKing
fce245ad76
Remove SMAW Spotting Rifle backblast
2015-12-18 16:23:07 +01:00
commy2
e3ecc64771
remove undefined macro
2015-12-18 13:53:25 +01:00
Ken
e033c56cfc
RHS weapons and Frag update
...
The RHS M249 and M240 now have the overheating and change barrel, plus
the M4 and M16 branch should have overheating applied to them. The ammo
class should have all of the hand grenade fixes in there.
2015-12-17 17:04:30 -06:00
PabstMirror
d8d3c146d3
Merge pull request #3041 from acemod/fixThreeDenCam
...
Optics - Don't modify camera for ThreeDen Editor
2015-12-17 16:28:36 -06:00
PabstMirror
27d683f8e2
RHS Compat - Add reqAddons, Fix M113
...
Adds requiredAddons for used units
Fixes class rhsusf_m113tank_base
2015-12-17 16:27:04 -06:00
PabstMirror
43a9865fa2
Use isNil for better future compatiblity
2015-12-16 12:10:53 -06:00
PabstMirror
360bdcb50e
Optics - Don't modify camera for ThreeDen Editor
...
Fix broken ThreeDen Camera when returning to editor from preview.
PIP will still work in preview.
Will have to take a look at 1.56 RC to see if command exists and
eventually cleanup.
2015-12-16 11:28:43 -06: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
Fadi
2caabcd00a
Correcting an issue in RHS AFRF Compat with Sprut turret
2015-12-15 18:59:27 -06:00
Fadi
d7fbd65687
Disabling ACE FCS in RHS USF Compat for M113 family
2015-12-15 18:58:57 -06:00
PabstMirror
9833a543b0
Merge pull request #3039 from acemod/fixInteractionDoor
...
Building Interact - Dummy object instead of hiding
2015-12-15 13:05:25 -06:00
PabstMirror
ff3ddbe287
Building Interact - Dummy object instead of hiding
...
Fix #3038
InteractiMenu now checks `isObjectHidden`,
So now use dummy object instead of hiding a real one
2015-12-15 12:04:03 -06:00
PabstMirror
7258a0084a
Merge pull request #2995 from acemod/repairThreshholdToolkit
...
Fix PostRepairDamage and toolkit consumtion setting
2015-12-14 19:30:19 -06:00
PabstMirror
f2bcd66784
Toolkit also consumed on fullRepair
2015-12-14 19:28:31 -06:00
PabstMirror
886c13f6a9
Merge pull request #3013 from acemod/bloodyLitter
...
Fix litter for adv - Add bloody p3d for Pack/qClot
2015-12-14 19:23:51 -06:00
PabstMirror
0b5b11c966
Merge pull request #3014 from acemod/fixNameSanatize
...
Sanitize less/greater-than symbol to square
2015-12-14 19:23:07 -06:00
PabstMirror
e5abb59f1d
Merge pull request #3011 from acemod/rhsMergeERA
...
RHS Compat - Combine all ERA Hitpoints
2015-12-14 19:22:51 -06:00
PabstMirror
aa668a44e4
Merge pull request #3027 from acemod/fixServerLog
...
Send string to serverLog instead of strucText
2015-12-14 19:22:20 -06:00
