Commit Graph

6611 Commits

Author SHA1 Message Date
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
SilentSpike
42bd8751aa Fix spectator documentation formatting 2015-08-17 13:50:41 +01:00
SilentSpike
c834d411eb Merge pull request #2189 from acemod/spect-doc-updates
Update spectator doc with new information
2015-08-17 13:30:33 +01:00
SilentSpike
360230984b Fix spectator documentation typo 2015-08-17 13:27:41 +01: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
SilentSpike
e56ba38cee Update spectator doc with new information 2015-08-17 00:27:22 +01: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
Glowbal
14b5d62a56 Merge pull request #2181 from jokoho48/ModelFix
Fix Model Warning Unsupported UVSet
2015-08-16 19:55:16 +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
SilentSpike
94d4297179 Merge pull request #2179 from jonpas/fixAtropineString
Fixed Atropine autoinjector display name
2015-08-16 13:40:36 +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
206ee6e471 Merge pull request #2170 from jokoho48/codeCleanupLogisticUAVBattery
Code Cleanup Logistic UAV Battery
2015-08-16 08:49:07 +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
Glowbal
508c6de2cb Fixed coding-guidelines.md 2015-08-15 22:14:49 +02: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
7246298cc5 Merge pull request #2161 from acemod/settingBroadcastLocal
Don't broadcast localization for settings
2015-08-15 17:34:42 +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