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
SilentSpike
a1ec2eb7c3
Update handleRespawn to new function parameters
2015-07-09 21:24:45 +01:00
SilentSpike
1e13758ad8
Better group handling, more functional function
2015-07-09 21:20:09 +01:00
SilentSpike
1e8b869117
Reshuffling toolbar tools
2015-07-09 18:08:34 +01:00
SilentSpike
877d4e7cd9
Using common defines, further cleanup
2015-07-09 17:53:22 +01: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
SilentSpike
46bd42d59e
Cleanup interface config
2015-07-08 15:31:54 +01: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
SilentSpike
98e9245ed9
Basic respawning support
2015-07-05 21:53:09 +01:00
SilentSpike
2aebabdb2c
Safeguard against repeat usage
2015-07-05 21:31:26 +01:00
SilentSpike
788c23c940
Allow resetting existing spectators
2015-07-05 21:30:19 +01: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
PabstMirror
88e0b67364
Merge branch 'master' into fingering
2015-07-05 12:30:31 -05:00
SilentSpike
9026db9b3c
Major cleanup
2015-07-05 16:44:16 +01: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
Glowbal
e9d51aa57b
Updated repair config
2015-07-05 10:31:12 +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
069ab2432a
Keybinds should always be present
2015-07-05 01:32:06 +01:00
SilentSpike
ad30b28f34
Improved death handling
2015-07-05 01:29:14 +01:00
SilentSpike
bedde2197b
Only cache info on death if not a spectator
2015-07-05 01:12:16 +01:00
SilentSpike
950aec38b7
Fixed macro
2015-07-05 01:04:07 +01:00
SilentSpike
01a5ab619e
handleKilled and handleRespawn
2015-07-05 00:49:47 +01:00
SilentSpike
6596bbdb0a
Coding standards
2015-07-05 00:17:15 +01:00
SilentSpike
83e5309654
Updated side GVAR
2015-07-05 00:11:38 +01:00
SilentSpike
27610b78e1
Blank space cleanup
2015-07-05 00:10:01 +01:00
SilentSpike
5e7c094c98
Cache details on respawn (not at postInit)
2015-07-05 00:09:43 +01: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
SilentSpike
c09314027f
"isNotSpectator" canInteractWith condition
2015-07-04 19:41:18 +01: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
975bc229c6
Merge branch 'master' into ace_spectator
...
Conflicts:
addons/spectator/stringtable.xml
2015-07-04 18:53:20 +01:00
SilentSpike
97d1553841
Merge pull request #1794 from voiperr/ace_spectator_dev
...
[ace_spectator] Implement CBA Keybinds
2015-07-04 17:47:14 +01:00
SilentSpike
19c16b1f59
Comment out dev branch command
2015-07-04 17:40:23 +01:00