Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,547 Commits 73 Branches 88 Tags 752 MiB
6c968d8bc7
Commit Graph

6229 Commits

Author SHA1 Message Date
[OMCB]kaban
f69b94af98 Fix due to review 2015-09-05 04:53:30 +03:00
[OMCB]kaban
421f7bc6f8 Fix due to review 2015-09-05 04:38:39 +03:00
[OMCB]kaban
9f416b796c Fix due ti review 2015-09-05 02:07:26 +03:00
ViperMaul
4c0c7bc290 debug change 2015-09-04 10:21:10 -07:00
ViperMaul
7f58d5a94d Revert "Adding same ADV special case to BASIC handle damage." -Not Needed 
This reverts commit bf267246bf.
 2015-09-04 10:20:34 -07:00
ViperMaul
bf267246bf Adding same ADV special case to BASIC handle damage. 2015-09-04 07:48:16 -07:00
ViperMaul
2bc20501bc Adding more debug 2015-09-04 07:46:35 -07:00
ViperMaul
813e54a668 Fixing Debug for object variable hasPain 2015-09-04 07:37:20 -07:00
ViperMaul
89b0c05929 Fixed a debug statement. 2015-09-03 13:17:59 -07:00
commy2
b737f42777 fix error when opening triage card 2015-09-03 18:30:29 +02:00
bux578
9e1ae58f4f fix restore gear 2015-09-03 18:17:53 +02:00
PabstMirror
f63e652636 Merge pull request #2334 from acemod/mapToolsAspectRatio 
MapTools - Handle Bad Aspect Ratio
 2015-09-03 10:44:34 -05:00
commy2
795b7a893f Merge branch 'medical-adjustments2' of https://github.com/acemod/ACE3 into medical-adjustments2 2015-09-03 17:18:32 +02:00
ViperMaul
6d28214287 Add some debug values. 2015-09-03 08:18:37 -07:00
commy2
0bd92af072 fix variables not inited, csat armor scaleing 2015-09-03 17:17:54 +02:00
commy2
e753131f2d arms and legs to vulnerable, better scaling for pilots and csat 2015-09-03 16:17:48 +02:00
commy2
a84be46ed4 fix errors from cleanup 2015-09-03 15:49:49 +02:00
commy2
0436209dae Merge branch 'master' of https://github.com/acemod/ACE3 into medical-adjustments 2015-09-03 15:33:53 +02:00
commy2
736be74c2b Merge pull request #2344 from acemod/322hideclock 
hide clock on map if no watch in inventory, #414
 2015-09-03 13:44:20 +02:00
commy2
36b42f2780 Merge pull request #2343 from acemod/322flares 
scripted approach to hand flares, fix #1079
 2015-09-03 13:44:04 +02:00
commy2
529c85df58 Merge pull request #2338 from acemod/322sit 
Sitting improvements
 2015-09-03 13:43:53 +02:00
commy2
6b7f84b297 add missing ; 2015-09-03 13:39:17 +02:00
commy2
76bb2bd2b8 replace function with FUNC macro 2015-09-03 13:37:36 +02:00
commy2
a187be7255 sort flashbang under explosive grenades 2015-09-03 13:23:15 +02:00
PabstMirror
024dc3effe Cleanup 2015-09-03 00:16:48 -05:00
PabstMirror
789de9d111 runAfterSettingsInit helper func 2015-09-03 00:11:49 -05:00
PabstMirror
cbccd898ea Run functions after setting init 2015-09-02 23:58:24 -05:00
kaban
15fe2c32b8 Russian Translations - Update 2015-09-03 04:58:08 +03:00
kaban
08b7110e58 Russian Translations - Update 2015-09-03 04:54:52 +03:00
kaban
50b05fcdf0 Russian Translations - Update 2015-09-03 04:38:38 +03:00
commy2
fbf00b9aa5 correct comment 2015-09-03 02:55:40 +02:00
kaban
91cae690c0 Russian Translations - Update 2015-09-03 03:36:15 +03:00
ProfessorCZ
44fa520bdd Czech Translations - Update 2015-09-03 01:20:24 +02:00
jonpas
def2d29501 Cleaned up slideshow privates 2015-09-02 22:51:31 +02:00
jonpas
0bbf4d4128 Prevent Cargo opening if vehicle is locked 2015-09-02 22:24:46 +02:00
Glowbal
f38d245771 fixed bloodloss for basic medical 2015-09-02 21:56:00 +02:00
commy2
f939f9215e stop flickering of wounds, fix #346 2015-09-02 20:49:17 +02:00
commy2
7d2f1f52a4 remove protection, hitpoint config (fix ubc), some debug stuff 2015-09-02 20:13:51 +02:00
commy2
dc5e6b7c3c Merge branch '323medicalstrcturaldamage' into medical-adjustments 2015-09-02 20:02:19 +02:00
commy2
9665f73fa3 Merge branch 'master' of https://github.com/acemod/ACE3 into medical-adjustments 2015-09-02 17:03:36 +02:00
SilentSpike
6aa191b788 Merge pull request #2327 from acemod/fixGunnerGoggles 
Fix gunner goggles
 2015-09-02 13:31:50 +01:00
