Glowbal
|
d0cb09196d
|
Merge branch 'master' of github.com:acemod/ACE3
|
2015-11-20 23:29:33 +01:00 |
|
Glowbal
|
67345b0178
|
Fix incorrect variable
_items was the old variable name.
|
2015-11-20 23:28:52 +01:00 |
|
PabstMirror
|
979ff8b479
|
Local -> private
|
2015-11-20 16:13:20 -06:00 |
|
PabstMirror
|
0f62168250
|
Merge pull request #2840 from acemod/fixOverpressure
Overpresure - Misc fixes
|
2015-11-20 15:38:24 -06:00 |
|
Thomas Kooi
|
801120fb39
|
Merge pull request #2841 from acemod/medicalAiBandage
Move bandage log before basic exit
|
2015-11-20 22:28:55 +01:00 |
|
Thomas Kooi
|
4a19fcc5a5
|
Merge pull request #2771 from BaerMitUmlaut/inWater-deprecation
inWater -> isUnderwater
|
2015-11-20 22:28:43 +01:00 |
|
Thomas Kooi
|
a652be8248
|
Merge pull request #2847 from BaerMitUmlaut/cleanup-moduleAmbianceSound
Cleanup ambient sounds module
|
2015-11-20 22:27:57 +01:00 |
|
PabstMirror
|
063042cb36
|
Merge pull request #2777 from acemod/interactionAnimationSetting
Interaction Menu Animation Setting And PreExpand First Level
|
2015-11-20 14:56:37 -06:00 |
|
PabstMirror
|
7b526a99a3
|
Cleanup
|
2015-11-20 14:53:16 -06:00 |
|
PabstMirror
|
f9a77a62ab
|
Merge pull request #2766 from acemod/settingsErrorChecking
Add Error Checking to Settings + MapGesture Settings
|
2015-11-20 14:51:31 -06:00 |
|
PabstMirror
|
c4117e1283
|
Merge branch 'master' into settingsErrorChecking
Conflicts:
addons/map_gestures/stringtable.xml
|
2015-11-20 14:37:23 -06:00 |
|
PabstMirror
|
dd7c71eeee
|
Merge pull request #2852 from acemod/updateMakepy
make.py - update for new mikros tools
|
2015-11-20 10:34:48 -06:00 |
|
PabstMirror
|
9a9029fa49
|
Merge pull request #2839 from acemod/abFixTwist
AB - Fix ACE_twistDirection
|
2015-11-20 10:32:28 -06:00 |
|
PabstMirror
|
cf9235c926
|
make.py - update for new mikros tools
|
2015-11-19 00:28:28 -06:00 |
|
SilentSpike
|
0110ada1b5
|
Fix zeus waypoint formation actions
|
2015-11-18 14:54:17 +00:00 |
|
bux578
|
3b2b7fd78d
|
Merge pull request #2821 from dudakov/master
Russian Translations - Update
|
2015-11-18 08:30:46 +01:00 |
|
PabstMirror
|
ebbf2b373a
|
goggles - prevent CBA PFEH warning
fix "x\cba\addons\common\fnc_removePerFrameHandler.sqf:30","WARNING:
Invalid or not existing PFH ID."
|
2015-11-17 23:44:50 -06:00 |
|
kaban
|
da16fc1038
|
\addons\captives\stringtable.xml - resolving conflicts.
|
2015-11-18 06:50:00 +03:00 |
|
kaban
|
f8481ae5f2
|
Merge branch 'master' of https://github.com/acemod/ACE3.git into develop
Conflicts:
addons/captives/stringtable.xml
|
2015-11-18 06:39:58 +03:00 |
|
PabstMirror
|
3ec9fca73e
|
local -> private
|
2015-11-17 14:06:12 -06:00 |
|
PabstMirror
|
75d80be143
|
Merge branch 'master' into interactionAnimationSetting
|
2015-11-17 14:05:31 -06:00 |
|
PabstMirror
|
5cbfe4f2a5
|
local -> private
|
2015-11-17 14:02:20 -06:00 |
|
PabstMirror
|
896615beb1
|
Merge pull request #2826 from acemod/settingsParamsArray
Read settings from paramsArray (params in description.ext)
|
2015-11-17 14:01:16 -06:00 |
|
PabstMirror
|
5823749f0c
|
Merge branch 'master' into settingsErrorChecking
|
2015-11-17 14:00:22 -06:00 |
|
commy2
|
a7b5945a12
|
Merge pull request #2849 from acemod/localtoprivate
replace local keyword with private
|
2015-11-17 19:37:38 +01:00 |
|
commy2
|
a57d1bca75
|
replace local keyword with private
|
2015-11-17 17:43:07 +01:00 |
|
commy2
|
b6f9a2b776
|
Merge pull request #2703 from jonpas/removeAdjustedProneOptics
Remove enable optics in adjusted prone stances
|
2015-11-17 16:24:27 +01:00 |
|
BaerMitUmlaut
|
e008f87fb8
|
Cleanup ambience sound module
|
2015-11-16 19:00:02 +01:00 |
|
bux578
|
bc09b50fa5
|
Merge pull request #2845 from ToasterBR/Translations04
Added PT-BR translations to Cargo
|
2015-11-14 19:29:56 +01:00 |
|
Jonathan Pereira
|
6ebd76ff2f
|
Added PT-BR translations to Cargo
|
2015-11-14 12:24:01 -02:00 |
|
Jonathan Pereira
|
42a42e8b7b
|
Merge remote-tracking branch 'refs/remotes/acemod/master' into Translations04
|
2015-11-14 12:20:59 -02:00 |
|
PabstMirror
|
c3e6990d00
|
#2528 (6) - Move bandage log before basic exit
In advanced medical without enableFor AI. Bandaging an AI would exit
before adding log.
|
2015-11-12 01:06:29 -06:00 |
|
PabstMirror
|
9b2c79e7e1
|
getDistance - use lineIntersectsSurfaces
|
2015-11-11 14:12:42 -06:00 |
|
PabstMirror
|
391bfc160a
|
Overpresure - Misc fixes
- Fix passing magazine/ammo to overpressure event
- Use AGL for nearEntities
- Fix getDistance returning nil
|
2015-11-11 13:24:27 -06:00 |
|
PabstMirror
|
9d2d5b9c7c
|
AdvanBalls - Fix ACE_twistDirection
|
2015-11-11 01:58:12 -06:00 |
|
PabstMirror
|
99852f2071
|
Merge pull request #2718 from acemod/rangeCards-scriptError
RangeCard / AB fixes
|
2015-11-10 21:02:16 -06:00 |
|
PabstMirror
|
4ff31771d3
|
DAGR - missing (
|
2015-11-10 20:51:00 -06:00 |
|
PabstMirror
|
e2e74e0f5d
|
DAGR - Fix degrees (° - seems to need UTF-8 BOM)
|
2015-11-10 16:17:22 -06:00 |
|
PabstMirror
|
830e7d9be4
|
Merge pull request #2278 from jokoho48/codeCleanUpDagr
Code cleanup of Dagr module
|
2015-11-10 16:15:12 -06:00 |
|
PabstMirror
|
716e82619b
|
Merge pull request #2738 from acemod/pySearchLocalPrivates
Local privates to search_privates.py
|
2015-11-10 10:16:24 -06:00 |
|
Thomas Kooi
|
d91ae9082e
|
Merge pull request #2628 from acemod/cargoClassnames
Add support for virtual cargo
|
2015-11-10 08:38:17 +01:00 |
|
Thomas Kooi
|
ec1187e79b
|
Merge pull request #2830 from acemod/mixedMedicalDisplay
Display basicMed wounds for AI in mixed mode
|
2015-11-10 08:33:21 +01:00 |
|
PabstMirror
|
28738517e8
|
Merge pull request #2829 from acemod/FlashlightProxyModel
Fix empty flashlightProxy model + Delete map glow lights from disconnecting players
|
2015-11-08 11:25:06 -06:00 |
|
PabstMirror
|
5b16638ae5
|
Always force param settings
|
2015-11-08 11:22:41 -06:00 |
|
PabstMirror
|
5a599816f6
|
Merge pull request #2831 from acemod/realName-ka60v22
RealisticNames - add ka-60 v2 (black and white)
|
2015-11-07 18:36:05 -06:00 |
|
PabstMirror
|
dad1388eec
|
RealisticNames - add ka-60 v2 (black and white)
|
2015-11-07 18:34:46 -06:00 |
|
[OMCB]kaban
|
2dd90824aa
|
Map Gestures translations update
|
2015-11-08 02:52:16 +03:00 |
|
PabstMirror
|
01d679c5dc
|
#2810 - Delete map glow light from DC players
|
2015-11-07 14:33:41 -06:00 |
|
PabstMirror
|
ff60cdcfa3
|
#2828 - Fix empty flashlightProxy model
|
2015-11-07 11:44:31 -06:00 |
|
[OMCB]kaban
|
34163b5e56
|
Nametags translations are rolled back
|
2015-11-07 19:54:48 +03:00 |
|