Commit Graph

5465 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Glowbal
b45aa51d47 hacked approach for repair tracks.
Could probably better go with config entries, but this seems to be a very good value for 90% of the vanilla tracked vehicles. It's also still easily accessible and on an acceptable place for the remaining vehicles.
2015-08-11 21:35:13 +02:00
Glowbal
660f8debf6 Merge branch 'master' into repair 2015-08-11 21:09:44 +02:00
Michael Braun
4babfa0bf8 Fixed missing return value description in safemode module 2015-08-11 17:56:46 +02:00
Michael Braun
42e7340b79 Code cleanup of Safemode module 2015-08-11 16:50:05 +02:00
PabstMirror
a908863317 Use proper lnbXXX commands 2015-08-11 04:15:55 -05:00
PabstMirror
bdca10eac4 Close Client Settings When open Server Settings 2015-08-11 01:38:31 -05:00
PabstMirror
2565a80a22 #2098 - Option Menu Fixes for categories
Use lbValue to store the index of the filtered selection
2015-08-10 17:19:30 -05:00
Glowbal
ffa476bee2 Improved action display text 2015-08-10 23:16:58 +02:00
Glowbal
c016d01414 Initial load in cargo module 2015-08-10 23:07:47 +02:00
PabstMirror
4377bbeb75 Delete unused file 2015-08-10 15:26:44 -05:00
PabstMirror
512011a756 Remove Debug Code 2015-08-10 15:16:16 -05:00
PabstMirror
47b18b2b39 Cleanup disposables also fix #2090 (alt add for AI) 2015-08-10 15:12:42 -05:00
Glowbal
27a57d89f8 Merge branch 'master' into cargo 2015-08-10 17:59:19 +02:00
Glowbal
e5eaefafdb fixed #2097 - script error because of global variable in params 2015-08-10 09:51:14 +02:00
jokoho48
f3fbf0c5ff Code cleanup of Finger module is Incomming. 2015-08-10 00:19:27 +02:00
Glowbal
0c2c71e70e Merge pull request #2056 from MikeMatrix/codeCleanupSandbag
Code cleanup of Sandbag module
2015-08-09 23:56:25 +02:00