PabstMirror
30828b83d2
Stringtable fixes
2015-08-15 12:21:49 -05: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
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
Glowbal
f45e4748de
Merge pull request #2158 from jokoho48/codeCargoEnhancement
...
some Cargo Changes
2015-08-14 18:50:07 +02: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
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