commy2
07ab7d1c35 correct comment 2015-09-02 02:00:53 +02:00
commy2
29efc13556 hide clock, use eventhandler 2015-09-02 01:59:07 +02:00
commy2
43c54d51e8 hide clock on map if no watch in inventory, #414 2015-09-02 01:40:38 +02:00
commy2
83424cdcab header for fnc_flare 2015-09-02 00:03:16 +02:00
commy2
7ce606740c make flares work in mp 2015-09-01 23:56:25 +02:00
commy2
be56fd7d46 scripted approach to hand flares, fix #1079 2015-09-01 23:19:49 +02:00
commy2
471d54f674 better saling for tracer sizes, fix #1008 2015-09-01 21:48:40 +02:00
commy2
237d5b6536 stand up action (uses get out shortcut) and less awkward standing animaton 2015-09-01 21:03:28 +02:00
commy2
acfc48efc2 animate head when surrendered and handcuffed 2015-09-01 20:00:28 +02:00
commy2
405d85eaaa fix leaning back through chair while sitting, fix #1795 2015-09-01 19:06:20 +02:00
PabstMirror
264091957a #1917 - Pointing Update Circle Icon 2015-09-01 10:09:14 -05:00
commy2
fb9ad6075f Merge pull request #2337 from acemod/322bouncym84 
bouncing flashbangs, fix #1907
 2015-09-01 17:05:36 +02:00
commy2
dd788342fe remove commented debug messages 2015-09-01 16:37:46 +02:00
commy2
b1fbbcc49f bouncing flashbangs, fix #1907 2015-09-01 12:46:15 +02:00
commy2
5e68486233 high command module breaks ace, fix #2134 2015-09-01 10:06:01 +02:00
commy2
73911f701d add debug messages for #2134 2015-09-01 08:53:11 +02:00
Michael Braun
035b3432c5 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros 
Conflicts:
	addons/common/XEH_postInit.sqf
 2015-09-01 08:45:59 +02:00
PabstMirror
c97e0eb500 MapTools - Handle Bad Aspect Ratio 2015-08-31 22:50:01 -05:00
jokoho48
3f4d0af940 prevent Issues with other mods 2015-09-01 01:03:34 +02:00
jokoho48
afee398b11 woops 2015-09-01 00:51:32 +02:00
jokoho48
5d612abd02 posible Fix for #2310 2015-09-01 00:42:13 +02:00
commy2
3362bbf0bf fix protection 1.50 ubc issues 2015-09-01 00:01:42 +02:00
commy2
5a164c5cdc fix UBC issues, simplify uniform hitpoint config 2015-08-31 23:36:59 +02:00
commy2
87cf7ded83 Merge pull request #2311 from acemod/322backpack 
objectParent command replacing fnc_getBackpackAssignedUnit
 2015-08-31 21:32:42 +02:00
commy2
e7d9e8c0dc Merge pull request #2312 from acemod/322opendoor3rdperson 
increase reach in 3rd person for opening doors, fix #2301
 2015-08-31 21:32:34 +02:00
commy2
aa1ad1bc2a Merge pull request #2313 from acemod/322ffvweaponselect 
fix weapon select in ffv slots not working
 2015-08-31 21:32:26 +02:00
commy2
9b6bc73c1a Merge pull request #2314 from acemod/322spottingscope 
better animation for spotting scope, fix #1638
 2015-08-31 21:32:17 +02:00
commy2
591327aaf3 Merge pull request #2315 from acemod/3220xgrenadebug 
fix autoriflemen spawning with 0x frag grenade bug
 2015-08-31 21:32:09 +02:00
commy2
80a0c93bdc Merge pull request #2316 from acemod/322customcamera 
fix custom cameras (for intros) being broken with ACE, fix #2248
 2015-08-31 21:32:02 +02:00
commy2
d85f96eac0 Merge pull request #2320 from acemod/322notonladder 
disable all actions while being on a ladder by default, close #2289
 2015-08-31 21:31:54 +02:00
commy2
e241c70a78 Merge pull request #2318 from acemod/322tripotmagsize 
tripod hmgs should have 100rnd mags instead of 500rnd mags, fix #1190
 2015-08-31 21:31:44 +02:00
commy2
2a82b97b5a Merge pull request #2328 from acemod/322laserpointer 
laserpointer with new command lineintersectssurface
 2015-08-31 21:31:35 +02:00
commy2
37aec2b3c3 enable repairing while on ladder 2015-08-31 21:22:22 +02:00
PabstMirror
ba3ecf2a0a Merge pull request #2321 from acemod/HearingStuff 
Hearing stuff
 2015-08-31 13:24:29 -05:00
PabstMirror
38122ffeaf Merge pull request #2197 from acemod/mapOpenCloseEvents 
Map open close events / MapTools Cleanup
 2015-08-31 13:23:10 -05:00
commy2
f15805d1f3 setStructuralDamage function 2015-08-31 20:05:38 +02:00
commy2
e1d683d8dc laserpointer with new command lineintersectssurface 2015-08-31 17:31:37 +02:00
SilentSpike
397d77e5b5 Remove special goggles treatment of vehicle units 
The condition to disable the overlay for gunners introduces more problems (and inconsistencies for that matter) than it was worth. Vehicle gunners using camera based weapons should probably consider not wearing a pair of glasses/goggles before doing so.
 2015-08-31 15:25:40 +01:00
SilentSpike
543e829278 Fix goggles overlay for FFV seats 
When aiming down sights, view is considered to be "gunner" and so the overlay would be disabled. Introduces addition canUseWeapon check if view is "gunner" to differentiate FFV seats from regular gunner seats
 2015-08-31 14:56:51 +01:00
SilentSpike
5e57cad669 Merge pull request #2216 from acemod/isolateZeusMenuKeybind 
Prevent CBA keybindings in zeus interface
 2015-08-31 14:41:48 +01:00
SilentSpike
04269831e8 Consider modifier keys for zeus interaction hack 
The hacky keybind detection method should consider modifier keys also to prevent keybinds on the same key with different modifiers from firing
 2015-08-31 14:40:31 +01:00
