bux578
68e2531af3
Merge remote-tracking branch 'origin/master' into tanoaWindDAta
2016-06-12 07:01:14 +02:00
PabstMirror
d14392c35c
Optics - Create PIP camera only when needed
2016-06-11 23:08:55 -05:00
commy2
ec01ae0d0b
Merge pull request #3897 from acemod/tanoaMapData
...
Tanoa map data
2016-06-11 23:03:22 +02:00
SilentSpike
931ccf8a46
Merge pull request #3796 from acemod/zeusModuleUiExample
...
Add more zeus modules
2016-06-11 21:41:55 +01:00
bux578
2a667a322d
init WindData --- missing directions
2016-06-11 22:37:03 +02:00
SzwedzikPL
0e247bdb00
CBA events
2016-06-11 22:13:39 +02:00
SzwedzikPL
acdfa52a89
Merge branch 'acemod/master' into dogtags
2016-06-11 22:07:57 +02:00
bux578
950cdb1ee3
fix missing values
...
was using an incomplete regex
2016-06-11 22:05:44 +02:00
SilentSpike
242876fa83
Merge remote-tracking branch 'origin/master' into zeusModuleUiExample
2016-06-11 21:02:16 +01:00
PabstMirror
ddf9e0b5cc
CBA Events
2016-06-11 14:57:04 -05:00
Glowbal
e8ba309765
Merge pull request #3887 from gpgpgpgp/patch-2
...
add a line to get rid of 4 first aid kits in the invisible fast roping helper
2016-06-11 21:53:34 +02:00
Glowbal
1632cb9105
Merge pull request #3878 from acemod/fastroping-sounds-fix
...
Only play fastroping sounds for player
2016-06-11 21:53:00 +02:00
PabstMirror
00e5cef145
Merge remote-tracking branch 'refs/remotes/origin/master' into add-mine-detector
2016-06-11 14:49:12 -05:00
commy2
250e27bfd2
Merge pull request #3864 from acemod/removeLineDrawing
...
Remove line drawing
2016-06-11 21:38:56 +02:00
Butt4cak3
151d13244b
Improved misleading translation of german bandages ( #3810 )
...
* Improved misleading translation of german bandages
* Further improved german bandage names
2016-06-11 21:35:22 +02:00
PabstMirror
d57754a7cd
Private/Formatting
2016-06-11 14:34:14 -05:00
PabstMirror
4f73ead80c
Fix alt/lat for maps not defined in getMapData
2016-06-11 14:32:36 -05:00
bux578
c268572649
add Tanoa mapData
2016-06-11 21:14:05 +02:00
bux578
18d864e950
split mapData into separate function
2016-06-11 21:13:51 +02:00
Glowbal
7f9257716e
Merge pull request #2331 from acemod/323bloodyoverlay
...
remove BI blood overlay
2016-06-11 20:49:54 +02:00
VKing
589ad4d2e7
Remove attachments from mine detectors
...
When WeaponSlotsInfo was added, rifle attachments could be added to the mine detectors.
2016-06-11 20:47:53 +02:00
commy2
a4bd6ea80f
Merge pull request #3893 from acemod/virtualMasDiv0
...
virtualMass - Fix div0 error when naked
2016-06-10 10:27:36 +02:00
commy2
e55881e1ef
Merge pull request #3894 from acemod/fixNametagsUAV
...
Fix nametag error when assignedTeam is nil
2016-06-10 10:20:16 +02:00
Glowbal
bbb8bafa1c
Merge pull request #3895 from acemod/devHandleDamage
...
Temp fix for change to handleDamage in dev branch
2016-06-10 09:28:44 +02:00
PabstMirror
dc6d5f1367
Temp fix for change to handleDamage in dev branch
...
Fix #3892
2016-06-09 21:26:50 -05:00
PabstMirror
5ecc09d78c
Fix nametag error when assignedTeam is nil
2016-06-09 20:42:30 -05:00
PabstMirror
e8f7f6ea24
virtualMass - Fix div0 error when playing as rabbit
2016-06-09 20:30:45 -05:00
PabstMirror
d7d87be32b
Merge remote-tracking branch 'refs/remotes/origin/master' into removeLineDrawing
2016-06-09 17:20:39 -05:00
Glowbal
c3d984d6e7
Merge pull request #3840 from acemod/eol-lf
...
Convert to LF line endings
2016-06-10 00:15:51 +02:00
jonpas
3389720f6b
Merge branch 'master' into eol-lf
2016-06-10 00:12:07 +02:00
SzwedzikPL
5313672e4c
dogtag picture
2016-06-09 17:10:46 +02:00
jonpas
1c06764d03
Add Extract Dependencies script ( #2640 )
...
* Add Extract Dependencies Python script, Add tools\temp to .gitignore
* Change backtick to single quote
* Remove unnecessary import
* Remove all whitespace
* Add support for multi-line dependencies, Add header comment, Improve
* Fix final message
* Update output to Jekyll IF statements for inclusion on pages
* Space
* Correct comments for Jekyll usage
2016-06-09 14:59:26 +02:00
jonpas
f1ae73967d
Normalize leftovers
2016-06-09 14:28:31 +02:00
jonpas
b97ba4990d
Normalize 2 more files
2016-06-09 14:25:57 +02:00
jonpas
bd5f6107a0
Merge branch 'master' into eol-lf
2016-06-09 14:24:45 +02:00
Glowbal
8c9b31b1c7
Merge pull request #3815 from acemod/cbaEventSystem
...
Deprecate ACE events framework
2016-06-09 14:20:26 +02:00
SzwedzikPL
aa407a469a
Merge branch 'acemod/master' into dogtags
2016-06-08 18:13:22 +02:00
gpgpgpgp
0c28cd4413
add a line to get rid of 4 first aid kits in the invisible helper
...
The helper "ace_fastroping_helper" inherits from Helicopter_Base_F, and here's chain of inheritance.
class CfgVehicles
{
class AllVehicles;
class Air: AllVehicles
{
class TransportItems
{
class _xx_FirstAidKit
{
name = "FirstAidKit";
count = 4;
};
};
};
class Helicopter: Air
{
};
class Helicopter_Base_F: Helicopter
{
};
class ace_fastroping_helper: Helicopter_Base_F
{
class TransportItems {}; // now overrides the first aid kits
};
};
Was a happy and funny surprise to pick up some decent medical supplies from one end of a cut rope.
2016-06-08 17:26:23 +08:00
voiper
38b98802de
Add grenade, chemlight, and handflare priming sounds.
...
Remove default clinking sounds.
2016-06-07 17:22:48 -07:00
SzwedzikPL
8bcf24a9c9
Merge pull request #1 from BaerMitUmlaut/dogtags
...
Added custom dogtag model and images
2016-06-08 00:24:32 +02:00
BaerMitUmlaut
5dbe99b740
Adjusted single and double dogtag renders
2016-06-07 20:40:26 +02:00
commy2
24ce8b7753
Merge pull request #3880 from acemod/spotting_scope_animated_reticle
...
Update Spotting Scope
2016-06-07 19:41:09 +02:00
commy2
5d0e257cd8
center interaction point, add gunner shadows
2016-06-07 19:36:03 +02:00
PabstMirror
1be926f3db
Make rotation key a client setting
...
Improve compatibility with other addons
2016-06-07 11:52:28 -05:00
PabstMirror
aea086b75e
Merge branch 'cbaEventSystem' into removeLineDrawing
2016-06-07 11:12:52 -05:00
BaerMitUmlaut
bce92e8d42
Merge pull request #3567 from BaerMitUmlaut/microdagr-microoverhaul
...
MicroDAGR Microoverhaul
2016-06-07 09:58:18 +02:00
commy2
f14a1b990b
simplify optics config
2016-06-07 07:38:01 +02:00
Nicolás Badano
527db2bd07
Merge pull request #3884 from acemod/fixShowWindInfoControlsText
...
Fix wind info keybind string
2016-06-06 21:39:54 -03:00
Nicolás Badano
56d604b2d7
Merge pull request #3883 from acemod/explosivePickUpMainAction
...
Move Defuse action to main action
2016-06-06 21:36:38 -03:00
jonpas
89db8bef5a
Fix wind info keybind string
2016-06-07 02:22:53 +02:00
