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
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
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
SzwedzikPL
a8c11a249d
cargo sup for bodybag and concertina
2015-08-20 21:41:28 +02:00
Glowbal
60ef673896
Merge pull request #2198 from jonpas/logistics
...
Added Logistics Categories
2015-08-20 18:43:55 +02: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
jonpas
4c86db9505
Added AddCargoItem event and function to add an item by classname
2015-08-18 23:51:30 +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
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
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
PabstMirror
b9db03de20
Fix count problems
2015-08-14 20:13:41 -05:00
PabstMirror
e3a31687a8
Merge pull request #2084 from jokoho48/codeCleanupDisarming
...
Code cleanup of Disarming module
2015-08-14 20:01:23 -05:00
PabstMirror
253fb6e66a
Merge pull request #1986 from acemod/addMainAction
...
Always make sure ACE_MainActions exists
2015-08-14 19:48:04 -05:00
PabstMirror
f9b3cbc02a
Merge pull request #1956 from SzwedzikPL/laser_default_keybinds
...
default laser code down keybind fix
2015-08-14 19:36:02 -05:00
PabstMirror
6932014b9d
Merge pull request #1993 from acemod/fixMapCompassChange
...
Fix ace_map changes to compass display object
2015-08-14 19:34:09 -05:00
PabstMirror
fc51ad9a5e
Merge pull request #2137 from acemod/checkPBO-spawnloop
...
CheckPBO Fix endless waitUntil if checkAll is false
2015-08-14 19:31:36 -05:00
PabstMirror
13abee2612
Merge pull request #2106 from acemod/optionMenuFiltering
...
Option Menu Fixes for categories
2015-08-14 19:31:17 -05:00
PabstMirror
21400b0174
UBC, privates, LSTRING
2015-08-14 15:46:51 -05:00
PabstMirror
2be74dfdca
Privates
2015-08-14 15:14:36 -05:00
Glowbal
2062f5dcb6
fixed incorrect variable name
2015-08-14 22:07:49 +02:00
Glowbal
96ec435d0d
Added load in cargo containers
2015-08-14 22:01:14 +02:00
Glowbal
55ad706761
fixed car check - invalid variable name
2015-08-14 22:00:55 +02:00
PabstMirror
066a78d9aa
Fix var
2015-08-14 14:36:54 -05:00
Glowbal
83f46be990
Fixes and improvements for the repair module
...
1. Added full repair,
2. Added missing settings to modules and settings framework,
3. added assign engineer module.
4. Fixed animation bug
2015-08-14 20:49:51 +02:00
PabstMirror
ef5a3d69f5
Merge pull request #2148 from acemod/nameTagFixes
...
nametag cleanup and fix cursortarget distance
2015-08-14 12:58:02 -05:00
PabstMirror
09296e42a0
Merge pull request #2143 from acemod/removeBreifingPFEH-hack
...
Remove PFEH hack
2015-08-14 12:50:35 -05:00
ViperMaul
c3f6ee7141
Merge pull request #2140 from acemod/addActionParamChecking
...
AddAction basic param checking
2015-08-14 10:48:07 -07:00
Joko
ec5a1f038a
fix Typo issue
2015-08-14 18:42:22 +02:00
jokoho48
c4ed18f39f
Fix findNearestVehicle dont return BOOL
...
Fix that findNearestVehicle dont return any time the nearest car
Small Performance Improvement in getSizeItem/handleDestroyed/startUnload
Enhance Some legibility
2015-08-14 18:07:31 +02:00
jokoho48
8e7e9b9ee3
Fix Typo
2015-08-14 14:57:29 +02:00
Michael Braun
eaae6dfb7d
Replaced padding chain with params defaults
2015-08-14 11:43:36 +02:00
Michael Braun
2bbf631e71
Fixed missing semi-colon in safemode.
2015-08-14 11:39:22 +02:00
PabstMirror
28ac2fbec6
Merge pull request #2147 from jokoho48/codeCleanUpHitReaction
...
Code cleanup of HitReaction module
2015-08-13 17:11:19 -05:00
jokoho48
d62f00146e
Comment CleanUp
2015-08-14 00:02:19 +02:00
jokoho48
0656418cd1
Code cleanup of HuntIR module.
2015-08-14 00:00:34 +02:00
PabstMirror
68517756c4
#2139 and nametag cleanup
2015-08-13 17:00:24 -05:00
jokoho48
e890b310c1
Code cleanup of HitReaction module
2015-08-13 23:50:51 +02:00
PabstMirror
2d8261ddb5
Merge pull request #2135 from acemod/nameTagsWhenPaused
...
Don't draw nametags when escape menu is open
2015-08-13 16:09:32 -05:00
PabstMirror
43e9c420c4
Merge pull request #2136 from acemod/captiveHeliFix
...
Don't use old Helicopter_F
2015-08-13 16:01:59 -05:00
jokoho48
7bf7066cfd
Code cleanup of grenades module.
2015-08-13 22:36:58 +02:00
PabstMirror
7c60375105
Merge pull request #2102 from acemod/disposableFixes
...
Disposable fixes
2015-08-13 15:13:03 -05:00
PabstMirror
05def2f62b
Merge pull request #2016 from jokoho48/codeCleanupBackpack
...
Code cleanup of the Backpack module.
2015-08-13 15:10:39 -05:00
PabstMirror
8f142e26f8
Merge pull request #2094 from jokoho48/codeCleanupFingering
...
Code cleanup of Finger module.
2015-08-13 15:09:18 -05:00
jokoho48
acb4e44c19
Code cleanup of Finger module is Incomming(Part 2).
2015-08-13 22:04:35 +02:00
jokoho48
fcd60650b2
PATHTOF dont work with say3d
2015-08-13 21:57:58 +02:00
jokoho48
5597b7e40c
Code cleanup of Backpacks module
2015-08-13 21:56:02 +02:00
PabstMirror
a7ad6dafc9
Remove PFEH hack
2015-08-13 14:09:25 -05:00
PabstMirror
4f0dab23b8
Nametag category
2015-08-13 13:27:24 -05:00
PabstMirror
763f793d0e
Localize Catagoires in loadSettingsLocalizedText
...
Minor, but allows us to use CSTRINGS in configs for consistancy
2015-08-13 13:20:37 -05:00
PabstMirror
6ca3761710
AddAction basic param checking
2015-08-13 11:54:26 -05:00
PabstMirror
cfaf046e29
CheckPBO Fix endless waitUntil if checkAll is false
2015-08-13 00:31:29 -05:00
PabstMirror
3425913d27
#2132 - Don't use depreciated Helicopter_F
2015-08-12 23:32:57 -05:00
PabstMirror
b94cb3b85d
#2129 - Don't draw nametags when escape menu is open
2015-08-12 16:14:12 -05:00
bux578
3b3d99fd60
fix gienkov's stuff
2015-08-12 18:46:56 +02:00
bux
3dc53ec492
replace <Original> with <English>
2015-08-12 10:25:37 +02:00
Michael Braun
58b697e292
Fixed missing space invalidating some xml parsers.
2015-08-12 10:06:45 +02:00
Glowbal
0080335617
Added config attributes for cargo on wheel and tracks
2015-08-11 23:21:44 +02:00
Glowbal
aadddaa2c5
Added wheel as initial cargo when cargo module is enabled
2015-08-11 23:20:25 +02:00
Glowbal
abc732ac35
Added support for cargo configuration on vehicle spawn
2015-08-11 23:18:01 +02:00
Glowbal
c7b7418ae0
Removed "can only remove damaged wheels"
2015-08-11 21:42:20 +02:00