Glowbal
8c6f896164 fixed script error when canceling treatment actions 2015-08-31 13:00:17 +02:00
jokoho48
228eeab1a8 fix comments 2015-08-31 00:05:55 +02:00
jokoho48
4e6f289493 fix Function Names 
fix Input
 2015-08-30 23:40:53 +02:00
jokoho48
317706cf46 add Trace 2015-08-30 23:10:03 +02:00
jokoho48
bda274efff fix wrong config access point 2015-08-30 22:59:27 +02:00
PabstMirror
4be7411a05 Use "visibleMapChanged" event 2015-08-30 15:26:43 -05:00
commy2
7a4c37c085 disable all actions on ladders by default, close #2289 2015-08-30 22:03:45 +02:00
commy2
c3beee8261 make use of getHitpointsDamage command to drastically speed up some functions about hitpoints 2015-08-30 21:13:29 +02:00
commy2
fae38a2232 tripod hmgs should have 100rnd mags instead of 500rnd mags, fix #1190 2015-08-30 20:20:00 +02:00
commy2
c18af0d34b completely prevent ace_optics from interfering with any mission camera scripts 2015-08-30 19:30:44 +02:00
commy2
74dfd73167 fix issues with pip optics camera in virtual arsenal 2015-08-30 19:05:35 +02:00
commy2
8d589ea8f0 solution for custom cameras (for intros) being broken with ACE 2015-08-30 15:50:51 +02:00
commy2
fc6f97e09e fix autoriflemen spawning with 0x frag grenade bug 2015-08-30 13:30:21 +02:00
commy2
610bb7a1df better animation for spotting scope, fix #1638 2015-08-30 13:10:25 +02:00
commy2
58ec4a68cb fix weapon select in ffv slots not working 2015-08-30 12:01:13 +02:00
commy2
4682235d8a increase reach in 3rd person for opening doors, fix #2301 2015-08-30 11:13:26 +02:00
commy2
32300a0a80 objectParent command replacing fnc_getBackpackAssignedUnit 2015-08-30 10:45:14 +02:00
PabstMirror
910bb151e2 #1988 - Boost explosive hearing damage 2015-08-30 01:47:40 -05:00
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
jokoho48
05e07f37ac Merge branch 'master' of https://github.com/acemod/ACE3 into BackBlastEnhanced 2015-08-30 07:49:55 +02:00
jokoho48
d97cb8e78f add Missing Include 2015-08-30 07:49:12 +02:00
jokoho48
6d2e25d40b change some DFUNC to FUNC 2015-08-30 07:38:17 +02:00
jokoho48
35b6e04345 rewrite Caching in overpressure 
update code to params command
update Comments
 2015-08-30 07:35:58 +02: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
Michael Braun
657157d767 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros 
Conflicts:
	addons/hearing/functions/fnc_moduleHearing.sqf
 2015-08-29 22:38:26 +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
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
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
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
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
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
jonpas
dc2e146e8b Merge branch 'master' into repairHitpointStrings 
Conflicts:
	addons/repair/functions/fnc_addRepairActions.sqf
 2015-08-26 17:04:05 +02:00
jonpas
c0379c7809 Updated with correct cargo events and settings category 2015-08-26 17:02:29 +02:00
Michael Braun
097506076f Fixed format usage in macros requiring ARR_# for it to work 2015-08-26 16:48:55 +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
9e10aa86d7 Standardize logging format through ACE_LOG macros 2015-08-26 15:32:54 +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
Glowbal
19bfa478d1 Revert use of param in action string 2015-08-26 10:13:30 +02:00
Glowbal
9488b6cc2c Merge branch 'master' into medical-adjustments 2015-08-26 10:08:39 +02:00
Glowbal
0d7e7fa0cc should be type of 2015-08-26 10:08:32 +02:00
Glowbal
307afc0922 Merge branch 'master' into medical-adjustments 2015-08-26 10:05:46 +02:00
Glowbal
81068e6086 fixed dragging getWeight 2015-08-26 10:05:30 +02:00
Glowbal
0cfb492916 Fixes and removal of duplicate code 2015-08-26 10:04:51 +02:00
Glowbal
7a48f595be Merge branch 'basic-medical-test' into medical-adjustments 2015-08-26 09:13:12 +02:00
Glowbal
26ffcf473f Merge branch 'master' into medical-adjustments 2015-08-26 09:11:56 +02:00
Glowbal
1a0abf31fd fix global variable in local name space 2015-08-26 09:11:43 +02:00
Glowbal
3acfc4d2a3 Merge branch 'master' into medical-adjustments 2015-08-26 09:10:45 +02:00
Glowbal
65e16da998 fix missing semi column and bracket 2015-08-26 09:10:29 +02:00
Glowbal
db96d42f25 Merge branch 'CodeCleanUpMedical' into medical-adjustments 2015-08-26 09:06:27 +02:00
Glowbal
13740c06e4 Merge pull request #1816 from voiperr/ace_map_dev 
Flashlight simulation on map
 2015-08-26 09:01:30 +02:00
gienkov
6a123020d2 fail to find BP on limbs with TQ on 2015-08-26 08:55:50 +02:00
Glowbal
fb5563e7ba Merge pull request #2048 from MikeMatrix/codeCleanupSwitchunits 
Code cleanup of Switchunits module
 2015-08-26 08:51:22 +02:00
Glowbal
5bec26c721 Merge pull request #2086 from jokoho48/codeCleanUpDragging 
Code cleanup of Dragging module
 2015-08-26 08:45:30 +02:00
Glowbal
222e0183ed Merge pull request #2202 from jonpas/cargoEvents 
Cargo Events
 2015-08-26 08:36:31 +02:00
