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
PabstMirror
701aa7e343
Add New Icons
2015-06-03 00:55:20 -05:00
SzwedzikPL
18940d0787
Interaction menu background options
2015-06-03 06:04:47 +02:00
SzwedzikPL
722e1f5fc1
Merge branch 'master' of https://github.com/acemod/ACE3
2015-06-03 05:19:57 +02:00
PabstMirror
5dc94487c5
Module Settings for Captivity
...
Setting for handcuffing own team, and allowing surrender.
2015-06-02 20:50:27 -05:00
ulteq
1777719f20
Merge pull request #1485 from acemod/abFixes
...
Ab fixes
2015-06-02 23:13:05 +02:00
ulteq
f0849e70ff
Slightly increased the alpha value of the bullet trace effect.
2015-06-02 23:11:44 +02:00
Nicolás Badano
8f15856084
Merge pull request #1415 from GitHawk/master
...
runOnHover can now be CODE & SurgicalKits
2015-06-02 18:07:36 -03:00
ulteq
16f6650486
Decreased the velocity threshold for the bullet trace effect
2015-06-02 22:38:44 +02:00
ulteq
c3e7129d13
Removed newline brackets
2015-06-02 22:38:12 +02:00
ulteq
52d304e9f9
Increased the protractor size
2015-06-02 22:37:27 +02:00
jonpas
3206e3b537
Fixed a syntax error, Fixed nametags module order as per last pull request
2015-06-02 22:36:06 +02:00
jonpas
5496333c26
Merge branch 'master' into macroSTR
...
Conflicts:
addons/nametags/ACE_Settings.hpp
addons/nametags/CfgVehicles.hpp
addons/nametags/stringtable.xml
2015-06-02 22:22:51 +02:00
jonpas
541f1010a7
Merge branch 'master' into macroSTR
...
Conflicts:
addons/attach/functions/fnc_attach.sqf
addons/captives/functions/fnc_moduleSurrender.sqf
addons/common/CfgVehicles.hpp
addons/explosives/CfgModule.hpp
addons/hearing/CfgVehicles.hpp
addons/interaction/CfgVehicles.hpp
addons/map/CfgVehicles.hpp
addons/microdagr/CfgVehicles.hpp
addons/mk6mortar/CfgVehicles.hpp
addons/nametags/CfgVehicles.hpp
addons/nightvision/functions/fnc_changeNVGBrightness.sqf
addons/respawn/CfgVehicles.hpp
addons/switchunits/CfgVehicles.hpp
addons/vehiclelock/CfgVehicles.hpp
addons/winddeflection/stringtable.xml
2015-06-02 22:14:32 +02:00
Nicolás Badano
0022548748
Merge pull request #1204 from usecforce/nametagsToggle
...
Disablable NameTags Module option
2015-06-02 17:03:47 -03:00
ulteq
5b2ad32c3f
Added model.cfg
2015-06-02 20:22:37 +02:00
ulteq
81a0f5147e
Stringtable cleanup
2015-06-02 20:18:30 +02:00
ulteq
f767f7eb2b
Removed duplicate code
2015-06-02 20:15:31 +02:00
ulteq
663ae1db4a
Fixed spelling
2015-06-02 20:07:35 +02:00
ulteq
c2be6ffef6
Added additional abort condition.
2015-06-02 20:06:56 +02:00
ulteq
4580168080
Fixed incorrect execution order
2015-06-02 20:01:48 +02:00
ulteq
2b6157bdb8
Fixed a typo
2015-06-02 20:01:00 +02:00
Glowbal
324aee1e57
Merge pull request #1471 from acemod/bodybagCleanup
...
Body bag cleanup:
2015-06-02 20:00:12 +02:00
ulteq
f766612532
Merge pull request #1481 from acemod/ballisticsCleanup
...
All TMR code was removed.
2015-06-02 19:58:10 +02:00
ulteq
3f10eed73c
All TMR code was removed.
2015-06-02 19:56:42 +02:00
ulteq
d733527f71
Ported the ACE2 sandbags
2015-06-02 19:30:50 +02:00
bux578
6ebf9067ef
Merge pull request #1478 from acemod/switchunitscleanup
...
cleanup switchunits
2015-06-02 19:20:34 +02:00
PabstMirror
d727cb400a
Modules - fix addEventHandler
2015-06-02 12:15:58 -05:00
bux578
0bd358c415
cleanup switchunits
2015-06-02 19:13:58 +02:00
Josuan Albin
7bc7e51ad7
flares modified
...
- all UGL flares have a 60s lifespan now
- handheld signals and 20mm flares have smaller flare sizes
2015-06-02 14:02:46 +02:00
ulteq
d0b8a97e79
Fixed requiredAddons[]
2015-06-02 13:40:10 +02:00
ulteq
f1dbe0fffc
Ported the ACE2 MX-2A thermal imaging device
2015-06-02 12:58:47 +02:00
ulteq
048e5b6f6d
Body bag cleanup:
...
* Increased the treatment time to match the animation duration
* Fixed the body bag alignment with the dead unit
2015-06-01 22:33:25 +02:00
Glowbal
cf0b2c2a52
Merge pull request #1469 from acemod/placeInBodyBagFix
...
Fixes random body bag teleports
2015-06-01 22:06:35 +02:00
Glowbal
4356b169d8
Merge pull request #1295 from SilentSpike/master
...
New zeus modules (#130 )
2015-06-01 22:04:36 +02:00
