Commit Graph

9066 Commits

Author SHA1 Message Date
dixon13
1aa192f7e0 Extract civilans from vehicles, rmeoved actions from civilians in vehicles 2015-12-23 00:19:41 -07: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
VKing
38fb97aeac Fixed init problem; added mortar ammo boxes 2015-12-20 20:51:44 +01: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
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