Glowbal
ad7716a25e Merge pull request #2233 from gienkov/patch-27 
Increase "load in bodybag" action time to 15s
 2015-08-26 08:36:06 +02:00
Glowbal
d97dfce2d3 Merge pull request #2245 from jonpas/repairHitpointSelections 
Custom Hitpoint Repair Positions Framework
 2015-08-26 08:33:01 +02:00
Glowbal
a139a3cccc Merge pull request #2263 from gienkov/patch-30 
Bandage and tourniquet on adv. medical change proposal
 2015-08-26 08:30:59 +02:00
jokoho48
ca71dd43e1 Code Cleanup MicroDagr Module 2015-08-26 05:31:33 +02:00
Grzegorz
b8a29bfd44 @jokoho482 suggestion 2015-08-26 03:00:43 +02:00
gienkov
cae5f828fb run check only on arms 2015-08-26 02:51:05 +02:00
gienkov
c3af5e81e7 fix my error 2015-08-26 02:41:12 +02:00
gienkov
5a9817322b remove tabs 2015-08-26 02:39:34 +02:00
gienkov
8498589920 pulse zero on limb with TQ on 2015-08-26 02:37:51 +02:00
PabstMirror
bcb6c474a0 Merge pull request #2250 from acemod/fixExportColors 
- Fix Exporting Color Arrays
 2015-08-25 16:42:26 -05:00
Felix Wiegand
3098794951 Merge pull request #2194 from NemesisRE/patch-1 
Changed german strings for aid kit
 2015-08-25 23:18:21 +02:00
PabstMirror
2c64cca44d Merge pull request #2236 from acemod/hugeChangeToInteractMenu 
Compile Self Menu, set "Default Params" to array instead of code
 2015-08-25 13:34:30 -05:00
Grzegorz
5280ded680 Bandage and tourniquet on adv. medical change proposal 
Make bandaging longer as it is not very fast process.
Make putting on tourniquet faster cause it's should be easy to put one on limb, so it's actually useful now and with above change (putting it on before was longer than bandagin).
 2015-08-25 20:05:05 +02:00
jokoho48
8d29170551 fixing Spelling Issues 
Change from DEBUG_SETTINGS_CORE to DEBUG_SETTINGS_MAIN
 2015-08-25 19:33:10 +02:00
ulteq
f0cc1ca333 Merge pull request #2015 from jokoho48/codeCleanupAB 
Code cleanup of the Advanced Ballistics module.
 2015-08-25 18:56:45 +02:00
jokoho48
2af486ab6b Update Main Config File 2015-08-25 18:34:10 +02:00
SilentSpike
ffcf0ecf7d Merge pull request #2253 from gienkov/spectator-pl-translation 
Translate spectator strings to polish
 2015-08-25 16:25:14 +01:00
voiper
e237bea88c Dimmed the glow values. 2015-08-24 15:43:43 -07:00
voiper
f8f8d7fd19 Simplified the colour check again. 2015-08-24 15:43:21 -07:00
voiper
54f1a87222 Simplified the colour check. 2015-08-24 15:42:12 -07:00
voiper
9de7953345 More cba capitalisation. 2015-08-24 14:12:04 -07:00
voiper
720f6c075a Removed old references to NVG. 2015-08-24 14:08:02 -07:00
voiper
1f8b16f7fb Fixed BFT module weirdness. 2015-08-24 14:06:19 -07:00
voiper
72b12e3af4 Fixed indentation. 2015-08-24 14:03:23 -07:00
voiper
79e6ce3803 Fixed CBA capitalisation. 2015-08-24 14:02:55 -07:00
voiper
b230762abd Add some string checking for flashlight glow type. 2015-08-24 13:59:35 -07:00
jonpas
9718883599 Consolidated into 1 function 2015-08-24 20:58:54 +02:00
bux578
21aa4da4ad Merge pull request #2255 from J3aLeiNe/master 
rangecard stringtable : french translation
 2015-08-24 20:51:44 +02:00
jonpas
3f0909ddd5 Fixed typo 2015-08-24 20:12:45 +02:00
jonpas
78e7565121 Added support for multiple groups, Fixed check group damage returning true even if hitpoint not in a group 2015-08-24 20:03:11 +02:00
jonpas
2c521527f4 Readded newline 2015-08-24 18:19:25 +02:00
jonpas
cb6efc7c9a Removed copy/paste minuses 2015-08-24 18:18:54 +02:00
jonpas
04da19190f Changed custom hitpoint positions config entry to 2d array 2015-08-24 18:17:56 +02:00
jonpas
449af180c7 Moved check for zero position in it's own line 2015-08-24 17:58:19 +02:00
jonpas
32d5ac99d9 Readded ignored hitpoints 2015-08-24 17:56:34 +02:00
Grzegorz
288457d366 fix 2015-08-24 17:43:02 +02:00
gienkov
0fa10045d2 pl translation of spectator 2015-08-24 14:35:15 +02:00
jokoho48
644c13c971 fix Typo 
Remove macro GETVAR
 2015-08-24 13:43:11 +02:00
Glowbal
b14dc7cb02 Merge pull request #2242 from jonpas/fixSlideshowModule 
Allow spaces in slideshow module
 2015-08-24 09:38:10 +02:00
PabstMirror
5d104106c5 #2188 - Fix Exporting Color Arrays 2015-08-24 00:58:45 -05:00
PabstMirror
a2022bb6fb Merge pull request #2176 from acemod/remove-asdg-message 
remove asdg message
 2015-08-24 00:17:18 -05:00
