PabstMirror
|
8307ccea96
|
firedNear - use new isKindOf
|
2015-08-30 01:37:14 -05:00 |
|
PabstMirror
|
2f54cfadbc
|
Merge pull request #2146 from jokoho48/codeCleanupHearing
Code cleanup of Hearing module
|
2015-08-30 01:18:47 -05:00 |
|
Grzegorz
|
5662e9eb62
|
proper name for stabilizer
|
2015-08-30 01:54:43 +02:00 |
|
gienkov
|
9187b31b92
|
pitot tube
|
2015-08-30 01:47:20 +02:00 |
|
gienkov
|
17f647f341
|
PL translation
|
2015-08-30 01:42:42 +02:00 |
|
KoffeinFlummi
|
6a17e3fa83
|
Merge remote-tracking branch 'origin/master'
|
2015-08-30 00:42:46 +02:00 |
|
KoffeinFlummi
|
5f63290508
|
Merge branch 'ptbr'
|
2015-08-30 00:42:31 +02:00 |
|
Glowbal
|
b968a32ea2
|
Merge pull request #2260 from acemod/updateMainConfig
Update Main Config File
|
2015-08-30 00:37:46 +02:00 |
|
KoffeinFlummi
|
a7f2a7fefc
|
Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3
|
2015-08-30 00:35:11 +02:00 |
|
Glowbal
|
4bde554854
|
Merge branch 'master' into medical-adjustments
Conflicts:
addons/medical/functions/fnc_actionCheckBloodPressure.sqf
addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
addons/medical/functions/fnc_actionCheckPulse.sqf
addons/medical/functions/fnc_actionCheckPulseLocal.sqf
|
2015-08-29 23:49:58 +02:00 |
|
PabstMirror
|
f67809b18c
|
Merge branch 'master' into mapOpenCloseEvents
|
2015-08-29 16:43:24 -05:00 |
|
PabstMirror
|
22f8b2e8c2
|
Merge pull request #2305 from acemod/attachEventHandlers
Attach event handlers
|
2015-08-29 16:35:51 -05:00 |
|
Glowbal
|
2fd30ba20c
|
fixes #2274
|
2015-08-29 22:57:52 +02:00 |
|
Glowbal
|
602ef690fc
|
Allow diagnose on torso #1879
|
2015-08-29 22:54:51 +02:00 |
|
Glowbal
|
ce42f5864f
|
fix #2155
|
2015-08-29 22:53:08 +02:00 |
|
Glowbal
|
b291141d11
|
Should Be a better fix for #2298
|
2015-08-29 22:51:42 +02:00 |
|
Glowbal
|
183e872f1f
|
Possible fix for #2298
|
2015-08-29 22:44:52 +02:00 |
|
PabstMirror
|
fa3a0213b7
|
Merge pull request #2249 from acemod/captiveFFV
Captive ffv animation fix + cleanup
|
2015-08-29 15:39:23 -05:00 |
|
Glowbal
|
2b3957324c
|
Merge pull request #2262 from jonpas/readmeFix
Updated README.md files
|
2015-08-29 22:37:40 +02:00 |
|
Glowbal
|
998bc2d45a
|
Merge pull request #2297 from acemod/addMoreHearingProtection
Add Hearing Protection to Helmets with Peltor Headsets
|
2015-08-29 22:34:59 +02:00 |
|
Joko
|
91a8463198
|
Merge pull request #2299 from acemod/FixTactialLadderAnimation
Fix Tactical Ladder Animation Clipping
Fixes #2287
|
2015-08-29 22:33:08 +02:00 |
|
SilentSpike
|
e3cda8ee0e
|
Merge pull request #2083 from acemod/spectator
Spectator
|
2015-08-29 21:21:41 +01:00 |
|
SilentSpike
|
620136a1a7
|
Merge branch 'master' into spectator
Conflicts:
AUTHORS.txt
|
2015-08-29 21:20:04 +01:00 |
|
PabstMirror
|
0b3b3871ff
|
Merge pull request #2065 from acemod/hearingDisableZeus
Setting to disable hearing for zeus RC
|
2015-08-29 15:15:14 -05:00 |
|
PabstMirror
|
d06680e2a0
|
#1571 - Handle Null Attached Objects
|
2015-08-29 11:47:56 -05:00 |
|
SilentSpike
|
200f44d963
|
Adjust spectator camera speed based on height
Slows the camera movement close to the ground as it feels more natural when spectating units up close and such
|
2015-08-29 16:05:04 +01:00 |
|
PabstMirror
|
6eba898301
|
Merge pull request #2160 from acemod/updatingBaseClass150
realisticnames 1.50 Updating Base Class Changes
|
2015-08-29 09:55:25 -05:00 |
|
PabstMirror
|
321ca815a2
|
semi-colon
|
2015-08-29 09:52:28 -05:00 |
|
PabstMirror
|
f6c752045c
|
Cleanup
|
2015-08-29 09:38:57 -05:00 |
|
jokoho48
|
8916b70fe1
|
Improve some Code
|
2015-08-29 15:29:02 +02:00 |
|
Glowbal
|
6796b3126d
|
Staged work on fixing updating base classes for hitpoints
|
2015-08-29 12:59:28 +02:00 |
|
Glowbal
|
1e08244f21
|
Removed debug output
|
2015-08-29 12:59:11 +02:00 |
|
Glowbal
|
1a4736e663
|
Clean up
|
2015-08-29 12:01:00 +02:00 |
|
Glowbal
|
1c9e88f213
|
fixes #1964
|
2015-08-29 11:58:28 +02:00 |
|
Glowbal
|
d56f3cea81
|
Added pain and unconsciousness handling for new basic medical code
|
2015-08-29 11:58:03 +02:00 |
|
Glowbal
|
354e4410d1
|
Merge pull request #2268 from gienkov/pulse-enhancement
HR and BP enhancement
|
2015-08-29 11:47:00 +02:00 |
|
Glowbal
|
70c0edf436
|
Merge pull request #2283 from acemod/cargoCanInteract
Add canInteractWith checks for cargo
|
2015-08-29 11:45:50 +02:00 |
|
PabstMirror
|
007859d42e
|
Attach - getin/out/killed event handlers (#2200 #2300)
|
2015-08-28 16:57:16 -05:00 |
|
jokoho48
|
3269114861
|
Fix Tactical Ladder Animation Clipping
|
2015-08-28 11:55:32 +02:00 |
|
bux578
|
19a6226ced
|
add Hearing Protection to Helmets with Peltors
|
2015-08-28 09:10:58 +02:00 |
|
PabstMirror
|
80d18c468e
|
Merge pull request #2244 from acemod/wireCuttersConfigAndCleanup
wirecutters config for fences + cleanup
|
2015-08-27 16:01:31 -05:00 |
|
commy2
|
6fe79c4fe2
|
remove obsolete compat pbo for BWMod, fix #2293
|
2015-08-27 22:10:09 +02:00 |
|
ViperMaul
|
a86ff93c16
|
Merge pull request #2052 from MikeMatrix/logMacros
ACE specific logging macros
|
2015-08-26 21:52:20 -07:00 |
|
Michael Braun
|
93106697ab
|
Added debug log macros
|
2015-08-27 06:21:02 +02:00 |
|
ViperMaul
|
d38cb31240
|
Merge pull request #2109 from acemod/pushSubmaine
Push SDV sub, cleanup push
|
2015-08-26 21:03:46 -07:00 |
|
ViperMaul
|
728aafc3c2
|
Merge pull request #2265 from jonpas/makeUpdate
Updated make.py with changes from CBA
|
2015-08-26 21:01:21 -07:00 |
|
PabstMirror
|
bc016eac4c
|
1.50 - use new didJip command (Ref #2241)
|
2015-08-26 22:39:27 -05:00 |
|
jonpas
|
1187b73419
|
make.py version bump to 0.7
|
2015-08-27 03:23:56 +02:00 |
|
ViperMaul
|
5ea98143e2
|
Merge pull request #2211 from jonpas/integrateAsdg
Integrated ASDG JR Optional
|
2015-08-26 17:53:32 -07:00 |
|
jonpas
|
6d27299883
|
Cleaned up spare parts collection after SettingsInitialized, Check if vehicle already in collection
|
2015-08-26 23:43:06 +02:00 |
|