Commit Graph

9001 Commits

Author SHA1 Message Date
VKing
73720f9313 Too hasty 2015-12-20 18:20:34 +01:00
VKing
b7bd468fdd That ought to not have worked before 2015-12-20 18:18:33 +01: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
VKing
450a18e13a Forgot to disable in case the setting's set to "no" (but why would you ever want to 2015-12-19 21:29:37 +01:00
VKing
f75311917c Upped mortar round mass 2015-12-19 20:49:09 +01:00
VKing
b4cb5c2ba7 Changed mortar initialization to getIn; Zeus-controlled AI will not trigger the init. 2015-12-19 19:54:45 +01:00
VKing
85270e4521 Fix init issue 2015-12-19 18:22:54 +01:00
VKing
a37d97103f Erk 2015-12-19 16:37:30 +01:00
VKing
a336707623 Fixed initialization, added exclude variable to prevent initialization of individual guns (for e.g. AI mortars) 2015-12-19 16:30:01 +01:00
VKing
dfe7c07936 Fix fnc_mortarInit, fnc_loadMagazine, some other stuff 2015-12-19 12:10:12 +01:00
VKing
901f55802c Merge remote-tracking branch 'origin/Mortar_interact' into Mortar_interact
Conflicts:
	addons/mk6mortar/CfgEventHandlers.hpp
2015-12-19 02:21:31 +01:00
VKing
2c4a25a6c0 Mortar init functions 2015-12-19 02:18:35 +01: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
VKing
c3788e8038 Changed to postInit 2015-12-17 23:35:02 +01: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
VKing
579f861b8f Unload to player inventory 2015-12-17 19:25:22 +01:00
VKing
27890a8dab First try at some module control 2015-12-17 11:00:46 +01:00
VKing
a0fdc58ed7 Remove unused variables, spaces 2015-12-17 09:13:23 +01:00
VKing
d8c8d02177 Port inventory picture and model 2015-12-17 00:21:54 +01:00
VKing
e0a21ce144 Completed code porting and interaction 2015-12-16 23:47:14 +01:00
VKing
3e6fc52733 First working iteration.
Todo:
Implement in module (Choose new or old/don't break old missions)
Magazine UI+model
Add preparing delay
Fix function readmes
Cleanup in functions?
Credits
MP Testing
2015-12-16 20:22:18 +01: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
licht-im-Norden87
999a6cd29d Update README_DE.md 2015-12-14 16:58:00 +01:00
licht-im-Norden87
a3e1e124f2 Update README_DE.md 2015-12-14 16:56:47 +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