PabstMirror
d3db5ad2ed Cleanup 2015-08-24 00:07:40 -05:00
PabstMirror
40634318f0 Move RemoveHandcuffs to Main (always blocked by hands) 2015-08-23 23:41:35 -05:00
PabstMirror
bb616887dc Don't run when mounted 2015-08-23 22:55:43 -05:00
jonpas
7f175bad5f Added support for display messages 2015-08-24 05:24:25 +02:00
jonpas
144af2ed17 Added support for when one of the grouped hitpoints is damaged but not main 2015-08-24 05:14:04 +02:00
jonpas
f2bda7c434 Added hitpoint groups framework 2015-08-24 04:17:24 +02:00
jonpas
94c4c411e2 Added custom hitpoint selection framework with a starting example, removed blacklist 2015-08-24 03:23:37 +02:00
jonpas
1253d1267c Inlined selection check 2015-08-24 01:54:12 +02:00
jonpas
5c33f7736c Added support in repair for hitpoints with non-center selections 2015-08-24 01:51:34 +02:00
SilentSpike
152faf6388 Improve spectator interface entry and exit 
- Use a display rather than a dialog (contextually makes more sense).
- Move the entry/exit functionality to the setSpectator function. Preserves the handleInterface function for purely display related events and makes more sense.
- Fix missing semi-colon
 2015-08-24 00:43:20 +01:00
PabstMirror
2e1d734420 #2238 - use config for fences + cleanup 2015-08-23 18:39:08 -05:00
jonpas
6a1b8cc359 Changed to LSTRING 2015-08-24 01:25:00 +02:00
jonpas
d33834261f Removed debug 2015-08-24 01:14:59 +02:00
jonpas
e368ae28f5 Fixed localization on same type hitpoints 2015-08-24 01:13:42 +02:00
jonpas
396e01cd6e Added string checking for less needed string multiplicates 2015-08-24 01:04:57 +02:00
PabstMirror
27d974687e Merge pull request #2235 from acemod/mdagrFixes 
Mdagr fixes
 2015-08-23 17:00:37 -05:00
PabstMirror
05925ad7c2 Merge pull request #1902 from acemod/virtualExplosivesPlace 
Virtual explosives place
 2015-08-23 16:57:24 -05:00
Michael Braun
fc45d1216a Simplyfied bounding value detection 2015-08-23 22:26:31 +02:00
PabstMirror
58f4ef5b62 Merge pull request #2226 from acemod/codeCleanupMarker 
Code Cleanup Marker Module
 2015-08-23 14:27:07 -05:00
PabstMirror
a82e5b5436 Fix Colors + Debug Trace 2015-08-23 14:25:41 -05:00
jonpas
0fc9a33d38 Shortened sub-action text localization 2015-08-23 21:11:45 +02:00
jonpas
e08bf59ac2 Removed 'Repair' word from sub-actions 2015-08-23 21:09:36 +02:00
jonpas
2808ae6fc9 Removed debug 2015-08-23 19:55:52 +02:00
jonpas
ca1b47beb5 Use correct module group 2015-08-23 19:54:55 +02:00
jonpas
6d15e63f85 Fixed #2222 - Allow spaces in slideshow module by just trimming the splitted input string rather than removing all whitespace 2015-08-23 19:48:57 +02:00
PabstMirror
8ca06a9a76 More FFV animation stuff 2015-08-23 12:32:46 -05:00
Steven Koeberich
d5a1a99f90 Update stringtable.xml 
corrected spelling
 2015-08-23 18:58:13 +02:00
Michael Braun
9352a8dbcb Hotfix for missreplaced variable in projectile direction adjustment 2015-08-23 18:38:19 +02:00
Michael Braun
021c835b02 Removed debug messages 2015-08-23 17:54:10 +02:00
Michael Braun
20b45e10a4 Fixed issue with selecting the wrong value, when perfect barrel length match occured. 2015-08-23 17:53:33 +02:00
PabstMirror
b5fb0daa9b Merge branch 'master' into captiveFFV 2015-08-23 10:46:49 -05:00
Michael Braun
1c14897194 Fixed velocity limit detection and small comment fix 2015-08-23 17:39:48 +02:00
J3aLeiNe
490602facd rangecard stringtable : french translation 
rangecard stringtable : french translation
 2015-08-23 17:01:41 +02:00
