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
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
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
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
Glowbal
4acdfcbd24
Merge pull request #2193 from jokoho48/ModelFix
...
Model Fixes
2015-08-19 12:02:28 +02:00
jonpas
b16d313e35
Moved spare parts cargo init to cargo
2015-08-19 03:36:31 +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
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
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
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
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
bux578
ec29890780
Merge pull request #2128 from acemod/gienkov-pl-translation-5
...
Gienkov pl translation 5
2015-08-16 08:54:47 +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
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
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
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
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
7c276d9d25
Grenade Cleanup
2015-08-14 20:25:27 -05:00
PabstMirror
e160a62599
Merge pull request #2145 from jokoho48/codeCleanupGrenades
...
Code cleanup of Grenades module
2015-08-14 20:18:30 -05:00
