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 |
|
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 |
|
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 |
|
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 |
|
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 |
|