commy2
|
5a164c5cdc
|
fix UBC issues, simplify uniform hitpoint config
|
2015-08-31 23:36:59 +02:00 |
|
Glowbal
|
8c6f896164
|
fixed script error when canceling treatment actions
|
2015-08-31 13:00:17 +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 |
|
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
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
PabstMirror
|
bc016eac4c
|
1.50 - use new didJip command (Ref #2241)
|
2015-08-26 22:39:27 -05:00 |
|
ViperMaul
|
5ea98143e2
|
Merge pull request #2211 from jonpas/integrateAsdg
Integrated ASDG JR Optional
|
2015-08-26 17:53:32 -07:00 |
|
jonpas
|
6a6c5008c0
|
Merge branch 'master' into repairHitpointStrings
Conflicts:
addons/repair/functions/fnc_doRepair.sqf
|
2015-08-26 23:29:36 +02:00 |
|
Glowbal
|
f7679b45ad
|
Merge pull request #2246 from jonpas/repairHitpointGroups
Repair Hitpoint Groups Framework
|
2015-08-26 23:27:08 +02:00 |
|
PabstMirror
|
9c8e9732ed
|
Add canInteractWith checks for cargo
|
2015-08-26 16:26:08 -05:00 |
|
jonpas
|
ce8da8d720
|
Fixed Full Repair available even when vehicle is already fully repaired
|
2015-08-26 23:09:46 +02:00 |
|
jonpas
|
b6d5db9157
|
Reverted IGNORED_HITPOINTS, Added Taru glasses to it
|
2015-08-26 23:09:04 +02:00 |
|
jonpas
|
cc70580a93
|
Improved comments
|
2015-08-26 22:51:41 +02:00 |
|
jonpas
|
e4123c9730
|
Added 2 strings, changed 1
|
2015-08-26 22:44:30 +02:00 |
|
PabstMirror
|
ca991712e8
|
Merge pull request #2270 from acemod/codeCleanUpMicroDagr
Code Cleanup MicroDagr Module
|
2015-08-26 11:03:22 -05:00 |
|
PabstMirror
|
4cf81b493a
|
Fix stringtable and more cleanup
|
2015-08-26 11:00:59 -05:00 |
|
Michael Braun
|
9ca19def70
|
Added autoformatting variations for log macros
|
2015-08-26 17:09:31 +02:00 |
|
jonpas
|
dc2e146e8b
|
Merge branch 'master' into repairHitpointStrings
Conflicts:
addons/repair/functions/fnc_addRepairActions.sqf
|
2015-08-26 17:04:05 +02:00 |
|
Michael Braun
|
fd204d972d
|
Fixed issue with ERROR conflicting with log level input
|
2015-08-26 16:45:28 +02:00 |
|
Michael Braun
|
5f6584ba3f
|
Added Log format macros for use with not printing it to the log.
|
2015-08-26 15:53:03 +02:00 |
|
ulteq
|
f1d41731fb
|
Merge pull request #2149 from jokoho48/codeCleanupHuntIR
Code cleanup of HuntIR module
|
2015-08-26 15:48:29 +02:00 |
|
Michael Braun
|
a17d94c213
|
Removed semicolon of log macro
|
2015-08-26 14:12:17 +02:00 |
|
Michael Braun
|
5a0e95dcf0
|
Simplified log macros
|
2015-08-26 14:04:17 +02:00 |
|
Grzegorz
|
5ad0e192c3
|
Fix being able to TQ torso
|
2015-08-26 11:18:54 +02:00 |
|
Glowbal
|
604a33f71b
|
Merge branch 'master' into medical-adjustments
|
2015-08-26 10:13:44 +02:00 |
|