jokoho48
260b048da4 some more Improvements 2015-08-23 14:13:55 +02:00
PabstMirror
69df301e67 Replace one more macro 2015-08-23 02:29:51 -05:00
PabstMirror
9aed148e8a Default Action parameters is [] for self (ref #2228) 
Makes it match fnc_compileMenu.sqf
 2015-08-23 00:16:01 -05:00
PabstMirror
248b4449bf #2204 - Tweak road draw for performance 2015-08-22 22:07:29 -05:00
PabstMirror
3df5b82402 #2225 - Fix mdagr list box colors 2015-08-22 20:53:29 -05:00
Grzegorz
33889fa46b Increase "load in bodybag" action time 
Around 15 seconds seems optimal (for dead bodies that are left in **one** piece).
 2015-08-23 00:13:09 +02:00
Joko
3eae83439b Merge pull request #2231 from gienkov/patch-26 
Fix stitching action progress bar
 2015-08-22 22:59:46 +02:00
jokoho48
29cc4c2697 stringtable Cleanup 2015-08-22 22:50:36 +02:00
jokoho48
9d0f3c7f5b stringtable Cleanup 2015-08-22 22:45:14 +02:00
jokoho48
4d81e4a99e Code Cleanup Medical Menu Module. 2015-08-22 22:33:15 +02:00
Grzegorz
07019ed928 Fix stitching action progress bar 2015-08-22 22:20:20 +02:00
jokoho48
fab4c6a67f fix Spelling Issues 2015-08-22 21:32:36 +02:00
jokoho48
19dd55147a Code Cleanup Medical Module (Part 4). 2015-08-22 19:47:23 +02:00
jokoho48
2d4ef16429 fix CTD 2015-08-22 18:54:51 +02:00
jokoho48
ff6c8a31be Code Cleanup Medical Module (Part 3). 2015-08-22 18:33:06 +02:00
jokoho48
10127ed957 Fix Typo 2015-08-22 17:10:19 +02:00
jonpas
18f5a2ca94 Renamed cargo events 2015-08-22 16:45:50 +02:00
jokoho48
21e0a9fff3 Merge branch 'master' of https://github.com/acemod/ACE3 into codeCleanupMedical 2015-08-22 16:32:15 +02:00
jokoho48
c2d94239a2 Code Cleanup Medical Module (Part 2). 2015-08-22 16:26:53 +02:00
jokoho48
d09ca9ec8b Code Cleanup Medical Module (Part 1). 2015-08-22 16:25:10 +02:00
Glowbal
7d2ca74402 Merge pull request #2220 from acemod/fixHitEffectRepair 
Fix Hit Effect on Track and Wheel
 2015-08-22 14:32:03 +02:00
jokoho48
f35b82ddb9 Code Cleanup Marker Module. 2015-08-22 14:08:35 +02:00
bux578
bfc3a4048e Merge pull request #2221 from gienkov/pl-translation-6 
PL translation and fixes
 2015-08-22 12:38:52 +02:00
gienkov
cf585790db fixes done 2015-08-22 11:41:15 +02:00
SilentSpike
21b0ee087a Add spectator UI interrupt system 
A public API system to allow external systems to interrupt and resume the spectator interface. Also made use of it for the escape menu and zeus support.
 2015-08-22 00:26:43 +01:00
SilentSpike
b8b71e1c76 Merge pull request #2195 from jonpas/fixVDlimit 
Fixed View Distance limit not applied on Video Settings
 2015-08-21 23:47:02 +01:00
jonpas
295acddc7a Added view distance set on module load, so it is guaranteed to be set 2015-08-22 00:33:16 +02:00
gienkov
96c3b62cb9 zeus translation 2015-08-22 00:19:51 +02:00
gienkov
75c31c10fd optionsmenu and repair first version of translation 2015-08-22 00:17:01 +02:00
jokoho48
11f753f873 Fix Hit Effect on Track and Wheel 2015-08-22 00:13:29 +02:00
gienkov
cc430fc8c2 medical translation 2015-08-21 23:54:01 +02:00
gienkov
1bbf721ef6 main translation 2015-08-21 23:51:48 +02:00
gienkov
f22531cc59 cargo translation 2015-08-21 23:50:54 +02:00
gienkov
8f483ba8df fix medical_menu stringtable error 2015-08-21 23:46:05 +02:00
jonpas
ccd0a7bd88 Merge branch 'master' into trackToTrackedVehicles 
Conflicts:
	addons/repair/stringtable.xml
 2015-08-21 21:04:50 +02:00
PabstMirror
cc9eee5609 Typo 2015-08-21 09:42:23 -05:00
PabstMirror
e0f20350a2 Merge branch 'master' into virtualExplosivesPlace 2015-08-21 09:16:15 -05:00
SilentSpike
5112bd9bdf Merge pull request #2163 from acemod/add-objects-to-curator 
Add objects to all curators
 2015-08-21 13:53:45 +01:00
Glowbal
bf8318530e Merge pull request #2081 from acemod/close-med-menus-distance 
Fixed #1893 - Menu closes when patient is more as 10 meters away
 2015-08-21 14:20:41 +02:00
Glowbal
b3ee889cac Merge pull request #2113 from MikeMatrix/codeCleanupSafemode 
Code cleanup Safemode module
 2015-08-21 14:20:08 +02:00
Glowbal
f0792233ae Merge pull request #2173 from jokoho48/codeCleanupMagazineRepack 
Code Cleanup Magazine Repack Module
 2015-08-21 14:09:55 +02:00
Glowbal
2f0ed4fba1 Merge pull request #2207 from jonpas/readmes 
Added and Updated README.md files
 2015-08-21 14:07:30 +02:00
Glowbal
26c172ff11 Merge pull request #2066 from acemod/fixDisableUserInput 
Fix and enhancement of two common functions
 2015-08-21 14:05:47 +02:00
Glowbal
20918f2c70 Merge pull request #2183 from acemod/treatmentWhileDeployed 
Fix treatment when weapon deployed
 2015-08-21 14:04:51 +02:00
PabstMirror
51a8cb7974 Only force Animation for FFV Cargo Seats 2015-08-20 23:58:06 -05:00
SzwedzikPL
a8c11a249d cargo sup for bodybag and concertina 2015-08-20 21:41:28 +02:00
SilentSpike
5b8708a179 Prevent CBA keybindings in zeus interface 
Checks if the key pressed matches the zeus menu keybind and only fires the code to handle CBA keybinds if true. Should fix the majority of weirdness with keybinds in zeus. However, not perfect as shared keybinds with different modifiers will still fire and it's really an un-ideal workaround.
 2015-08-20 18:17:37 +01:00
Glowbal
60ef673896 Merge pull request #2198 from jonpas/logistics 
Added Logistics Categories
 2015-08-20 18:43:55 +02:00
PabstMirror
645e8a63ef Captive FFV Lock Animation 2015-08-20 04:20:46 -05:00
SilentSpike
33ef60266b Fix medical CPR code and log message 
Performing CPR would never succeed when the patient was in revive state because the code was accidentally using `exitWith` instead of `then`. The log message string was also incorrect.
 2015-08-19 23:30:13 +01:00
PabstMirror
4c14dc7684 #2208 - Use ACE Message Display instead of sideChat 2015-08-19 17:25:45 -05:00
nsgundy
3aab62fa7c Return true / false if event was handled so that CBA keybinding doesn't have a reason to complain. 
Converted tabs to spaces
 2015-08-19 15:32:46 -03:00
jonpas
d71c43b91c Fixed unknown char 2015-08-19 17:12:39 +02:00
jonpas
9fd155f3ec Integrated ASDG JR Optional 2015-08-19 17:11:15 +02:00
jonpas
b627e32a00 Added shared logistics categories 2015-08-19 16:54:44 +02:00
Glowbal
4acdfcbd24 Merge pull request #2193 from jokoho48/ModelFix 
Model Fixes
 2015-08-19 12:02:28 +02:00
jonpas
683e727cb4 Readded items 2015-08-19 04:22:39 +02:00
jonpas
5a0a3a53e0 Uppercased 2 readme files 2015-08-19 04:19:00 +02:00
jonpas
de033f0ff2 README.md files added to all modules 2015-08-19 04:18:33 +02:00
jonpas
b16d313e35 Moved spare parts cargo init to cargo 2015-08-19 03:36:31 +02:00
jonpas
583682396f Changed cargo initVehicle to event driven, Added listenable event cargo_itemAdded 2015-08-18 23:59:01 +02:00
PabstMirror
4e3bbfac16 Clean old updateMapToolMarkers calls 2015-08-18 16:57:56 -05:00
jonpas
4c86db9505 Added AddCargoItem event and function to add an item by classname 2015-08-18 23:51:30 +02:00
jonpas
ffb765bf7a Changed to AddCargoItem event 2015-08-18 23:43:34 +02:00
jonpas
3bcebf9033 Moved spare parts adding to init, Added module option to add spare parts or not, Added module to add specific spare part and amount of it to specific vehicle(s) 2015-08-18 23:41:25 +02:00
jonpas
e110874800 Added cargo listenable and callable events 2015-08-18 18:48:21 +02:00
jonpas
16add9d376 Changed cargo_hideUnit for already existing hideObjectGlobal event 2015-08-18 18:19:18 +02:00
PabstMirror
4a245bd935 Remove Spawn for CBA_fnc_addPerFrameHandler 2015-08-17 22:21:18 -05:00
PabstMirror
1f9a98f77d Cleanup / Params 2015-08-17 21:51:40 -05:00
PabstMirror
980fc7a235 Merge branch 'master' into mapOpenCloseEvents 2015-08-17 21:08:07 -05:00
jonpas
fe9e4fee07 Fixed viewdistance limit not applied when Video Settings option is selected, Removed unnecessary EHs 2015-08-17 18:12:00 +02:00
Steven Koeberich
b333fe0cd1 Changed german strings for aid kit 
Missed some.
 2015-08-17 17:42:03 +02:00
Steven Koeberich
f543cf2897 Changed german strings for aid kit 
The translation for Fielddressing and Aid kit are the same in the german translation which is missleading.

Changed to "Erste-Hilfe-Set" (first aid kit) which is less missleading.
 2015-08-17 17:31:40 +02:00
jokoho48
e14c640c6f Fix Some LandContactPoints 
Fix Positions of some Model
 2015-08-17 16:11:23 +02:00
Glowbal
4d10f2a72d Merge pull request #2182 from jonpas/repairClean 
Repair Cleanup
 2015-08-17 11:31:57 +02:00
Glowbal
f59927a9a7 Merge pull request #2186 from jonpas/cargoClean 
Cargo Cleanup
 2015-08-17 09:50:49 +02:00
jokoho48
d5f9998ad0 Merge branch 'master' of https://github.com/acemod/ACE3 into codeCleanupABOnEchtFrameTest 2015-08-17 01:50:48 +02:00
jonpas
dcf074ed5a Changed Optional parameter comment to default value 2015-08-16 23:05:26 +02:00
jonpas
7b89784aae Removed semi-colons from return statements, command capitalization 2015-08-16 22:48:52 +02:00
jonpas
bbc715b2ee Cleaned function headers 2015-08-16 22:41:35 +02:00
PabstMirror
359ee1d23b #2180 - Fix QGVAR(fullRepairLocation) switch statement 2015-08-16 15:31:20 -05:00
jonpas
98dd60c6ca Alphabetized PREPs, removed newlines and repair references 2015-08-16 22:21:39 +02:00
jonpas
fb73d3a436 Fixed dependencies 2015-08-16 22:17:04 +02:00
bux578
905628bc1c Merge pull request #2165 from acemod/enhanceRespawn 
after respawn select last weapon, muzzle and mode
 2015-08-16 22:05:41 +02:00
jonpas
b2824c82bb Removed redundant function 2015-08-16 21:54:04 +02:00
jonpas
fda0850ad7 Condensed duplicated function, alphabetized PREPs 2015-08-16 21:39:42 +02:00
PabstMirror
dd58eef415 Fix double weapon switch for standing treatment 2015-08-16 14:12:26 -05:00
PabstMirror
21f46f4401 #2178 - Fix treatment when weapon deployed 2015-08-16 13:58:58 -05:00
jonpas
161a75adc7 Added missing arguments in header, replaced QOUTE(DFUNC()) with QFUNC() 2015-08-16 20:34:02 +02:00
jonpas
701c98e0da Cleaned up repair function headers and some code 2015-08-16 20:14:54 +02:00
jokoho48
8a5e572baf Fix Model Warning Unsupported UVSet 2015-08-16 19:52:28 +02:00
jokoho48
e41ce78dbb Code Test PFH 2015-08-16 19:49:47 +02:00
jonpas
85cc662fa4 ACE_Repair capitalization 2/2 2015-08-16 16:46:32 +02:00
jonpas
68359974f1 ACE_Repair capitalization 1/2 2015-08-16 16:46:17 +02:00
jonpas
b7282e476c Used macros, getVariable capitalization, removed start of file newlines, separated CfgActions 2015-08-16 16:45:46 +02:00
Glowbal
9f3af45a8f Fixed repair items not registered as loadable 2015-08-16 16:16:04 +02:00
SilentSpike
1d51bd7c40 Merge pull request #2162 from acemod/assign-medic-curator-modules 
Add medical curator modules
 2015-08-16 14:13:31 +01:00
jonpas
5b0168efdb Fixed Atropine autoinjector display name 2015-08-16 14:14:49 +02:00
bux578
5ffdf4628f remove asdg message 
new cba will include asdg jr
 2015-08-16 13:15:01 +02:00
Glowbal
0c1b828946 Merge pull request #2171 from acemod/fix-error-invalid-hitpoints 
Fixed error pop-up invalid configured hitpoints
 2015-08-16 10:24:24 +02:00
PabstMirror
61bc40a650 Opps 2015-08-16 02:05:34 -05:00
bux578
ec29890780 Merge pull request #2128 from acemod/gienkov-pl-translation-5 
Gienkov pl translation 5
 2015-08-16 08:54:47 +02:00
PabstMirror
b9638f749b SetPosition Event - Fix digging down (#1991) 2015-08-16 01:51:44 -05:00
jokoho48
4478be096e Code Cleanup Magazine Repack Module. 2015-08-16 00:30:24 +02:00
Glowbal
0420f0b216 Fixed error pop-up kicking you out of game in case a third party vehicle has incorrect configured hitpoints/selections 2015-08-16 00:15:16 +02:00
jokoho48
965b024bfa Code Cleanup Logistic UAV Battery. 2015-08-16 00:07:17 +02:00
SilentSpike
05bf239d8e Specify zeus setMedic module conditions further 2015-08-15 21:44:40 +01:00
SilentSpike
c01052e5bf Update ace_zeus function headers 2015-08-15 21:11:49 +01:00
PabstMirror
fc6cd34d33 params, cleanup 2015-08-15 14:35:33 -05:00
Glowbal
7fa30009d3 Merge branch 'add-objects-to-curator' of github.com:acemod/ACE3 into add-objects-to-curator 2015-08-15 20:39:54 +02:00
Glowbal
1417429782 Switched to serverInit instead of init as per suggestion from @SilentSpike 2015-08-15 20:39:22 +02:00
Glowbal
c7f47c0b34 Replaced check for captive module by check for ACE_medical 2015-08-15 20:31:41 +02:00
PabstMirror
30828b83d2 Stringtable fixes 2015-08-15 12:21:49 -05:00
PabstMirror
d023139e8d Stringtable fix 2015-08-15 12:04:57 -05:00
bux578
3d9b0d527c fix indentation 
atom needed the editorconfig package
 2015-08-15 18:58:31 +02:00
bux578
675cfc2da7 after respawn select last weapon, muzzle and mode 
#2138
 2015-08-15 18:54:39 +02:00
PabstMirror
4d8a9ae890 Merge branch 'master' into virtualExplosivesPlace 2015-08-15 11:40:06 -05:00
Glowbal
ed66255b19 Add objects to all curators 2015-08-15 18:39:43 +02:00
Glowbal
0e57d3d97c Added assign medic, medicalfacility and medical vehicle curator modules 2015-08-15 18:25:48 +02:00
Glowbal
29b21b8f41 Merge pull request #275 from acemod/cargo 
load things into vehicles
 2015-08-15 17:36:44 +02:00
Glowbal
bac1a8fce4 Merge pull request #186 from acemod/repair 
add repair PBO, fix #185
 2015-08-15 17:36:31 +02:00
Glowbal
fe9751f725 Added category to settings 
Fixed client setting attribute spelling mistake
 2015-08-15 16:00:37 +02:00
Glowbal
d3aa6a7f6b Added missing assign modules 2015-08-15 15:49:41 +02:00
PabstMirror
c54081d677 Don't broadcast localization for settings 
smaller `publicVariable`
 2015-08-15 03:48:25 -05:00
Glowbal
317c73a80e Added Land_PaperBox_closed_F 
fixed initOBject
 2015-08-15 10:22:44 +02:00
PabstMirror
660d048670 Options Menu - Fix Colors when category selected 2015-08-15 03:21:03 -05:00
PabstMirror
a2897e6d32 Merge branch 'master' into cargo 2015-08-15 03:11:19 -05:00
PabstMirror
ea2dc46d59 1.50 realisticnames - ubc 2015-08-15 02:56:34 -05:00
Glowbal
03413ef6b6 Merge branch 'cargo' of github.com:acemod/ACE3 into cargo 
Conflicts:
	addons/cargo/functions/fnc_initVehicle.sqf
 2015-08-15 09:51:15 +02:00
Glowbal
d8084e20d7 Added cargo settings and settings module. 2015-08-15 09:50:00 +02:00
PabstMirror
c35fc35eb3 Captive FFV stuff 2015-08-14 21:29:01 -05:00
PabstMirror
7c276d9d25 Grenade Cleanup 2015-08-14 20:25:27 -05:00