PabstMirror
c27afca485
DisableEarRinging / Cleanup
2015-07-10 21:30:47 -05:00
PabstMirror
d11fa939e1
Hearing - Merge PFEH (ringing/volume)
2015-07-10 21:01:32 -05:00
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
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
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
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
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
SzwedzikPL
46e51f6788
rhs headgear compat
2015-07-01 22:25:19 +02:00
PabstMirror
5e80f9d8d3
Merge branch 'master' into userActionPrototype
2015-07-01 15:04:40 -05:00
Nicolás Badano
790d8d404e
Merge pull request #1773 from alganthe/documentation_pass_8
...
Documentation pass 8
2015-07-01 16:34:45 -03:00
Nicolás Badano
6cfaba04cb
Merge pull request #1775 from SzwedzikPL/hearing_headgear
...
Headgear influence on hearing
2015-07-01 16:32:14 -03:00
SzwedzikPL
6b4eeedbad
headgear influence on hearing
2015-07-01 21:21:09 +02:00
Josuan Albin
d1187ad82e
Documentation pass 8
...
- Finished: MicroDAGR doc, note that the images can't be viewed properly on GitHub.
- Coding guidelines are more readable now, added the STRING family of macros to it.
- How to enable dragging / carrying added to dragging / carrying framework with a BIG disclaimer that the functions are not public and may change.
- Shortcut updated to fit the convention established in the shortcut page.
2015-07-01 21:19:26 +02:00
PabstMirror
319e50a9cc
Viewdistance - Fix Error Missing )
2015-07-01 12:39:49 -05:00
Nicolás Badano
10ef88b655
Merge pull request #1596 from SzwedzikPL/interaction_box_inventory
...
Open action for boxes
2015-07-01 12:59:24 -03:00
Nicolás Badano
9d0dcc5ea2
Merge pull request #1757 from Winter259/viewdistance-settings-init
...
Viewdistance settingsInitialized
2015-07-01 12:58:07 -03:00
Nicolás Badano
e01ff79e41
Merge pull request #1759 from jonpas/addEarplugsEnhancement
...
Exit addEarplugs if earplugs are used
2015-07-01 12:48:14 -03:00
jonpas
8f0101a1d9
Merge branch 'master' into addEarplugsEnhancement
...
Conflicts:
addons/hearing/functions/fnc_addEarPlugs.sqf
2015-07-01 17:45:00 +02:00
Nicolás Badano
86b9174b6c
Merge pull request #1764 from jonpas/extrasCleanup
...
Organized extras/assets/icons, Added Thumbs.db to .gitignore
2015-07-01 11:33:26 -03:00
Nicolás Badano
f175490298
Merge pull request #1772 from acemod/aceModuleSyncronizedObjects
...
Ace_modules - Pass synced objects to functions
2015-07-01 11:33:03 -03:00
