PabstMirror
21db1bcf46
Fix Ammo check / formating
2015-06-04 13:08:01 -05:00
ulteq
fb2f3f8c3f
Added function headers / Fixed requiredAddons
2015-06-04 17:51:04 +02:00
Josuan Albin
70e83707c4
strobe light more bearable
...
changed the intensity of the strobe light, it's still VERY visible on a
very long distance, (around 1.6k maybe more)
2015-06-04 17:40:49 +02:00
ulteq
e728003725
Removed newline bracket
2015-06-04 17:23:01 +02:00
ViperMaul
97a4fefe60
Merge pull request #1406 from jonpas/macroSTR
...
Stringtable macros
2015-06-04 08:16:07 -07:00
jonpas
9fbf256acd
Merge branch 'master' into macroSTR
...
Conflicts:
addons/hearing/functions/fnc_putInEarplugs.sqf
addons/interact_menu/ACE_Settings.hpp
2015-06-04 17:13:09 +02:00
ulteq
39a6c29e3e
ACE2 concertina wire port.
2015-06-04 17:11:09 +02:00
Nicolás Badano
b5544ad390
Merge pull request #1502 from Winter259/CUP-backblast-disposable
...
CUP Launchers Backblast + Disposable
2015-06-04 11:26:30 -03:00
Nicolás Badano
aae8f4cf19
Merge pull request #1487 from SzwedzikPL/interact_menu_background
...
Interact menu - background options
2015-06-04 11:23:11 -03:00
SAM
885fe3ea1b
Added NLAW disposable
2015-06-04 14:57:43 +02:00
bux578
ee85aab791
fix #1439
2015-06-04 14:30:38 +02:00
bux578
2bf2b5737a
Merge pull request #1489 from acemod/DocumentationFixes
...
fix documenation typos
2015-06-04 13:48:08 +02:00
bux578
c88152fca6
add VON to nametags soundwaves
2015-06-04 13:47:18 +02:00
SAM
c6f0dd465d
Added RPG18 disposable config
2015-06-04 13:47:10 +02:00
SAM
3f4182d066
Finished M136 disposable config
2015-06-04 13:38:50 +02:00
SAM
c154e5a620
Added required CfgMagazines.hpp
2015-06-04 13:21:23 +02:00
SAM
ef1dc5453c
Added M136 disposable config
2015-06-04 13:14:57 +02:00
ulteq
da28aa3c64
More sandbag features:
...
* You can now carry sandbags
* Different sandbag model during deployment (no geometry)
* Deploying sandbags now requires an appropriate surface
* Proper PhysX activation chain when you deploy/pickup sandbags
* Sandbags are now destructible
* Some stringtable fixes
2015-06-04 11:13:12 +02:00
Glowbal
9bbeb7183e
Fixed find file extension in playChangefiremode
2015-06-04 10:39:43 +02:00
SAM
a54ccbcf16
Updating all values to proper required variables
2015-06-04 10:15:26 +02:00
SAM
9581dbbbec
SMAW inheritance fix
2015-06-04 10:08:11 +02:00
bux578
c9529a1e1c
Merge pull request #1484 from alganthe/documentation_pass_6
...
Documentation pass 6
2015-06-04 09:52:22 +02:00
SAM
23b7cd93b8
Added RPG18 backblast
2015-06-04 09:47:49 +02:00
SAM
01b969cfe4
Added NLAW backblast
2015-06-04 09:47:16 +02:00
SAM
592ca28117
Added M136 backblast
2015-06-04 09:46:29 +02:00
SAM
206249ebd5
Added Strela
2015-06-04 09:33:13 +02:00
SAM
a6106f2cc2
Added stinger
2015-06-04 09:32:44 +02:00
SAM
8508d62d57
Added SMAW
2015-06-04 09:31:54 +02:00
SAM
15052b93d5
Added RPG7V
2015-06-04 09:31:15 +02:00
SAM
de18016430
Added Metis
2015-06-04 09:30:43 +02:00
SAM
c2c3b2014e
Added MAAWS
2015-06-04 09:29:38 +02:00
SAM
5285207403
Added M47
2015-06-04 09:28:19 +02:00
gienkov
46dbd3113c
Fix
2015-06-04 01:38:57 +02:00
gienkov
fb10961a9b
PL translation for new things
2015-06-04 01:34:58 +02:00
gienkov
b5eb39291c
Merge remote-tracking branch 'origin' into pl-translation-1
...
Conflicts:
addons/advanced_ballistics/stringtable.xml
addons/frag/stringtable.xml
2015-06-04 00:52:35 +02:00
SAM
0b160b9a0a
Added CUP_launch_Igla backblast
2015-06-03 22:09:14 +02:00
ulteq
68b652cee9
Initial draft of the ACE2 tactical ladder port.
2015-06-03 20:27:52 +02:00
ViperMaul
237f5c1130
Merge pull request #1304 from acemod/debugButton
...
Export debug report from options menu
2015-06-03 09:28:37 -07:00
IngoKauffmann
ede8d74c54
Disabled pain effect while unconscious
...
If the player is unconscious the pain effect is disabled.
2015-06-03 17:53:09 +02:00
IngoKauffmann
e60cfddc77
Limited strength of pain effect while unconscious
...
Limited _strength to 0.1 so a player does not have to watch a flashing
screen while he can't do anything about it. Otherwise we need to include
a serious epilepsy warning!
2015-06-03 17:17:35 +02:00
ulteq
fc4095c11d
Added the yardage manual
2015-06-03 16:32:19 +02:00
ulteq
24f70e1012
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into Yardage450
...
Conflicts:
addons/apl/data/default.rvmat
2015-06-03 16:28:22 +02:00
ulteq
682af84425
Ported the ACE2 Yardage 450 laser rangefinder
2015-06-03 16:26:30 +02:00
Felix Wiegand
5b766d3668
Merge pull request #1490 from Dimaslg/patch-3
...
Update AUTHORS.txt
2015-06-03 16:08:18 +02:00
Dimas
a3a2c66775
Update AUTHORS.txt
...
Corrected my email address due to a missing letter.
2015-06-03 16:06:16 +02:00
bux578
9096f38777
Ear Plugs -> Earplugs
...
http://en.wikipedia.org/wiki/Earplug
2015-06-03 15:29:38 +02:00
bux578
5f656cd863
fix some documenation
...
(didn't touch medical and mortar)
2015-06-03 15:15:14 +02:00
ulteq
dc66e6e1d8
Merge pull request #1476 from acemod/mx2a
...
Ported the ACE2 MX-2A thermal imaging device
2015-06-03 14:54:03 +02:00
Josuan Albin
5cd5c9f21a
Documentation pass 6
...
- Added AMG doc
- Clarified overheating doc
- Getting started remade
- Vector doc moved from getting started to vector
- Classnames updated
- Switchunits doc fixed
- Rangecard doc added
2015-06-03 14:41:10 +02:00
PabstMirror
3a2e32b800
#1444 - Javelin Locking
2015-06-03 02:32:53 -05:00