Nicolás Badano
4e5368ba93
Merge pull request #1836 from jonpas/indentationTripod
...
Tripod indentation and PBOPREFIX fix
2015-07-10 19:56:14 -03:00
jonpas
c90c83831d
Removed Tripod PBOPREFIX newline
2015-07-10 23:36:30 +02:00
jonpas
ef18006423
Tripod indentation to 4 spaces, removed empty first lines
2015-07-10 23:34:36 +02:00
SilentSpike
97f3ec4f65
Merge pull request #1835 from jonpas/disableEarRingingOnTheFly
...
Exit Ear Ringing PFH when disabled during ringing
2015-07-10 22:08:53 +01:00
SilentSpike
f63393bc22
Merge pull request #1834 from jonpas/fixBinocsSafety
...
Removed safety from binoculars/designators
2015-07-10 21:56:37 +01:00
jonpas
4826fd5c1c
Exit Ear Rining PFH when disabled during ringing
2015-07-10 22:52:04 +02:00
jonpas
e437fbbacd
Removed safety from binoculars/designators
2015-07-10 22:42:40 +02:00
bux578
c0c07b3ada
fix typos in documentation
2015-07-10 10:19:28 +02:00
Nicolás Badano
a94d925bdb
Merge pull request #1748 from nic547/whocaresaboutbranchnames
...
BWA3 compat: HuntIR and more
2015-07-09 10:20:47 -03:00
Glowbal
d3bed7aedb
fixed -1 to disable the revive timer does not work
2015-07-09 13:02:48 +02:00
PabstMirror
499a63e8e3
External - Move to right of head
2015-07-08 15:53:31 -05:00
Ivan Navarro Cabello
78529af60c
Update spanish translation
2015-07-08 20:57:46 +02:00
PabstMirror
ba8c9186bb
Show leveled azimuth/elevation
2015-07-08 01:00:43 -05:00
jonpas
815b7984aa
Fixed event statement arguments, reworded comment
2015-07-07 03:46:54 +02:00
SzwedzikPL
defc82694b
Fix for 'Treat at...' option
2015-07-06 21:30:49 +02:00
PabstMirror
f6973c61fa
Merge branch 'master' into mk6-fixBISleveling
2015-07-06 01:35:55 -05:00
Joko
fa900452ea
Add DAGR (by Blackpixxel)
...
Add QuikClot to Medical (by Blackpixxel)
Add QuikClot Litter (by Blackpixxel)
Update Blackpixxel at Author
Fix IRStrobe Texture Path
2015-07-05 22:21:17 +02:00
jonpas
cb210f92a0
Prevented sitting on flipped chairs, Stand when chair gets knocked away/otherwise moves
2015-07-05 17:07:34 +02:00
jonpas
34dea7d971
Fixed #1796 sitting above ground level
2015-07-05 13:55:45 +02:00
PabstMirror
6e982018d3
Don't use uiNamespace to store PEFH
2015-07-04 23:14:44 -05:00
PabstMirror
183c03a3a4
Add missing PREP
2015-07-04 22:54:21 -05:00
SilentSpike
86a8fb0b64
Merge pull request #1800 from jokoho48/ImproveNametags
...
Small Improvement in Nametags
2015-07-04 23:27:10 +01:00
Joko
815365fd2e
Small Performace Improvement in Nametags
2015-07-04 23:03:16 +02:00
Joko
0c099dc4d1
Add 3D Object IVBag Blood, Plasma and Saline with 1000ml, 500ml, 250ml(Made by PaxJaromeMalues)
...
Add PaxJaromeMalues to AUTHORS
2015-07-04 22:50:32 +02:00
Joko
240b26b9ac
Add IRStrobe 3D Object to attach
...
Add M57 Clacker to explosives
Add New LowPoly Earplug to Hearing
Add WireCutter to logistics_wirecutter
Reduce UAVBattery Texture Size in logistics_uavbattery
Add MapTools to maptools
2015-07-04 19:56:54 +02:00
SilentSpike
19c16b1f59
Comment out dev branch command
2015-07-04 17:40:23 +01:00
bux578
e56f022f5b
Fix anchor link in documentation
2015-07-04 16:21:59 +02:00
bux578
fcb6383337
remove some empty xml nodes
2015-07-04 16:19:53 +02:00
bux578
7cf458fb48
Merge pull request #1797 from ProfessorCZ/master
...
Czech Translation - Update
2015-07-04 16:13:50 +02:00
ProfessorCZ
89a9218e59
CZ Translation - Update
2015-07-04 15:56:00 +02:00
PabstMirror
ab2ebf5fcf
MissleGuidance - Move PARAMS up to top
2015-07-03 21:06:13 -05:00
SilentSpike
909fbb5dc4
Merge pull request #1732 from acemod/checkPBOfix
...
CheckPBO should ensure client isn't running any addons the server isn't
2015-07-03 22:33:17 +01:00
Glowbal
57c4bc453a
Merge pull request #1779 from SzwedzikPL/zeus_no_paineffect
...
disable pain effect in zeus camera
2015-07-03 23:20:33 +02:00
Glowbal
44de95ea81
Merge pull request #1790 from acemod/medicalImprovements
...
Medical improvements
2015-07-03 22:21:20 +02:00
Glowbal
fd649aee38
Changed default value for surgical kit. Should be use anytime
2015-07-03 22:17:31 +02:00
Glowbal
9edf1b1adf
Implemented use conditions for PAK and SurgicalKit
...
It is now possible to only have a treatment action show up for stable (not bleeding) patients
2015-07-03 22:16:18 +02:00
Glowbal
07303633e4
Merge pull request #1692 from acemod/fixVanillaDamageEffectsShowing
...
Fix vanilla damage effects
2015-07-03 21:41:26 +02:00
SilentSpike
bbadc9242b
Further zeus actions cleanup
2015-07-03 14:21:21 +01:00
SilentSpike
ca36b62356
Zeus interactions string cleanup
2015-07-03 13:20:32 +01:00
PabstMirror
1c6b12126e
Merge branch 'master' into mk6-fixBISleveling
2015-07-02 22:03:25 -05:00
Nicolás Badano
8052dd8ea3
Merge pull request #1782 from gienkov/pl-translation
...
PL translation
2015-07-02 23:06:13 -03:00
Nicolás Badano
40b780220e
Merge pull request #1783 from acemod/hideUnit
...
Adding hideUnit functions to ace_common
2015-07-02 23:05:18 -03:00
SilentSpike
d036639b46
Adding hideUnit functions to ace_common
2015-07-03 02:14:58 +01:00
gienkov
70862c5de9
PL translation
2015-07-02 23:55:26 +02:00
SzwedzikPL
13999fdd31
finddisplay into curatorcamera
2015-07-02 19:36:34 +02:00
Nicolás Badano
13f5b08892
Merge pull request #1760 from voiperr/master
...
ACE_Spectator
2015-07-02 10:52:59 -03:00
SzwedzikPL
c2e4ee431f
no pain effect in zeus camera
2015-07-02 13:56:56 +02:00
Nicolás Badano
cabddf89b7
Merge pull request #1007 from acemod/userActionPrototype
...
Add Actions to buildings (UserActions - Ladders)
2015-07-01 18:11:38 -03:00
PabstMirror
89305473a2
Add performance note.
2015-07-01 15:50:14 -05:00
Nicolás Badano
6157deb904
Merge pull request #1776 from SzwedzikPL/rhs_compat
...
RHS Headgear compat to hearing
2015-07-01 17:42:45 -03:00
