commy2
|
d9b90258bc
|
fix typeOf capitalization
|
2015-11-30 17:19:57 +01:00 |
|
commy2
|
34d351c652
|
fix exitWith capitalization
|
2015-11-30 17:14:05 +01:00 |
|
commy2
|
0b84bb514b
|
fix Cfg capitalization
|
2015-11-30 17:09:26 +01:00 |
|
commy2
|
dcf0a68b80
|
Revert "fix Cfg capitalization"
This reverts commit 43bda9c462.
|
2015-11-30 17:00:32 +01:00 |
|
commy2
|
43bda9c462
|
fix Cfg capitalization
|
2015-11-30 16:52:20 +01:00 |
|
commy2
|
ca9b909e75
|
fix CBA_fnc capitalization
|
2015-11-30 16:45:20 +01:00 |
|
commy2
|
3be60a2f6e
|
Merge pull request #2842 from acemod/fcsUpdateDisplay
Update FCS display after distance adjust
|
2015-11-23 16:34:09 +01:00 |
|
SilentSpike
|
f07f06c843
|
Merge pull request #2760 from acemod/spectatorUpdates
Spectator updates
|
2015-11-21 15:00:44 +00:00 |
|
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
|
f8e293d04d
|
Localise spectator hotkeys in help window
|
2015-11-18 15:18:21 +00:00 |
|
SilentSpike
|
0567d1c2a1
|
Fix spectator unit list key press handling
By setting maxHistroyDelay really high, the unit list shouldn't be messed with via key press very often.
|
2015-11-18 15:02:17 +00: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 |
|
SilentSpike
|
23e110d7ce
|
Remove depreciated spectator hotkey
|
2015-11-17 15:26:34 +00: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 |
|
SilentSpike
|
cf368f240f
|
Remove ear ringing upon spectator entry
Volume updating was disabled, however any existing ringing would persist. Setting the volume to 0 should make the hearing PFH stop playing sound.
|
2015-11-13 13:00:04 +00:00 |
|
PabstMirror
|
a621eaab24
|
#2750 - Update FCS display after distance adjust
|
2015-11-13 02:57:06 -06: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 |
|