Commit Graph

8351 Commits

Author SHA1 Message Date
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
jokoho48
588f5adce8 fix math issue 2015-08-29 14:54:42 +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
1f602ea9a3 disable Debug 2015-08-28 13:17:29 +02:00
jokoho48
a83a5a17a3 Fix Issues 2015-08-28 13:15:21 +02:00
jokoho48
5598c3abe1 Merge branch 'master' of https://github.com/acemod/ACE3 into codeCleanupKestrel4500 2015-08-28 13:03:28 +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
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
jonpas
48e0f5757d Merge branch 'master' into trackToTrackedVehicles
Conflicts:
	addons/repair/stringtable.xml
2015-08-26 23:38:51 +02:00
jonpas
ef1b4cbd26 Merge branch 'master' into trackToTrackedVehicles
Conflicts:
	addons/repair/XEH_preInit.sqf
2015-08-26 23:33:05 +02:00
Glowbal
3db981a2c5 Merge pull request #2243 from jonpas/repairHitpointStrings
Improved Repair Hitpoint String Localization
2015-08-26 23:32:37 +02: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
Glowbal
a0f030c35c Merge pull request #2282 from jonpas/fixFullRepairCondition
Fixed Full Repair available even when vehicle is already fully repaired
2015-08-26 23:23:08 +02: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
jonpas
497199e5ed Changed CBA A3 link from Armaholic to GitHub 2015-08-26 21:35:37 +02:00
jonpas
23f8bbaca1 Improved german langauge 2015-08-26 21:34:51 +02:00
jonpas
b3838262f1 Fixed duplicated part of DE readme 2015-08-26 21:33:55 +02:00
jonpas
8529e5c9b7 Merge branch 'master' into trackToTrackedVehicles 2015-08-26 21:25:08 +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
36aeb61d81 Fixed error caused by closing square bracket 2015-08-26 17:51:56 +02:00
Michael Braun
3dc3331d87 Replaced rogue format with FORMAT_# 2015-08-26 17:45:17 +02:00
Michael Braun
5047d4de1c Switched to ACE_LOG<LEVEL>_# variation 2015-08-26 17:39:44 +02:00
Michael Braun
9ca19def70 Added autoformatting variations for log macros 2015-08-26 17:09:31 +02:00