c7f47c0b34
Replaced check for captive module by check for ACE_medical
2015-08-15 20:31:41 +02:00
30828b83d2
Stringtable fixes
2015-08-15 12:21:49 -05:00
d023139e8d
Stringtable fix
2015-08-15 12:04:57 -05:00
3d9b0d527c
fix indentation
...
atom needed the editorconfig package
2015-08-15 18:58:31 +02:00
675cfc2da7
after respawn select last weapon, muzzle and mode
...
#2138
2015-08-15 18:54:39 +02:00
4d8a9ae890
Merge branch 'master' into virtualExplosivesPlace
2015-08-15 11:40:06 -05:00
ed66255b19
Add objects to all curators
2015-08-15 18:39:43 +02:00
0e57d3d97c
Added assign medic, medicalfacility and medical vehicle curator modules
2015-08-15 18:25:48 +02:00
29b21b8f41
Merge pull request #275 from acemod/cargo
...
load things into vehicles
2015-08-15 17:36:44 +02:00
bac1a8fce4
Merge pull request #186 from acemod/repair
...
add repair PBO, fix #185
2015-08-15 17:36:31 +02:00
7246298cc5
Merge pull request #2161 from acemod/settingBroadcastLocal
...
Don't broadcast localization for settings
2015-08-15 17:34:42 +02:00
fe9751f725
Added category to settings
...
Fixed client setting attribute spelling mistake
2015-08-15 16:00:37 +02:00
d3aa6a7f6b
Added missing assign modules
2015-08-15 15:49:41 +02:00
c54081d677
Don't broadcast localization for settings
...
smaller `publicVariable`
2015-08-15 03:48:25 -05:00
317c73a80e
Added Land_PaperBox_closed_F
...
fixed initOBject
2015-08-15 10:22:44 +02:00
660d048670
Options Menu - Fix Colors when category selected
2015-08-15 03:21:03 -05:00
a2897e6d32
Merge branch 'master' into cargo
2015-08-15 03:11:19 -05:00
ea2dc46d59
1.50 realisticnames - ubc
2015-08-15 02:56:34 -05:00
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
d8084e20d7
Added cargo settings and settings module.
2015-08-15 09:50:00 +02:00
c35fc35eb3
Captive FFV stuff
2015-08-14 21:29:01 -05:00
7c276d9d25
Grenade Cleanup
2015-08-14 20:25:27 -05:00
e160a62599
Merge pull request #2145 from jokoho48/codeCleanupGrenades
...
Code cleanup of Grenades module
2015-08-14 20:18:30 -05:00
b9db03de20
Fix count problems
2015-08-14 20:13:41 -05:00
e3a31687a8
Merge pull request #2084 from jokoho48/codeCleanupDisarming
...
Code cleanup of Disarming module
2015-08-14 20:01:23 -05:00
253fb6e66a
Merge pull request #1986 from acemod/addMainAction
...
Always make sure ACE_MainActions exists
2015-08-14 19:48:04 -05:00
f9b3cbc02a
Merge pull request #1956 from SzwedzikPL/laser_default_keybinds
...
default laser code down keybind fix
2015-08-14 19:36:02 -05:00
6932014b9d
Merge pull request #1993 from acemod/fixMapCompassChange
...
Fix ace_map changes to compass display object
2015-08-14 19:34:09 -05:00
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
13abee2612
Merge pull request #2106 from acemod/optionMenuFiltering
...
Option Menu Fixes for categories
2015-08-14 19:31:17 -05:00
21400b0174
UBC, privates, LSTRING
2015-08-14 15:46:51 -05:00
2be74dfdca
Privates
2015-08-14 15:14:36 -05:00
2062f5dcb6
fixed incorrect variable name
2015-08-14 22:07:49 +02:00
96ec435d0d
Added load in cargo containers
2015-08-14 22:01:14 +02:00
55ad706761
fixed car check - invalid variable name
2015-08-14 22:00:55 +02:00
066a78d9aa
Fix var
2015-08-14 14:36:54 -05:00
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
ef5a3d69f5
Merge pull request #2148 from acemod/nameTagFixes
...
nametag cleanup and fix cursortarget distance
2015-08-14 12:58:02 -05:00
09296e42a0
Merge pull request #2143 from acemod/removeBreifingPFEH-hack
...
Remove PFEH hack
2015-08-14 12:50:35 -05:00
c3f6ee7141
Merge pull request #2140 from acemod/addActionParamChecking
...
AddAction basic param checking
2015-08-14 10:48:07 -07:00
f45e4748de
Merge pull request #2158 from jokoho48/codeCargoEnhancement
...
some Cargo Changes
2015-08-14 18:50:07 +02:00
ec5a1f038a
fix Typo issue
2015-08-14 18:42:22 +02:00
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
8e7e9b9ee3
Fix Typo
2015-08-14 14:57:29 +02:00
eaae6dfb7d
Replaced padding chain with params defaults
2015-08-14 11:43:36 +02:00
2bbf631e71
Fixed missing semi-colon in safemode.
2015-08-14 11:39:22 +02:00
bd56d1bb83
ok that is my fault
2015-08-14 00:36:36 +02:00
cb8d009ef0
Woops
2015-08-14 00:31:42 +02:00
28ac2fbec6
Merge pull request #2147 from jokoho48/codeCleanUpHitReaction
...
Code cleanup of HitReaction module
2015-08-13 17:11:19 -05:00
d62f00146e
Comment CleanUp
2015-08-14 00:02:19 +02:00