commy2
0dc13276df
change default value to true
2016-08-13 12:13:49 +02:00
commy2
f0a74781c9
add setting to disable cook off effects
2016-08-13 12:12:34 +02:00
commy2
c42004449d
Port AGM cook off
2016-08-13 11:59:15 +02:00
commy2
9a93dffc3b
port A2 incendiary grenades
2016-08-13 11:49:36 +02:00
Broström.A | Evul
0dfee34a56
Added additional cargo and dragging for crates ( #4129 )
...
* Added Cargo and Dragging for `Land_WoodenBox_F` and `Land_WoodenCrate_01_F`.
2016-08-13 11:33:41 +02:00
PabstMirror
f354bab3c2
Add Tripflare ( #4152 )
2016-08-13 11:29:01 +02:00
[OMCB]kaban
8fc2cbd0ef
Russian Translations - Update ( #4217 )
2016-08-13 11:25:43 +02:00
jonpas
5985f3bd26
Fix missing zeroing UI on vehicles without FCS
2016-08-11 22:34:38 +02:00
PabstMirror
a2da54bfec
Fix javelin fire block not being removed ( #4228 )
2016-08-11 13:30:28 -05:00
PabstMirror
f12feae7fe
Fix some efuncs
2016-08-09 12:47:59 -05:00
PabstMirror
011c6a0d00
Fix merge conficlts
2016-08-09 12:14:30 -05:00
PabstMirror
6c63d3c23a
Merge branch 'master' into medical-rewrite
2016-08-09 12:11:30 -05:00
commy2
5e40c24985
Merge pull request #4185 from acemod/cleanup-deprecated
...
remove deprecated functions
2016-08-09 18:34:43 +02:00
commy2
c2da1b4980
Merge pull request #4225 from acemod/fix-missing-magazine-mass
...
Fix wrong config path in FUNC(calculateMass)
2016-08-09 18:30:04 +02:00
commy2
9228bb9349
manual merge
2016-08-09 18:28:42 +02:00
jonpas
e909901100
Merge pull request #4226 from acemod/fixTagString
...
Fix tagging cstring
2016-08-09 18:27:00 +02:00
commy2
36e78e0722
Merge pull request #4171 from acemod/cleanup-hash
...
deprecate ACE hash functions in favor of CBA versions
2016-08-09 18:25:01 +02:00
commy2
83f32ebc29
Merge pull request #4170 from acemod/cleanup-missionSQM
...
remove some broken functions
2016-08-09 18:24:52 +02:00
commy2
439a85924c
Merge pull request #4188 from acemod/cba-hash-synchedEvent
...
Convert common to CBA hashes
2016-08-09 18:24:27 +02:00
commy2
7000414df4
Fix wrong config path in FUNC(calculateMass)
2016-08-09 18:20:25 +02:00
PabstMirror
8e10bf5eef
Fix tagging cstring
2016-08-09 11:18:52 -05:00
jonpas
51450b86fb
Add dogtags $, Improve function headers
2016-08-09 01:15:59 +02:00
jonpas
91128729ba
Improve stringRemoveWhitespace function header
2016-08-08 23:08:39 +02:00
jonpas
c6f3627c70
Merge pull request #4146 from acemod/taggingFramework
...
Tagging Framework and Improvements
2016-08-08 23:04:28 +02:00
freghar
769ca7e835
lower wirecutter item mass ( #4209 )
...
The current mass makes it take a LOT of inventory space (~half of
an assault pack) which makes it impractical to carry around as a tool.
Signed-off-by: freghar <freghcz@gmail.com>
2016-08-08 15:18:51 -05:00
PabstMirror
c46b2d09cf
Heal hitpoint after bandage sets bodyPartStatus
2016-08-07 13:58:09 -05:00
Mark Ruffner
ff297e307b
Fix the captive module from creating attributes when not needed ( #4213 )
...
* Fix default values
Fix default values, so we don't get two custom attributes per unit, even when the unit is not handcuffed/surrendered
* Add parentheses to avoid conversion
2016-08-07 12:50:58 -05:00
PabstMirror
919c8469de
Add interaction action on demand ( #4079 )
...
* Only use addActionEventHandler when needed
-Only install addActionEventHandler when the interaction menu is
actually open
-Less SQF running each frame,
-it should help with issue #4066
* Cleanup debug
2016-08-05 12:05:15 -05:00
PabstMirror
dc7ac4c42c
Fix static weapons not being loadable in cargo ( #4205 )
...
- Fix #4165
2016-08-05 12:03:45 -05:00
PabstMirror
6f22df40b6
dragging - Don't run animChanged event on all units
...
Also Fix CBA_fnc_addPlayerEventHandler
2016-08-03 15:35:10 -05:00
PabstMirror
afe3e5ccd3
Fix repair cargo not added to zeus created objects ( #4201 )
...
- Fix #4200 (add delay for units created via zeus)
- Use ace_settingsInitialized to add events
2016-08-03 13:44:04 -05:00
PabstMirror
82cf18575c
Minor tweaks to medical
...
- decrease needed blood loss on selection to turn icon red. (Largest
wound bleedingRate is only 0.1)
- Don't print warning for basic medical bandage not having sub configs
2016-08-03 13:14:12 -05:00
PabstMirror
be3afe6eb3
Increase defuse range for underwater mines ( #4195 )
...
Fix #4144
- Adds a 2nd defuse helper with increased range
2016-08-02 18:29:31 -05:00
PabstMirror
787a57c12b
Fix track repair selection placement
2016-08-01 21:19:48 -05:00
PabstMirror
02c308e141
Use createSimpleObject for medical litter
2016-08-01 16:20:13 -05:00
PabstMirror
a2f391cd59
Convert finger to CBA hashes ( #4183 )
2016-07-30 12:28:07 -05:00
commy2
8a8bc6a336
remove hitpoint config from medical-main component
2016-07-30 17:23:08 +02:00
commy2
46adfe1150
convert map-gestures to cba hashes ( #4187 )
2016-07-30 17:17:52 +02:00
commy2
1f6b10c4cb
convert laser to cba hashes ( #4186 )
2016-07-30 17:16:29 +02:00
commy2
f793a0d8d1
merge medical engine component into medical rewrite branch
2016-07-30 14:00:42 +02:00
commy2
9a468c4068
add explosive devices to missing units, close #4181
2016-07-30 13:15:45 +02:00
commy2
b059217f4d
fix-inverted-logic
2016-07-30 12:35:10 +02:00
commy2
5a1b33a5da
convert common to cba hashes
2016-07-30 12:28:06 +02:00
commy2
1ffe3131e3
remove deprecated functions
2016-07-30 11:16:19 +02:00
commy2
c9a8e0a892
deprecate ACE hash functions in favor of CBA versions
2016-07-30 10:54:01 +02:00
Glowbal
a2a8f53157
Merge pull request #4155 from acemod/firedEHCleanup
...
Minor cleanup of fired EH listeners
2016-07-28 23:49:01 +02:00
Glowbal
35c7de2fb0
Merge pull request #4172 from acemod/log-file-and-linenumbers
...
log file and line numbers for warnings/errors/debug msgs
2016-07-28 23:47:21 +02:00
Glowbal
d9112fb07e
Merge pull request #4175 from acemod/remove-obsolete-pickup-fix
...
reenable pickup action, because related bug has been fixed
2016-07-28 23:47:07 +02:00
Glowbal
66a741a9c3
Merge pull request #4169 from acemod/cleanup-sort
...
deprecate sort function
2016-07-26 23:24:52 +02:00
commy2
4f77adaa0c
Merge pull request #4137 from 654wak654/master
...
Use GVAR Macro Where Applicable
2016-07-26 19:15:00 +02:00
commy2
5711a863c6
reenable pickup action, because related bug has been fixed
2016-07-26 19:07:31 +02:00
commy2
755f6bcc6b
Make hearing component compatible with glasses
2016-07-26 16:14:16 +02:00
PabstMirror
fa7d0df2df
Improve creation time of house actions dummy ( #4159 )
2016-07-26 00:03:29 -05:00
commy2
6507acdbab
optional pbo to disable cross hair
2016-07-25 21:00:27 +02:00
commy2
0c073448dc
log file and line numbers for warnings/errors/debug msgs
2016-07-25 20:39:30 +02:00
commy2
37d4a4a0c3
deprecate sort function
2016-07-25 20:00:41 +02:00
commy2
63b41843fc
remove some broken functions
2016-07-25 19:43:42 +02:00
jonpas
541349efef
Fix refuel not respecting time acceleration and pause ( #4140 )
...
* Fix refuel not respecting time acceleration and pause
* Make lastTickMissionTime local
2016-07-24 20:11:35 +02:00
jonpas
e3a70c6d3b
Add Tagging module icon
2016-07-24 20:08:53 +02:00
jonpas
4b8f203f9b
Add quick tag keybind and setting
2016-07-24 20:00:33 +02:00
PabstMirror
455f65947a
Minor cleanup of fired EH listeners
2016-07-23 23:08:40 -05:00
PabstMirror
9cc0e64b46
Fix spectator map click not changing cam pos
...
Fix #3842
PFEH FUNC(handleCamera) will set camera position using GVAR(camPos)
2016-07-23 14:07:03 -05:00
jonpas
9b4f565cc5
Split cache and EH to functions
2016-07-23 15:52:20 +02:00
jonpas
c5edc00ee9
Add Tagging framework and improvements
2016-07-23 15:09:13 +02:00
PabstMirror
fa176bdea7
Change macro for pboProject ( #4120 )
2016-07-21 20:08:29 -05:00
PabstMirror
399404024c
Don't frag for some shells that end in water ( #4136 )
...
shotbullet, shotShell don't seem to explode when touching water, so
don't create frags
Fix #4134
2016-07-21 20:08:11 -05:00
PabstMirror
7239f3e88c
Fix terrain LOS check for vehicles with low getPos ( #4130 )
...
Fix #4126
2016-07-21 20:07:54 -05:00
Ozan Eğitmen
8f80cd59c8
Use GVAR where applicable
2016-07-20 07:15:18 +03:00
SilentSpike
fed71b00e8
Merge pull request #4089 from acemod/dogtagSSN
...
Improve SSN hash
2016-07-15 22:59:41 +01:00
Glowbal
131ef576b4
Add medical treatments and configuration
2016-07-15 12:23:47 +02:00
Glowbal
62f84efb9b
Add medical menu
2016-07-15 12:23:26 +02:00
Glowbal
ddb4ef42f3
Add stringtables and items
2016-07-15 12:21:56 +02:00
Glowbal
e4c36d9fa0
Change injuries include to ACE_Medical_Injuries
2016-07-15 12:10:18 +02:00
Glowbal
565da090bc
Add missing bracket
2016-07-15 11:53:57 +02:00
Glowbal
ab2075c328
Merge branch 'master' into medical-rewrite
...
Conflicts:
addons/medical/CfgEden.hpp
addons/medical/functions/fnc_reviveStateLoop.sqf
addons/medical/functions/fnc_serverRemoveBody.sqf
addons/medical/functions/fnc_unconsciousPFH.sqf
2016-07-15 11:50:58 +02:00
Glowbal
c8a54fd090
Merge branch 'release'
2016-07-15 02:03:42 +02:00
PabstMirror
1213c08e4b
Fix cached call events
2016-07-14 13:06:45 -05:00
bux578
630ab70982
Merge branch 'release' into cut-ropes-keybind
2016-07-14 15:30:38 +02:00
bux578
51bdf32f9f
Merge branch 'release' into microdagr-zero-fixes
2016-07-14 15:25:25 +02:00
ColdEvul
492f075ac8
Added fixed name for Weapon_SMG_05_F
(MP5K) for EDEN item.
2016-07-14 15:18:29 +02:00
ColdEvul
43c1c89cc1
Made new APEX crates draggable
2016-07-14 15:12:54 +02:00
Glowbal
2f2c4b91a1
3.6.2
2016-07-14 14:51:46 +02:00
BaerMitUmlaut
21f1329762
Added keybind to cut ropes
2016-07-14 08:13:52 +02:00
BaerMitUmlaut
40d460b1b6
Fixed MicroDAGR trailing zero
2016-07-14 03:32:30 +02:00
Glowbal
10b7e5d270
Merge pull request #4107 from acemod/fixMainMenuAceOptionsPlacement
...
Fix MainMenu Ace_Options Placement to top left
2016-07-14 01:39:18 +02:00
Glowbal
11a72431c2
Merge pull request #4099 from acemod/FixMinigunMags
...
Add missing vanilla magazines to LMG_Minigun
2016-07-14 01:38:58 +02:00
Glowbal
078647c403
Merge pull request #4097 from acemod/fixApex3denLayout-cherry-pick
...
Fix 3den attribute layout for 1.62, target release
2016-07-14 01:38:41 +02:00
Glowbal
9d14121a9e
Merge pull request #4096 from acemod/func-dogesture
...
use a function to do gestures
2016-07-14 01:38:18 +02:00
PabstMirror
13e182a7a9
Fix MainMenu Ace_Options Placement to top left
...
Stick ace_options button placement to top left
so it doesn't interfere with apex singleplayer menu
2016-07-13 13:49:05 -05:00
commy2
cc76ac482a
add priority parameter to doGesture
2016-07-13 11:00:31 +02:00
commy2
404d5b49b4
add function to read vanilla keybinds
2016-07-13 10:40:28 +02:00
PabstMirror
981dc874a4
Add missing vanilla magazines to LMG_Minigun
...
Fix #4098
Missing:
"500Rnd_65x39_Belt"
"500Rnd_65x39_Belt_Tracer_Red_Splash"
"500Rnd_65x39_Belt_Tracer_Green_Splash"
"500Rnd_65x39_Belt_Tracer_Yellow_Splash"
2016-07-12 13:17:29 -05:00
PabstMirror
0281bc8f3d
Fix 3den attribute layout for 1.62
2016-07-12 17:54:16 +02:00
commy2
ce72bfd07a
replace tabs with spaces
2016-07-12 16:28:36 +02:00
PabstMirror
a0aea441b4
Fix reload mutex with binocs or mounted
...
Fix #4088
2016-07-12 16:22:27 +02:00
commy2
8a4514f8e7
use a function to do gestures
2016-07-12 16:16:01 +02:00
jonpas
845dca9ea5
Add description and example to blur screen function
2016-07-12 16:13:53 +02:00
Glowbal
96a08dfc01
Merge pull request #3923 from voiperr/grenadesounds
...
Grenade + Chemlight Sounds
2016-07-12 13:37:40 +02:00
Glowbal
02fea363b6
Merge pull request #3940 from acemod/particles
...
Custom smoke particles
2016-07-12 13:36:36 +02:00
Glowbal
ee8e03a1ae
Merge pull request #3916 from acemod/merge-basic-and-advanced
...
Merge basic and advanced injury systems
2016-07-12 13:36:02 +02:00
PabstMirror
89992a9710
Improve SSN hash
2016-07-11 21:30:04 -05:00
Glowbal
0e740f00c3
Merge branch 'release'
2016-07-11 23:42:03 +02:00
Glowbal
de612d9613
Merge branch 'apex' into release
2016-07-11 20:59:34 +02:00
Glowbal
8e3ad9a032
Merge pull request #4083 from acemod/required-addons-apex-cherry-pick
...
Required addons for APEX
2016-07-11 20:58:50 +02:00
Glowbal
0869cf96bd
required arma3 version 1.62. closes #4081
2016-07-11 19:27:40 +02:00
Glowbal
d0c30577af
Remove usage of setUnconscious
2016-07-11 19:18:40 +02:00
Glowbal
86c67d9e33
Merge branch 'apex' into release
2016-07-11 19:04:53 +02:00
commy2
17f848fba9
Merge pull request #4063 from acemod/gunbag-assault-rifles-cherry-pick
...
enable gunbag for all non-machinegun primary weapons
2016-07-11 17:40:53 +02:00
commy2
25a3405d1f
required addons apex, close #4020
2016-07-11 12:01:47 +02:00
Glowbal
dbac1c6398
Merge branch 'apex' into release
2016-07-11 11:16:50 +02:00
Glowbal
02f08939f2
Merge pull request #4052 from acemod/fix4049
...
Mine detector optimization and cleanup
2016-07-11 11:16:16 +02:00
Glowbal
9b85bc3e29
v3.6.1
2016-07-11 11:15:36 +02:00
PabstMirror
74da791610
Proper fix for naval mines
2016-07-10 17:29:19 -05:00
PabstMirror
721bc205ef
Allow defusing naval mines
...
Fix #4074
- Workaround for naval mines not working with deactivate
- Add "isNotSwimming" exception to defuse progress bar
2016-07-10 13:49:06 -05:00
esteldunedain
9323314da5
Merge branch 'fix4049' of github.com:KoffeinFlummi/ACE3 into fix4049
2016-07-09 20:04:20 -03:00
esteldunedain
165bd4b3f8
Make volume consistent
2016-07-09 20:00:53 -03:00
commy2
d249132864
Merge pull request #4062 from acemod/disable-interaction-menu-while-reloading
...
Add reload mutex as canInteractWith condition
2016-07-09 21:03:55 +02:00
PabstMirror
3ac1525a3d
Add base icon
2016-07-09 12:11:58 -05:00
jonpas
55c7b9bfc4
Merge pull request #3997 from acemod/gogglesEffectsSetting
...
Add goggle setting for level of effects
2016-07-09 18:48:22 +02:00
jonpas
d9d2302ab8
Merge pull request #4069 from acemod/addAsianStrings
...
Add Korean and Japanese strings to tracker
2016-07-09 18:20:16 +02:00
jonpas
317c36e85c
Merge pull request #4061 from acemod/removegtgt
...
Remove remaining >> signs from interaction menu
2016-07-09 18:17:39 +02:00
BaerMitUmlaut
0a46a83e02
Realistic names for APEX content ( #4055 )
...
* Added realistic names for APEX content
* Fix strings
* Lowercase Polish colors
2016-07-09 18:14:08 +02:00
Glowbal
f86d8d113c
Merge branch 'release'
2016-07-09 11:36:49 +02:00
PabstMirror
ef38144d70
Merge pull request #4051 from acemod/simplifyNews
...
Make ace news fit apex menu style
2016-07-08 15:46:54 -05:00
jonpas
1185375c90
Add Korean and Japanese strings to tracker
2016-07-08 20:00:12 +02:00
commy2
c55c0d5666
only use one waitUntilAndExecute at any time for reload mutex
2016-07-08 15:12:47 +02:00
esteldunedain
071201ea46
Remove the pistol cursor from the mine detector
2016-07-07 19:03:14 -03:00
jonpas
0220b57609
Remove redundant getMagazineIndex compatibility function
2016-07-07 20:16:03 +02:00
esteldunedain
2a36fec793
Make the detector AI compatible
2016-07-07 12:38:53 -03:00
Glowbal
da661afe9b
Improve syntax
2016-07-07 17:22:08 +02:00
commy2
be17b72cad
remove old 'gestures' reload mutex
2016-07-07 16:38:24 +02:00
commy2
6569de5332
add event handler for reload mutex
2016-07-07 16:35:07 +02:00
esteldunedain
6160fe076d
Add an event when a mine is detected to allow hooking into missions
2016-07-07 11:17:57 -03:00
esteldunedain
244bdb093d
Add clicks when activating/deactivating the detector
2016-07-07 11:17:09 -03:00
esteldunedain
7a25c53dd3
Switch say2D to playSound
2016-07-07 10:51:34 -03:00
commy2
2a84865302
add event handler for reload mutex
2016-07-07 15:47:37 +02:00
Glowbal
7157fcf420
Clean up unconscious and revive states
2016-07-07 12:57:21 +02:00
Glowbal
2daee60d0c
Add handle revive and Unconscious states
2016-07-07 12:04:26 +02:00
Glowbal
d0236a007a
Work done on medical states
2016-07-07 11:46:55 +02:00
commy2
bf7fde0d65
enable gunbag for all non-machinegun primary weapons
2016-07-07 09:47:02 +02:00
commy2
e39017e27a
add reload mut ex as canInteractWith condition
2016-07-07 09:10:14 +02:00
esteldunedain
893866ff39
Remove >> signs from interaction menu
2016-07-06 22:38:03 -03:00
esteldunedain
ce0da11aed
Clip sound duration to below 0.5 s to avoid it stacking into itself when using say
2016-07-06 22:23:34 -03:00
esteldunedain
f73b6b1aad
- Restore the config of detector sounds through CfgSounds
...
- Add the possibility of switching between headphones or speaker
- Move detector actions to their own submenu
2016-07-06 22:14:26 -03:00
esteldunedain
34654fffb7
Add function to allow using playSound3D on CfgSounds classes
2016-07-06 21:31:06 -03:00
PabstMirror
5362a80911
Tweak spotting scope anims / mem points
2016-07-06 16:55:54 -05:00
PabstMirror
450b8dfedb
Fix order of revive loop
...
Fix #4035
Revive loop was killing heartrate before it exited
2016-07-06 00:54:51 -05:00
PabstMirror
4047c44b64
Merge pull request #4047 from acemod/cleanupRefuel
...
Refuel - Simplify Actions, Fix Van_01 config
2016-07-05 20:59:49 -05:00
PabstMirror
022e7747b1
Fix no attack profile on static titan launcher ( #4023 )
2016-07-05 20:58:32 -05:00
jonpas
005f17131a
Add Squad Radar UI setting
2016-07-05 23:06:44 +02:00
jonpas
bd2a063861
Fix pboProject false/true becoming 0/1 in UI config, Default ammoCount to off ( #4041 )
2016-07-05 23:01:25 +02:00
PabstMirror
6c732bf789
Fix action name, put actions on base class
2016-07-05 00:22:47 -05:00
esteldunedain
30532983a1
Improve the positioning of the detector point
2016-07-04 19:32:40 -03:00
esteldunedain
e26eda3ac2
- Optimize getDetectedObject
...
- Cache detected mines for 0.15 s
- Call detectorLoop every 0.05 s instead of 0.01s
- Compile a dictionary of detectable classnames from config at start
- Switch to playSound3d for global effect
- Remove dummy
- Change config entries to support playSound3d
- Cache getDetectorConfig for better interaction menu performance
- Change sound to mono wss
- Close #4049
2016-07-04 19:04:58 -03:00
PabstMirror
8a572ace41
Make ace news fit apex menu style
2016-07-04 15:31:25 -05:00
PabstMirror
e40415b628
Add #undef for PREP w/ DISABLE_COMPILE_CACHE
2016-07-04 01:17:30 -05:00
Glowbal
1922cac79e
fix spelling of arguments
2016-07-03 23:22:31 +02:00
PabstMirror
ea140f63a5
Refuel - Simplify Actions, Fix Van_01 config
2016-07-03 15:17:00 -05:00
Nicolás Badano
08c4731a3a
Merge pull request #4045 from acemod/fixOverheatingBarrels
...
Fix overheating spare barrels
2016-07-03 21:11:13 +02:00
commy2
a5b88d3276
Merge pull request #4034 from acemod/dragKeybind
...
Add Drag/Drop Keybind
2016-07-03 20:43:06 +02:00
commy2
0a5a4d2d33
Fix German word order / capitalization
2016-07-03 20:42:43 +02:00
PabstMirror
5ad1f752ca
Fix overheating spare barrels
...
- Remove ACE_SpareBarrel from CfgWeapons as it is now a magazine
- Don't call updateTemperature in displayTemp, as unit may not be local
- Fix targetEvent error
2016-07-03 12:58:40 -05:00
PabstMirror
82f63b5935
Update showHud func for 1.62 (squad radar)
2016-07-03 12:17:42 -05:00
PabstMirror
bbc708e3e0
Less aggressive overlap detection
...
Ensure the 2d screen pos distance is significant.
2016-07-02 22:46:36 -05:00
Glowbal
e8eb729e04
Merge medical core and medical state. Add working version of the state machine, re-add sounds
2016-07-02 16:34:28 +02:00
PabstMirror
d15330d245
Fix cargo event name - spare parts not being added
2016-07-01 23:14:20 -05:00
PabstMirror
96efbaef53
Add Drag/Drop Keybind
2016-07-01 16:28:44 -05:00
Glowbal
2d330e36e0
Add initial medical state component
2016-06-30 23:43:25 +02:00
Glowbal
3aa88c80bf
Add first step in medical rewrite
...
Split up medical core and medical damage. Move out all other functionality
2016-06-30 17:33:29 +02:00
Glowbal
8b1b31fc8d
Merge branch 'apex' into medical-rewrite
2016-06-30 16:51:50 +02:00
Glowbal
8c331937d0
Merge branch 'merge-basic-and-advanced' into medical-split-treatment
...
Conflicts:
addons/medical/ACE_Medical_Treatments.hpp
addons/medical/config.cpp
addons/medical_treatment/functions/fnc_addToTriageCard.sqf
2016-06-30 11:41:03 +02:00
Glowbal
e3f96b6594
Merge branch 'master' into merge-basic-and-advanced
...
Conflicts:
addons/medical/XEH_postInit.sqf
addons/medical/functions/fnc_displayPatientInformation.sqf
2016-06-30 11:27:51 +02:00
Glowbal
cd08e00c71
Merge pull request #3962 from acemod/dogtags
...
Dogtags
2016-06-29 22:19:02 +02:00
Glowbal
a497690bbd
Merge branch 'master' into apex
2016-06-29 21:44:15 +02:00
Glowbal
eca5263df8
Merge pull request #3998 from acemod/apexUBC
...
Fix UBC for 1.62 Apex
2016-06-29 12:04:21 +02:00
Glowbal
806877492c
Merge pull request #3999 from acemod/fixApexWeapons
...
Fix ballisitics and huntir configs
2016-06-29 12:04:05 +02:00
PabstMirror
3ae8a494c4
Add javelin configs for new apex launchers
...
Fix #4007
2016-06-28 22:46:04 -05:00
commy2
ab2307996c
add possibility to overwrite a units faction for determining name tags
2016-06-28 23:43:34 +02:00
Glowbal
01c184b174
Merge pull request #4014 from acemod/apexTitanBandaid
...
Handle bad target when using apex titans
2016-06-28 22:01:12 +02:00
Glowbal
4251831e2e
Merge pull request #4009 from acemod/fixRearmEvents
...
Fix rearm events
2016-06-28 20:33:56 +02:00
BaerMitUmlaut
898217a533
Fixed popping and stray particles
2016-06-28 19:23:47 +02:00
PabstMirror
20376385ca
Fix #4007 - Handle bad target when using apex titans
2016-06-27 13:43:05 -05:00
Glowbal
1d66d46501
Fix damaged array not being overwritten.
...
This fixes an issue were injured body parts were displayed as blue instead of red. Happens when using advanced medical with AI running in basic mode.
2016-06-27 19:55:00 +02:00
Glowbal
419b525458
Fix incorrect macro syntax
...
Syntax caused pboProject to choke
2016-06-27 19:30:39 +02:00
Glowbal
a9f3c2f784
Merge pull request #4012 from acemod/fix-medical-config-typo
...
Fix incorrect values for bandage configuration
2016-06-27 19:07:34 +02:00
Glowbal
d7965233d9
Merge pull request #4010 from acemod/rearmHandleNil
...
rearm - Skip selectWeapon on nil
2016-06-27 19:05:37 +02:00
Glowbal
8809881a9e
Merge branch 'release' into fixRearmEvents
2016-06-27 19:04:32 +02:00
Glowbal
0844e311a5
Merge pull request #4008 from acemod/cleanupWaitAndExec
...
Switch EFUNC(common,waitAndExecute) to CBA
2016-06-27 19:03:24 +02:00
Glowbal
c287223a08
Fix incorrect values for bandage configuration
2016-06-27 19:01:33 +02:00
PabstMirror
8bd3332b0e
rearm - Skip selectWeapon on nil
...
Should fix #4006
2016-06-27 00:00:25 -05:00
PabstMirror
8ecd8a49cc
Fix rearm events
2016-06-26 23:37:23 -05:00
PabstMirror
10a19b59e7
Swich EFUNC(common,waitAndExecute) to CBA
2016-06-26 22:18:53 -05:00
esteldunedain
d6d6ed7674
Make it work properly and support ceilings
2016-06-26 20:17:51 -03:00
esteldunedain
18fd198d1e
If the surface is not horizontal create _v2 pointing upward instead of away
2016-06-26 20:02:14 -03:00
Glowbal
21c4efcbba
Merge pull request #4004 from acemod/custom-rank-icons-function
...
add function for custom rank icons displayed below nametags
2016-06-26 10:57:49 +02:00
Glowbal
2a46099063
Merge pull request #4003 from acemod/disable-auto-weather
...
Disable auto weather
2016-06-26 10:51:38 +02:00
Glowbal
badb3fa943
Merge branch 'release' into fingerCleanup
2016-06-26 10:49:54 +02:00
Glowbal
b84b532cfb
Merge pull request #4001 from acemod/renameEvents
...
Rename events
2016-06-26 10:47:39 +02:00
Glowbal
52f8def590
Merge pull request #3991 from acemod/uavFCS
...
Block FCS when controlling a UAV
2016-06-26 10:47:19 +02:00
PabstMirror
0ff0185359
Fix ballisitics and huntir configs
2016-06-25 21:57:42 -05:00
PabstMirror
ed0823e40f
Fix UBC for 1.62 Apex
2016-06-25 21:07:30 -05:00
PabstMirror
5108ffe20c
Add goggles setting for level of effects
...
Can chose between none, tint/colorCC/ and full dust/dirt/rain/rotorwash
2016-06-25 19:16:26 -05:00
PabstMirror
5a92aaeb28
Make dirt/dust effects less bright at night
...
Fix #1447
2016-06-25 19:02:07 -05:00
commy2
4a19f9b1af
update russian rank icons
2016-06-26 01:01:03 +02:00
commy2
4e0fb4d171
give the iranians their ranks back
2016-06-26 00:35:56 +02:00
commy2
9eba2fe940
add russian rank icons
2016-06-26 00:02:19 +02:00
commy2
1db1c41072
only disable auto-weather settings by default, but keep them toggleable
2016-06-25 21:46:24 +02:00
commy2
e88ecfc236
add function for custom rank icons displayed below nametags
2016-06-25 21:25:03 +02:00
esteldunedain
0160ee81a6
- ACE_Finger cleanup
...
- Allow pointing to nearby positions
2016-06-25 16:02:06 -03:00
commy2
3690519a7c
disable auto weather - bugging out ACE weather
2016-06-25 20:39:06 +02:00
Glowbal
f171ef8e16
Merge branch 'release' into fixLoadoutWhenNull
2016-06-25 12:25:23 +02:00
Glowbal
af61c2bc50
Remove unused parameter
...
Gear is no longer used and can be removed from fthe function parameters
2016-06-25 12:23:07 +02:00
Glowbal
5fef1ba384
Change use backpack command for backpack classname
...
Uses the backpack command to retrieve the classname of a unit's backpack instead of a select. Fixes incorrect index.
2016-06-25 12:03:44 +02:00
Glowbal
8f3907c03f
Merge branch 'release'
2016-06-25 11:43:49 +02:00
Glowbal
6e6929be4d
Merge pull request #3985 from acemod/fixLeadIndicatorForBluAA
...
Fix lead indicator for B_APC_Tracked_01_AA_F
2016-06-25 11:40:51 +02:00
Glowbal
fc876ce316
Merge pull request #3986 from acemod/fixSekerLos
...
missleGuidance - Fix seeker los check
2016-06-25 11:40:15 +02:00
PabstMirror
a18e46c1c9
missleGuidance - Fix seeker los check
...
Close #3374
Because func was undefined _losOkay was nil, so target leading was
always skipped.
2016-06-25 01:27:23 -05:00
J3aLeiNe
75396ce63e
Update fnc_getMapData.sqf
...
No Gitexit for Lingor. Stay with us Lingor ! :p
2016-06-25 08:21:21 +02:00
PabstMirror
5589ef2bb8
Fix Target lead indication for B_APC_Tracked_01_AA_F
2016-06-25 00:13:07 -05:00
PabstMirror
c3710cc7f9
Handle "loadout" changed event when player is null
2016-06-24 23:32:32 -05:00
PabstMirror
618d3a2e96
Block FCS when controlling a UAV
...
Fix doing FCS keyUp calculations/setVariable
when controlling a UAV while also in a turret with FCS enabled.
Normal rangefinder on the UAV will still work as FUNC(canUseRangefinder)
is still true
2016-06-24 16:53:13 -05:00
Glowbal
7f7671d5ca
Update required arma3 version
2016-06-24 20:58:45 +02:00
Glowbal
37c4351340
Increase required CBA version
2016-06-24 20:56:57 +02:00
J3aLeiNe
8e7282a46a
Add OFP maps by CWR2 team
...
- Add OFP maps by CWR2 team included in the last CUP terrains update
- Fix latitude according to the Bohemia Wiki
2016-06-24 19:47:44 +02:00
esteldunedain
28c41e0518
Rename cargo events:
...
- ace_cargoAddedByClass -> ace_cargoAdded
- ace_addCargoByClass -> ace_addCargo
2016-06-24 12:12:19 -03:00
esteldunedain
6f65155060
Rename the explosive orientations events again:
...
- ace_explosives_clientRequestOrientations -> ace_explosives_sendOrientations
- ace_explosives_serverSendOrientations -> ace_explosives_orientationsSent
2016-06-24 12:02:10 -03:00
esteldunedain
18f09b9310
Rename events:
...
- ace_addedHeartRateAdjustment -> ace_heartRateAdjustmentAdded
- ace_cargoAddedByClass -> ace_cargoByClassAdded
- ace_enteredCardiacArrest -> ace_cardiacArrestEntered
- ace_itemAddedToTriageCard -> ace_triageCardItemAdded
- ace_reload_linkedAmmo -> ace_reload_ammoLinked
- ace_reload_returnedAmmo -> ace_reload_ammoReturned
- ace_treatmentSuccess -> ace_treatmentSucceded
- ace_common_engineOn -> ace_common_setEngine
- ace_explosives_clientRequestOrientations -> ace_explosives_requestOrientations
- ace_explosives_serverSendOrientations -> ace_explosives_sendOrientations
- ace_interaction_lampTurnOff -> ace_interaction_setLampOff
- ace_interaction_lampTurnOn -> ace_interaction_setLampOn
- ace_overheating_spareBarrelsLoadCoolest -> ace_overheating_loadCoolestSpareBarrel
- ace_overheating_spareBarrelsSendTemperatureHint -> ace_overheating_sendSpareBarrelTemperatureHint
Close #3533
2016-06-24 10:45:13 -03:00
Nicolás Badano
6801954e1f
Merge pull request #3969 from acemod/dogtag-bodybag
...
Add dogtag actions to body bags
2016-06-22 21:35:00 -03:00
J3aLeiNe
6a92b43b1d
Update fnc_getMapData.sqf
...
Add maps and fix latitude :
- Kidal, latitude 18° (default latitude 0°)
- Governor´s Island, latitude 41° (default latitude -34°)
- Doung island (Unsung Mod), latitude 10° (default latitude -10°)
- Dakrong (Unsung Mod), latitude 16° (default latitude -16°)
- Pecher map, latitude 43° (default latitude -34°)
Remove obsolete Arma2 Lingor map
and fix my illiterate mistakes ...
2016-06-22 16:36:53 +02:00
commy2
08886f413c
change remaining ace events to CBA 'addPlayerEventHandler'
2016-06-22 11:16:55 +02:00
commy2
047ac8c3f2
Merge pull request #3973 from acemod/eventWrappers
...
Convert state checking to CBA playerEH
2016-06-22 10:53:47 +02:00
commy2
bd41260fa8
add a missing 'private'
2016-06-22 10:46:04 +02:00
PabstMirror
fad44e38a6
Convert state checking to CBA playerEH
2016-06-21 19:31:25 -05:00
commy2
89ecc81111
convert common events to CBA playerEvents
2016-06-22 01:39:20 +02:00
SilentSpike
6d8121b544
Improve unit name SSN generation
...
Names shorter than the required 9 characters are now reused until we have 9 characters - making for fully unique generation.
To keep things distributed as pleasantly as possible they're itterated over with a step of two - alternating between odd and even indexes every full loop.
Similarly, the slice of string used for names longer than 9 characters is now offset based on the length of the name.
2016-06-21 20:35:23 +01:00
SilentSpike
ebcf1687a7
Generate SSN of unit from their name
...
Similar to how we're handling blood types, uses the unit's name to generate a valid three/two/four format SSN.
For names less than 9 characters long this will currently generate a unique SSN only up to the length of the name and append valid digits as necessary.
2016-06-21 18:42:15 +01:00
PabstMirror
af6aaf6e7d
fix mine ubc
2016-06-21 12:24:31 -05:00
PabstMirror
3972504d4a
Add dogtag actions to body bags
2016-06-21 12:13:32 -05:00
Glowbal
284231fe21
3.6.0
2016-06-21 18:07:27 +02:00
Glowbal
e357ca3ca8
Merge pull request #3963 from acemod/fix_ace_requiring_patched_stock_classes
...
fix some rogue mission dependencies
2016-06-21 17:59:25 +02:00
Glowbal
ee58df9c34
bump minor version
2016-06-21 17:57:50 +02:00
esteldunedain
7f39748ff0
Tidy up text position to properly acommodate two line names
2016-06-20 17:42:21 -03:00
esteldunedain
7e3e101508
Nah, they don't
2016-06-20 17:37:37 -03:00
esteldunedain
171e6b278c
Merge branch 'dogtags_blood_type' of github.com:KoffeinFlummi/ACE3 into dogtags
...
# Conflicts:
# addons/dogtags/functions/fnc_getDogtagData.sqf
2016-06-20 17:19:35 -03:00
Nicolás Badano
09fd2c4895
Merge pull request #3965 from acemod/fixDogtagRespawn
...
Fix issue with dogtag respawn/setVariable
2016-06-20 17:17:02 -03:00
PabstMirror
578477eae6
Fix issue with dogtag respawn/setVariable
...
Store object instead of bool to indicate when dogtags have been taken
When object respawns, the the old object reference won't apply (defacto
reset)
2016-06-20 15:12:23 -05:00
esteldunedain
c47898a624
Parse the first portion of the uid
2016-06-20 17:04:30 -03:00
commy2
c88313221f
add function to report a blood type which is fixed to the units name
2016-06-20 21:50:00 +02:00
esteldunedain
88cf6aad98
Attempt on making blood type and service number unique for players
2016-06-20 16:45:34 -03:00
esteldunedain
6df82aad55
I can't believe it happened to me.
2016-06-20 16:12:40 -03:00
commy2
bf098ec70e
fix some rogue mission dependencies, fix #3954
2016-06-20 21:07:10 +02:00
PabstMirror
fe5dd3fe76
Cleanup some undefined functions and strings
2016-06-20 13:58:37 -05:00
esteldunedain
0d30bf1de8
- Add random service number and bloodtypes to all units.
...
- Leave up to CBA to decide if events should be local or remote
- Imp
2016-06-20 15:51:36 -03:00
esteldunedain
e58d829927
Restyle the dog tag text.
2016-06-20 14:54:16 -03:00
commy2
3fdc0dd521
Merge pull request #3955 from acemod/add_name
...
add 'name' to components
2016-06-20 19:25:58 +02:00
esteldunedain
1f74bfca17
Merge branch 'dogtags' of https://github.com/SzwedzikPL/ACE3 into SzwedzikPL-dogtags
2016-06-20 12:46:49 -03:00
Glowbal
38df85bccc
Merge pull request #3958 from acemod/fix3950
...
Fix freeing prisoners after they've switched locality
2016-06-20 17:21:11 +02:00
commy2
750efbfdd8
fix spelling "Name Tags"
2016-06-20 12:34:30 +02:00
commy2
2249ef5e1c
fix spelling "Laser Pointer"
2016-06-20 12:34:03 +02:00
commy2
ae5fe8af3c
fix spelling "Wire Cutter"
2016-06-20 12:33:10 +02:00
BaerMitUmlaut
88b58216ee
Added beautified component names
2016-06-20 11:44:36 +02:00
Glowbal
e540134de1
Change component name to ACE3
2016-06-20 09:57:27 +02:00
Glowbal
afb9eb3084
Merge pull request #3342 from acemod/vehicleInteractionDistance
...
Uniformize interaction distance for vehicle based on bounding box
2016-06-20 09:55:55 +02:00
Glowbal
8549d4402e
Merge pull request #3919 from acemod/fixSpottingScopePlacement
...
Fix the placement of spotting scopes on slopes
2016-06-20 09:54:24 +02:00
Glowbal
dac7e54165
Merge pull request #3957 from acemod/fixComancheGuidance
...
Fix Comanche's weapon lock and guidance
2016-06-20 09:53:33 +02:00
esteldunedain
dc1c312288
Also handle the surrendering AnimChanged EH
2016-06-19 20:15:51 -03:00
esteldunedain
ac144ca248
Move the AnimChanged EH to its own function to avoid duplication
2016-06-19 19:30:36 -03:00
esteldunedain
8042b888d4
Close #3950
2016-06-19 19:17:49 -03:00
BaerMitUmlaut
f0e4e5d2e8
Tweaked particles, added macros, tweaked burn times
2016-06-19 23:48:23 +02:00
BaerMitUmlaut
58c061553c
Added readme and author
2016-06-19 23:46:41 +02:00
esteldunedain
394832ef40
Completely restore the Comanche's DAGRs to vanilla. Close #3671
2016-06-19 18:26:09 -03:00
Nicolás Badano
618d14555a
Merge pull request #3952 from alganthe/french_translation_update
...
French translation update
2016-06-19 10:18:47 -03:00
Josuan Albin
a04dec0c63
Update french translation
2016-06-19 15:16:43 +02:00
Josuan Albin
19da369887
Add back missing portuguese strings in inventory
2016-06-19 13:27:26 +02:00
commy2
c481ddedaf
add 'name' to components
2016-06-19 09:38:39 +02:00
Josuan Albin
d26f133733
Add missing french entries in stringtables and update older ones
...
Take changes from #3480 and completed empty entries
2016-06-19 01:18:12 +02:00
esteldunedain
cc9e5f4631
Add icons for mine detector actions. Close #3935
2016-06-18 20:05:14 -03:00
commy2
ddbdf116ab
Merge pull request #3949 from acemod/remove_unused_files
...
remove unused files
2016-06-18 20:17:42 +02:00
commy2
2d38ae62d2
remove another unused file
2016-06-18 20:12:17 +02:00
jonpas
ffd207dcf7
Merge pull request #3947 from acemod/fixCarrySitting
...
Fix ability to carry a chair someone is sitting on
2016-06-18 19:55:03 +02:00
commy2
9b6441b3c1
remove unused files
2016-06-18 19:54:39 +02:00
jonpas
2b56d0c0dd
Use claim system - fix possibility to carry while someone is sitting
2016-06-18 19:53:44 +02:00
SilentSpike
ca01f31b52
Improve zeus auto-add XEH behaviour
...
The XEH InitPost event only needs to be added if the `GVAR(autoAddObjects)` setting is enabled. This change will save on overhead when the setting is disabled and also removes some complexity from the function that runs in response to the event.
2016-06-18 15:41:13 +01:00
Josuan Albin
7c9dcf6bdb
Merge branch 'pr/3480'
...
Conflicts:
addons/advanced_ballistics/stringtable.xml
addons/cargo/stringtable.xml
addons/flashlights/stringtable.xml
addons/hearing/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/main/stringtable.xml
addons/map/stringtable.xml
2016-06-18 16:26:46 +02:00
Glowbal
74da8cc36c
Fix strange animation played when using PAK
...
Fixes #1695
2016-06-18 13:12:49 +02:00
Glowbal
f6b744e741
Merge pull request #3945 from acemod/fix-gray-screen-medical
...
Fix no gray screen for advanced medical
2016-06-18 11:59:14 +02:00
Glowbal
12a1f10a29
Merge pull request #3944 from acemod/funcHeaders
...
Cleanup Function Headers Titles
2016-06-18 11:57:43 +02:00
Glowbal
7dc76dee78
Fix no gray screen for advanced medical
...
Advanced medical was never displaying the gray screen on low blood volume. This is because for advanced medical, the blood volume minimum level is around 40 before death. For basic medical, this is 0.
2016-06-18 11:55:03 +02:00
jonpas
03e923aa68
Cleanup Function Headers titles
2016-06-18 11:50:41 +02:00
Githawk
0723df7dea
Replace execRemoteFnc with CBA events in rearm
2016-06-18 11:44:36 +02:00
jonpas
ed15d99915
Fix basic UI being overwritten on RscDiary unload ( #3920 )
...
* Display disabled message when basic config set by mission showHud
* Set showHud on RscDiary unload - fix #3907 , Remove redundant force parameter from basic setElements
* Log forced source to RPT
* Add source to scripted element setter
2016-06-18 11:32:56 +02:00
Glowbal
5d9def3874
Merge pull request #3927 from acemod/use-proper-undefs
...
Fix for MikeRo Tools strict requirement for #undef usage
2016-06-18 11:25:25 +02:00
voiper
d5b3b03c1c
Make flashlight on/off + glow a PVAR.
...
Clean up all privates.
Change glow proxies to not inherit from chemlight_base, to avoid ammo detection issues.
Make handleDisconnect glow deletion dedi server compatible (was only listen server compatible).
Clean up determineMapLight: faster when no chemlights nearby, a tad slower when chemlights nearby, however sources the colour settings directly from the chemlight's config.
2016-06-17 17:18:06 -07:00
Glowbal
4c2c647842
Fix change in behaviour of QFUNC
...
When using QFUNC, the intend most often is to have the name of the variable referencing the function as a string. This behaviour works when compiling without debug enabled. However if debug is enabled, QFUNC compiles in with the debug wrapper, becoming a code string instead of a string representation of a variable reference.
A good example where this change of behaviour can be a problem is config attributes that refer to a call back (used a lot within ACE). In normal build, you will use a getvar to get the relevant code, as it is expected to point to the function. When using debug, you will need to do a compile instead, as it's a string representing a code block.
2016-06-17 21:44:04 +02:00
BaerMitUmlaut
deb9e0d75c
Added custom smoke particles
2016-06-17 17:33:50 +02:00
Glowbal
a63f496bf6
Merge pull request #3936 from acemod/fixMineDetector
...
fix mine detector not picking up fused explosives
2016-06-17 09:17:49 +02:00
voiper
f28f90b624
Use isEqualTo.
2016-06-16 12:21:40 -07:00
bux578
04c9b628c4
exit the loop properly
2016-06-16 17:36:37 +02:00
bux578
2d029401f5
fix capitalization
2016-06-16 17:33:21 +02:00
bux578
5f52101b26
fix mine detector not picking up fused explosives
2016-06-16 17:20:15 +02:00
Glowbal
eedb406ae5
Merge pull request #3930 from acemod/wireCuttersLOS
...
Fix Line Of Sight check for wire cutter helper
2016-06-16 15:03:05 +02:00
Glowbal
fc241479fe
Merge pull request #3924 from voiperr/remove_attached_chemlights
...
On Detach, Delete Used Chemlights
2016-06-16 15:02:29 +02:00
Glowbal
66450ad36a
Merge pull request #3755 from acemod/add-mine-detector
...
Add mine detector port from ACE2
2016-06-16 14:59:35 +02:00
Glowbal
05aac2d223
Add store new helper object
...
Fixes an issue were you end up with many helper objects that are not cleaned up
2016-06-16 14:57:26 +02:00
voiper
3070b2ac6e
Sounds are sourced from configs.
...
Used impactGroundSoft[] as shortcut.
2016-06-15 18:16:28 -07:00
voiper
d4dfaeaf85
Capital L.
2016-06-15 16:31:05 -07:00
voiper
a20629066a
Further cleanup. Checked some privates.
2016-06-15 16:27:46 -07:00
voiper
2158d39e8a
Used QPATHTOF. Reverted config names.
...
Optimised fnc_getUnitFlashlights.
2016-06-15 14:58:07 -07:00
PabstMirror
81c8ea54c3
getVehPos - Tweak heli width, and put at eye level
2016-06-14 23:30:58 -05:00
PabstMirror
cfc046ce71
Fix Merge
2016-06-14 19:37:22 -05:00
PabstMirror
d46c596cc4
Merge remote-tracking branch 'refs/remotes/origin/master' into vehicleInteractionDistance
2016-06-14 19:36:45 -05:00
PabstMirror
2bcc82cea7
Fix Line Of Sight check for wire cutter helper
...
Fix #2976
2016-06-14 19:32:30 -05:00
ViperMaul
99d08d988a
Merge branch 'master' of https://github.com/acemod/ACE3 into use-proper-undefs
2016-06-14 08:27:47 -07:00
ViperMaul
d5750a6c40
Remove Tab
2016-06-14 08:12:29 -07:00
ViperMaul
b79a00d8d1
These 2 can be removed, since they are in CBA since 2.4.0 as Note from jonpas
2016-06-14 08:11:28 -07:00
voiper
01c335d13a
More cleanup + a bug fix.
2016-06-13 19:23:14 -07:00
voiper
69c3dd5cfb
Remove extra bracket.
2016-06-13 18:42:45 -07:00
voiper
c0e412211e
More realistic chemlight impact sounds.
2016-06-13 18:07:46 -07:00
voiper
b69aa8571e
Chemlights no longer re-add to inventory on remove.
...
Items are detached prior to being deleted, to avoid objNull attaches.
2016-06-13 18:06:05 -07:00
esteldunedain
a12d9dc2fb
Attempt aof fixing the placement of spotting scopes on slopes
2016-06-13 16:51:28 -03:00
commy2
11dc3bd71a
Merge pull request #3911 from acemod/gunbagCleanup
...
Gunbag cleanup
2016-06-13 20:39:46 +02:00
PabstMirror
a6766b611f
Always add finger keybind so it is changeable ( #3914 )
2016-06-13 12:14:35 -05:00
ViperMaul
2242f7c622
Fix for MikeRo Tools strict requirement for #undef usage
2016-06-13 09:20:09 -07:00
Glowbal
a8831a0d16
Change split medical in two components
...
- medical component is responsible for the injuries and common functionality
- medical_treatment component is responsible for offering treatment functionality
2016-06-13 17:00:56 +02:00
jonpas
6644a89fbf
More isModLoaded
2016-06-13 15:58:42 +02:00
Glowbal
295ad3b037
Merge branch 'medical-impr' into merge-basic-and-advanced
2016-06-13 14:32:15 +02:00
Glowbal
38cdd523f0
Clean up medical function private declares
2016-06-13 14:27:43 +02:00
Glowbal
fd108478fe
Clean up medical menu privates
2016-06-13 12:49:35 +02:00
Glowbal
58f43f8a51
Remove unneeded and deprecated functions from medical
2016-06-13 12:24:28 +02:00
Glowbal
d568041838
Change medical menu to work with basic medical injury overhaul
2016-06-13 12:19:19 +02:00
Glowbal
6657bde921
Change basic medical to use advanced medical injury system
2016-06-13 12:18:56 +02:00
Glowbal
792dbcd009
Change clean up privates in handleDamage code
2016-06-13 11:05:21 +02:00
Glowbal
8e59993d7a
Change clean up medical code
2016-06-13 10:55:19 +02:00
Glowbal
73bd684b65
Change formatting and private keywords in medical
2016-06-13 02:34:56 +02:00
Glowbal
3ba2396db7
Change minor clean up of handleUnitVitals
2016-06-13 02:11:21 +02:00
voiper
1ffd9d58ab
Revert postInit.
2016-06-12 15:39:16 -07:00
voiper
5a29c4b04c
Fix up weapon names.
2016-06-12 15:33:37 -07:00
voiper
f3fc99f3b8
Housekeeping of ace_flashlights and ace_map.
...
ace_map now handles flashlights independently of ace_flashlights.
ace_map searches for flashlight beam textures directly from weapon configs.
ace_map has acc_flashlight config (so vanilla ace_map will have at least one flashlight to use).
2016-06-12 15:31:11 -07:00
jonpas
b80b7e5265
Shorten more GVARs
2016-06-13 00:08:28 +02:00
jonpas
323555d9a4
Prefix model, Fix indentation of model.cfg, Remove redundant CLASSNAME macro
2016-06-13 00:03:33 +02:00
jonpas
b40915dd12
Cealnup quotes, capitalization, function headers
2016-06-12 23:56:00 +02:00
voiper
b45a17001c
Merge remote-tracking branch 'origin/master' into grenadesounds
2016-06-12 14:54:14 -07:00
Glowbal
f0b0b49f3c
Merge pull request #3908 from acemod/funBag
...
Only do gunbag things when target has a gunbag
2016-06-12 23:25:55 +02:00
Glowbal
43a2b0ea29
Merge pull request #3909 from acemod/fix-bandaging-configuration
...
Adjust bandage configuration
2016-06-12 23:25:16 +02:00
PabstMirror
1997cb5199
Add maxDam for medium velocity wounds
...
Ensures that velocity wounds from a major hit will use the "Large" type
of wound
2016-06-12 14:47:59 -05:00
Glowbal
fa1282406f
Change bandage configurations
...
- Field dressing is average treatment
- Packing bandage is average treatment, higher reopen change, longer reopening delay
- Elastic bandage is higher treatment, higher reopen change, shorter reopen delay
- QuikClot is lower treatment, lower reopen change, longer reopening delay
2016-06-12 20:40:45 +02:00
PabstMirror
e8a403a9ad
Only do gunbag things when target has a gunbag
2016-06-12 12:58:39 -05:00
VKing
d5f8d965f3
Change ace_time to cba_missionTime
2016-06-12 17:22:44 +02:00
VKing
6b62436cfb
Delete unused animation files
2016-06-12 16:29:00 +02:00
VKing
fe18107077
Fix cfgPatches entries
2016-06-12 16:28:42 +02:00
commy2
3c6de5ad6f
remove misc box from gunbag CfgPatches
2016-06-12 14:00:55 +02:00
commy2
000e4a68e6
gunbag improvements
2016-06-12 13:51:23 +02:00
VKing
7f3aacb4d6
Add mass to metal detectors
...
Based on values from the manufacturer's pamphlet (vallon.de)
2016-06-12 12:41:59 +02:00
commy2
7a0b9a1a16
Merge branch 'gunbag' of https://github.com/ir0n1e/ACE3 into ir0n1e-gunbag
2016-06-12 11:02:23 +02:00
commy2
7b49855e89
Merge pull request #3902 from acemod/tanoaWindDAta
...
Tanoa Weather Data
2016-06-12 10:26:56 +02:00
VKing
12130c8c3a
Add description string
2016-06-12 10:19:06 +02:00
VKing
3c85398d87
Clean up the sound config
2016-06-12 10:17:02 +02:00
commy2
813b584acf
Merge pull request #3900 from acemod/pipFlicker
...
Optics - Create PIP camera only when needed
2016-06-12 10:11:04 +02:00
PabstMirror
8aa5e53bdd
movement - Handle objNull in virtualMass
2016-06-12 02:01:49 -05:00
PabstMirror
5e3d4866a6
Prepare camera when optic equipped
2016-06-12 01:53:03 -05:00
bux578
a2124a6b45
add tanoa wind dir data, add comments
2016-06-12 07:30:38 +02:00
bux578
68e2531af3
Merge remote-tracking branch 'origin/master' into tanoaWindDAta
2016-06-12 07:01:14 +02:00
PabstMirror
d14392c35c
Optics - Create PIP camera only when needed
2016-06-11 23:08:55 -05:00
commy2
ec01ae0d0b
Merge pull request #3897 from acemod/tanoaMapData
...
Tanoa map data
2016-06-11 23:03:22 +02:00
SilentSpike
931ccf8a46
Merge pull request #3796 from acemod/zeusModuleUiExample
...
Add more zeus modules
2016-06-11 21:41:55 +01:00
bux578
2a667a322d
init WindData --- missing directions
2016-06-11 22:37:03 +02:00
SzwedzikPL
0e247bdb00
CBA events
2016-06-11 22:13:39 +02:00
SzwedzikPL
acdfa52a89
Merge branch 'acemod/master' into dogtags
2016-06-11 22:07:57 +02:00
bux578
950cdb1ee3
fix missing values
...
was using an incomplete regex
2016-06-11 22:05:44 +02:00
SilentSpike
242876fa83
Merge remote-tracking branch 'origin/master' into zeusModuleUiExample
2016-06-11 21:02:16 +01:00
PabstMirror
ddf9e0b5cc
CBA Events
2016-06-11 14:57:04 -05:00
Glowbal
e8ba309765
Merge pull request #3887 from gpgpgpgp/patch-2
...
add a line to get rid of 4 first aid kits in the invisible fast roping helper
2016-06-11 21:53:34 +02:00
Glowbal
1632cb9105
Merge pull request #3878 from acemod/fastroping-sounds-fix
...
Only play fastroping sounds for player
2016-06-11 21:53:00 +02:00
PabstMirror
00e5cef145
Merge remote-tracking branch 'refs/remotes/origin/master' into add-mine-detector
2016-06-11 14:49:12 -05:00
commy2
250e27bfd2
Merge pull request #3864 from acemod/removeLineDrawing
...
Remove line drawing
2016-06-11 21:38:56 +02:00
Butt4cak3
151d13244b
Improved misleading translation of german bandages ( #3810 )
...
* Improved misleading translation of german bandages
* Further improved german bandage names
2016-06-11 21:35:22 +02:00
PabstMirror
d57754a7cd
Private/Formatting
2016-06-11 14:34:14 -05:00
PabstMirror
4f73ead80c
Fix alt/lat for maps not defined in getMapData
2016-06-11 14:32:36 -05:00
bux578
c268572649
add Tanoa mapData
2016-06-11 21:14:05 +02:00
bux578
18d864e950
split mapData into separate function
2016-06-11 21:13:51 +02:00
Glowbal
7f9257716e
Merge pull request #2331 from acemod/323bloodyoverlay
...
remove BI blood overlay
2016-06-11 20:49:54 +02:00
VKing
589ad4d2e7
Remove attachments from mine detectors
...
When WeaponSlotsInfo was added, rifle attachments could be added to the mine detectors.
2016-06-11 20:47:53 +02:00
commy2
a4bd6ea80f
Merge pull request #3893 from acemod/virtualMasDiv0
...
virtualMass - Fix div0 error when naked
2016-06-10 10:27:36 +02:00
commy2
e55881e1ef
Merge pull request #3894 from acemod/fixNametagsUAV
...
Fix nametag error when assignedTeam is nil
2016-06-10 10:20:16 +02:00
PabstMirror
dc6d5f1367
Temp fix for change to handleDamage in dev branch
...
Fix #3892
2016-06-09 21:26:50 -05:00
PabstMirror
5ecc09d78c
Fix nametag error when assignedTeam is nil
2016-06-09 20:42:30 -05:00
PabstMirror
e8f7f6ea24
virtualMass - Fix div0 error when playing as rabbit
2016-06-09 20:30:45 -05:00
PabstMirror
d7d87be32b
Merge remote-tracking branch 'refs/remotes/origin/master' into removeLineDrawing
2016-06-09 17:20:39 -05:00
SzwedzikPL
5313672e4c
dogtag picture
2016-06-09 17:10:46 +02:00
jonpas
f1ae73967d
Normalize leftovers
2016-06-09 14:28:31 +02:00
jonpas
b97ba4990d
Normalize 2 more files
2016-06-09 14:25:57 +02:00
jonpas
bd5f6107a0
Merge branch 'master' into eol-lf
2016-06-09 14:24:45 +02:00
Glowbal
8c9b31b1c7
Merge pull request #3815 from acemod/cbaEventSystem
...
Deprecate ACE events framework
2016-06-09 14:20:26 +02:00
SzwedzikPL
aa407a469a
Merge branch 'acemod/master' into dogtags
2016-06-08 18:13:22 +02:00
gpgpgpgp
0c28cd4413
add a line to get rid of 4 first aid kits in the invisible helper
...
The helper "ace_fastroping_helper" inherits from Helicopter_Base_F, and here's chain of inheritance.
class CfgVehicles
{
class AllVehicles;
class Air: AllVehicles
{
class TransportItems
{
class _xx_FirstAidKit
{
name = "FirstAidKit";
count = 4;
};
};
};
class Helicopter: Air
{
};
class Helicopter_Base_F: Helicopter
{
};
class ace_fastroping_helper: Helicopter_Base_F
{
class TransportItems {}; // now overrides the first aid kits
};
};
Was a happy and funny surprise to pick up some decent medical supplies from one end of a cut rope.
2016-06-08 17:26:23 +08:00
voiper
38b98802de
Add grenade, chemlight, and handflare priming sounds.
...
Remove default clinking sounds.
2016-06-07 17:22:48 -07:00
BaerMitUmlaut
5dbe99b740
Adjusted single and double dogtag renders
2016-06-07 20:40:26 +02:00
commy2
24ce8b7753
Merge pull request #3880 from acemod/spotting_scope_animated_reticle
...
Update Spotting Scope
2016-06-07 19:41:09 +02:00
commy2
5d0e257cd8
center interaction point, add gunner shadows
2016-06-07 19:36:03 +02:00
PabstMirror
1be926f3db
Make rotation key a client setting
...
Improve compatibility with other addons
2016-06-07 11:52:28 -05:00
PabstMirror
aea086b75e
Merge branch 'cbaEventSystem' into removeLineDrawing
2016-06-07 11:12:52 -05:00
BaerMitUmlaut
bce92e8d42
Merge pull request #3567 from BaerMitUmlaut/microdagr-microoverhaul
...
MicroDAGR Microoverhaul
2016-06-07 09:58:18 +02:00
commy2
f14a1b990b
simplify optics config
2016-06-07 07:38:01 +02:00
Nicolás Badano
527db2bd07
Merge pull request #3884 from acemod/fixShowWindInfoControlsText
...
Fix wind info keybind string
2016-06-06 21:39:54 -03:00
jonpas
89db8bef5a
Fix wind info keybind string
2016-06-07 02:22:53 +02:00
jonpas
9287214781
Move Defuse action to main action
2016-06-07 00:51:06 +02:00
commy2
5135d3bedd
delete duplicate files
2016-06-07 00:36:41 +02:00
commy2
3ee10a8c2f
add gunner proxy to FIRE GEO LOD and add it to a component
2016-06-07 00:28:09 +02:00
commy2
f5a96ac2fc
add editor stuff for spotting scope
2016-06-07 00:17:04 +02:00
commy2
12ab4e9fa6
match controls at boarder
2016-06-06 23:33:00 +02:00
commy2
6a5c9cfca7
black periphery
2016-06-06 23:14:19 +02:00
commy2
36d0b78811
coeficient handling interface sizes was inverted
2016-06-06 21:36:29 +02:00
commy2
cd43c17f80
animate the scope
2016-06-06 19:22:24 +02:00
commy2
be260e896b
animated reticle for spotting scope
2016-06-06 17:22:17 +02:00
commy2
a61e4b3a4e
remove BI blood overlay
2016-06-06 14:14:45 +02:00
commy2
fe03272dc6
Merge pull request #3874 from acemod/cleanup_nightvision
...
code cleanup fnc_blending
2016-06-06 12:23:42 +02:00
BaerMitUmlaut
27c347eec8
Only play fastroping sounds for player
2016-06-05 19:39:12 +02:00
jonpas
e779bc0cb2
Merge pull request #3877 from acemod/fixUIerror
...
Fix selective UI in FFV slots
2016-06-05 14:04:49 +02:00
jonpas
021a123fc6
Fix selective UI in FFV slots, Properly fix config name check
2016-06-05 14:02:55 +02:00
Glowbal
2ad3f57414
Merge pull request #3872 from acemod/fixUIerror
...
Fix selective UI script error when changing certain other settings
2016-06-05 13:44:22 +02:00
commy2
e776306295
Merge pull request #3876 from acemod/cleanupMovement
...
Cleanup movement and improve debugging
2016-06-05 12:57:34 +02:00
jonpas
2cc1252f81
Remove unused CfgInventoryGlobalVariable in movement and improve debugging
2016-06-05 12:45:53 +02:00
commy2
0424f5db73
cleanup fnc_blending
2016-06-05 10:12:05 +02:00
commy2
8ed2dd11d2
Merge pull request #3871 from acemod/magRepackImprovements
...
Add size parameter to displayTextPicture, Improve parameter checking …
2016-06-05 00:05:07 +02:00
commy2
a9a0cfc001
Merge pull request #3873 from voiperr/nvgthrowfix
...
Fix NVG overbright when player throws grenades
2016-06-04 23:43:53 +02:00
voiper
354e84e058
Cleanup.
2016-06-04 12:26:38 -07:00
jonpas
b541b0b4f0
Fix selective UI script error when changing certain other settings
2016-06-04 21:20:10 +02:00
jonpas
3124270254
Quote the unquoted
2016-06-04 21:07:24 +02:00
voiper
a10b6ee8e2
Fix thrown blink.
2016-06-04 12:05:47 -07:00
jonpas
5a20f1286b
Change internal event framework names to contain prefix and be as short as possible
2016-06-04 21:05:26 +02:00
jonpas
8ff4a2ecaf
Add size parameter to displayTextPicture, Improve parameter checking in displayText functions, Cleanup magazine repack (privates, deprecated macros, style)
2016-06-04 20:40:55 +02:00
jonpas
03a56b1f7d
Fix goKneeling changing animation inside vehicle (1.60)
2016-06-04 19:58:53 +02:00
SilentSpike
90ebf9638b
Update common event names to meet new standard
2016-06-04 11:12:56 +01:00
SilentSpike
1b6bbff139
Revert event names for synced events framework
...
Keeping these names as short as possible for network traffic purposes.
2016-06-04 09:46:50 +01:00
Jonathan Pereira
b64b7e431e
Translated remaining strings
2016-06-03 23:11:40 -03:00
SilentSpike
9e4fd77745
Update common event names to meet new standard
2016-06-03 22:39:43 +01:00
SilentSpike
5b8fa4d4f1
Update common status effect framework
...
Instead of changing the event names to match the new standards and also changing every single call to `FUNC(statusEffect_set)`/`FUNC(statusEffect_get)` I figured it made sense to only change the event names and the internal workings of `FUNC(statusEffect_sendEffects)` to automatically add the appropriate prefix.
2016-06-03 20:53:43 +01:00
SilentSpike
bd985d57ff
Run event renaming script for new additions
2016-06-03 20:53:43 +01:00
Glowbal
694503c01b
Fix medical events
2016-06-03 20:57:21 +02:00
Glowbal
fa2cf55156
Fix medical related events
2016-06-03 20:22:34 +02:00
PabstMirror
39456003ee
Merge branch 'cbaEventSystem' into removeLineDrawing
2016-06-03 12:55:37 -05:00
BaerMitUmlaut
11f1518220
Fix spottingscope interaction point, add to misc. box ( #3862 )
2016-06-03 10:21:47 -05:00
jonpas
f90b3b5c54
Merge pull request #3770 from tbeswick96/IRAttachLeftShoulder
...
Moved IR Strobe to left shoulder when attached.
2016-06-03 16:33:57 +02:00
jonpas
46b12bd6c3
Merge pull request #3861 from acemod/unify-deployables
...
Unify deployables
2016-06-03 16:32:52 +02:00
PabstMirror
77baeda976
Merge branch 'master' into huehuehue
2016-06-03 00:01:13 -05:00
PabstMirror
4915637601
Few more in common
2016-06-02 20:13:09 -05:00
PabstMirror
59ffff406e
Fix missing ;
2016-06-02 20:05:03 -05:00
PabstMirror
240cf4f0b5
Fix merge
2016-06-02 20:02:16 -05:00
PabstMirror
db78dd53a8
Cleanup Merge and remoteFnc events
2016-06-02 19:59:18 -05:00
PabstMirror
d7f9c52c2f
Merge branch 'master' into cbaEventSystem
2016-06-02 19:29:30 -05:00
PabstMirror
7970979a18
Fix removed var in Map Gestures
2016-06-02 15:04:03 -05:00
PabstMirror
73215b707d
Remove Line Drawing from MapTools
...
And change map tools key to ALT from CTRL
2016-06-02 14:36:25 -05:00
jonpas
c110121b1a
Merge pull request #3811 from acemod/abolishExecRemoteFnc
...
Replace execRemoteFnc with events
2016-06-02 17:08:01 +02:00
jonpas
b0352fdeb9
Merge branch 'master' into eol-lf
2016-06-02 17:02:09 +02:00
PabstMirror
b6aaba7f90
Integrate 1.60 marker shape color map interface ( #3860 )
...
1.60 adds ability to set color and marker type from the map interface
Luckily they use the same values and indexes as ACE,
This PR connects the two systems,
Selecting a color from the 1.60 map display will set the color in the
ace marker display and vice versa
2016-06-02 09:28:52 -05:00
PabstMirror
637b5e02e9
Update 3den attributes to use 1.60 scaling ( #3857 )
2016-06-02 09:26:57 -05:00
PabstMirror
675214cfb9
Allow drivers of vehicles to show microDagr ( #3808 )
2016-06-02 09:26:43 -05:00
PabstMirror
68d6c1969b
Cleanup transistion to CBA's waitAndExec ( #3858 )
2016-06-02 09:22:40 -05:00
jonpas
4c995d4c5c
Improve selective UI API ( #3805 )
...
* Improve selective UI API, Disable ammo count when reload component is loaded, Fix stance UI
* Upgrade Selective UI framework for controls that share IDCs for gunner and soldier
* Separate more soldier and gunner settings sharing same IDCs, Remove vehicle gunner weapon which has no effect anymore
* Separate more soldier and gunner IDC sharing elements, Fix typo, Fix API setting not being respected in case where selective type is not the same on load
* Rework Selective UI using ACE_UI config, Cleanup, Add ACE_UI to FCS component to mark it (is already disabled due to other necessary settings for FCS to function)
* Do location check in function, Rename condition to location, change to number
* Use macros in ACE_UI location
2016-06-02 14:32:39 +02:00
jonpas
590d4fa70b
Merge branch 'master' into abolishExecRemoteFnc
2016-06-02 14:28:43 +02:00
Glowbal
603d07ddc2
Fix incorrect indentation
...
Should be using 4 spaces instead of a tab.
Quick, before flummi sees this.
2016-06-02 10:53:09 +02:00
Glowbal
2e54310ff4
Merge pull request #3844 from acemod/fixShowHud
...
Fix showHud if set before display loaded
2016-06-02 10:39:46 +02:00
Glowbal
5c7148de1f
Merge pull request #3851 from acemod/huntIR-multipara-fix
...
Fixed HuntIR deployment
2016-06-02 10:38:37 +02:00
BaerMitUmlaut
cc83bf64d6
Moved all deployables to equipment submenu
2016-06-02 10:35:33 +02:00
BaerMitUmlaut
9d4bd0f8dd
Added custom dogtag model and images
2016-06-02 00:59:15 +02:00
PabstMirror
b949440eb1
Goggles - Fix script error from CBA_fnc_waitAndExecute
2016-06-01 17:27:55 -05:00
jonpas
95573ee711
Stringtable URL ( #3855 )
...
* Move url into stringtable to display it properly, Add some missing author and url entries
* Fix main
* Remove duplicate author
2016-06-01 23:45:51 +02:00
jonpas
ba27c8f914
Fix WEB_URL end of line error ( #3854 )
...
* Fix WEB_URL end of line error
* Change location of quote macro
* Fix medical_menu VERSION_CONFIG error
2016-06-01 14:41:33 +02:00
commy2
9d61dd6159
Merge pull request #3850 from acemod/fixCfgPatchesAuthor
...
Fix CfgPatches author/ is not a value
2016-06-01 14:24:17 +02:00
jonpas
1354826d56
Put semi-colon to the correct place
2016-06-01 14:11:32 +02:00
commy2
e6000807ee
Merge pull request #3849 from acemod/fix160ubc
...
Fix 1.60 UBC (slingloads)
2016-06-01 13:57:07 +02:00
jonpas
1331265e65
Move url into a macro
2016-06-01 13:49:10 +02:00
jonpas
6730d016c2
Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility
2016-06-01 13:27:02 +02:00
BaerMitUmlaut
7a8506cefd
Update handleFired header comment
2016-05-31 23:12:57 +02:00
jonpas
26fbc36cab
Merge branch 'master' into cbaEventSystem
2016-05-31 22:36:08 +02:00
BaerMitUmlaut
f3fbb6cbdd
Fixed HuntIR deployment
2016-05-31 22:13:01 +02:00
jonpas
fa9384ffb4
Fix vanilla CCIP on A-10
2016-05-31 20:35:38 +02:00
Glowbal
d7b239f487
Merge pull request #3795 from acemod/deprecate-components
...
Add Deprecate components support
2016-05-31 10:40:24 +02:00
PabstMirror
6905e6f97f
Fix showHud if set before display loaded
2016-05-31 01:53:28 -05:00
PabstMirror
598c3dc181
Fix 1.60 UBC (slingloads)
2016-05-30 17:11:06 -05:00
commy2
fd26e2e44e
Merge pull request #3516 from acemod/cbamissiontime
...
replace timePFH with CBA_missionTime
2016-05-30 21:23:57 +02:00
commy2
7512c4e52e
manual merge
2016-05-30 21:14:34 +02:00
jonpas
7a307393a4
Merge branch 'master' into useQuotedPathMacros
2016-05-30 21:14:17 +02:00
commy2
e7fa02d0d9
Merge pull request #3812 from acemod/cbaDelayedExecFnc
...
Use new CBA delayed execution functions and deprecate ACE functions
2016-05-30 21:02:29 +02:00
commy2
94b5cea3cf
Merge pull request #3814 from acemod/cbaBinocularMagazineFnc
...
Use new binocular magazine CBA functions and deprecate ACE functions
2016-05-30 21:00:43 +02:00
commy2
272775445f
Merge pull request #3670 from acemod/useQuotedFuncMacros
...
Use new quoted function macros
2016-05-30 21:00:23 +02:00
commy2
882aa26ab2
Merge pull request #3813 from acemod/cbaGetItemObjectConfig
...
Use new CBA get config functions and deprecate ACE functions
2016-05-30 21:00:05 +02:00
PabstMirror
4df30327ac
Flashsuppressors - use next CBA's JM configs ( #3709 )
...
#3700
2016-05-30 13:49:08 -05:00
jonpas
816da2aef1
Normalize to LF line endings
2016-05-30 18:37:03 +02:00
PabstMirror
3163b53710
gforces - Fix missing ace_settings.hpp include ( #3837 )
2016-05-29 11:54:44 -05:00
bux578
b4cb49ffec
Merge pull request #3836 from acemod/fix_null_rallypoint
...
fix rallypoint being objNull, when created via 'createvehicle'
2016-05-29 13:57:44 +02:00
commy2
bc6f756df4
fix rallypoint being objNull, when created via 'createvehicle'
2016-05-29 13:22:49 +02:00
commy2
1bd44e562a
replace a comma with semi colon
2016-05-29 11:44:00 +02:00
Grey-Soldierman
9f588d283c
Fixed indentation again
2016-05-27 19:10:44 +01:00
Grey-Soldierman
d92b5fb459
Fixed indentation
2016-05-27 19:08:34 +01:00
Grey-Soldierman
b0363d4ba9
Removed Valon from any vest configured for holsters
2016-05-27 18:52:30 +01:00
voiperr
52ea640c4b
ace_map: More realistic flashlight glow + minor fix ( #3824 )
...
* -Converted flashlight glow object to chemlight type (emits light without sprite)
-Fixed issue where glow object was being deleted without being first detached
* Cleanup of temp classes.
* Spaces before and after =
* Moved effects into Effects.hpp.
2016-05-27 19:16:15 +02:00
jonpas
4f515ec4e1
QGVAR captives, interaction
2016-05-25 20:23:53 +02:00
jonpas
5d36f84eb1
qGVAR overheating and reloadlaunchers
2016-05-25 20:13:36 +02:00
gpgpgpgp
cfb3d7f0a9
add a line to support JSRS Eden (getting rid of JSRS explosion sound effect)
...
JSRS Eden defines a SoundSetExplosion[] on ShellBase to define explosion sounds, which gives huntir unexpected exploding sound when used together. Adding SoundSetExplosion[] = {}; shall fix the problem.
2016-05-25 09:17:19 +08:00
PabstMirror
87ee34ba35
vehicleLock - Use QGVAR
2016-05-24 19:37:24 -05:00
PabstMirror
fef50ae48f
Fix duplicate event
2016-05-24 19:25:38 -05:00
jonpas
c4999c13e4
QGVAR and Fix sandbag, tagging, tripod, viewdistance, weather, zeus
2016-05-25 02:19:50 +02:00
jonpas
7ede53bbdd
QGVAR and Fix laser, map, map_gestures, maptools, modules, nightvision, optics
2016-05-25 02:09:11 +02:00
jonpas
b54d1985f1
QGVAR and fix gforces, goggles, grenades, hearing, interact_menu
2016-05-25 01:57:41 +02:00
jonpas
99675417c6
QGVAR and fix events in concertina_wire, disarming and explosives
2016-05-25 01:51:58 +02:00
jonpas
dd2e9140ae
Q(E)GVAR rangefinderData event
2016-05-25 01:44:56 +02:00
jonpas
da4c08fb6c
QGVAR all reload events
2016-05-24 20:51:10 +02:00
jonpas
30b15ee3d3
Fix quotes in cargo
2016-05-24 19:22:48 +02:00
jonpas
331c3c70cb
Verify and fix cargo, nametags, rearm, reload, repair, ui, Convert infoDisplayChanged in common and mk6mortar Rsc's
2016-05-24 18:58:27 +02:00
SilentSpike
207d6612da
Remove duplicate ACE_newEvents entries
2016-05-24 15:06:17 +01:00
SilentSpike
c4b75160a4
Run event renaming script
2016-05-24 14:13:11 +01:00
PabstMirror
ccbd52e811
Fix Can't toggle safemode in FFV seats #3819
...
Also block safemode when no weapon
2016-05-23 15:51:09 -05:00
PabstMirror
84eca899a9
Add event renaming system
...
Allows us to switch event names such that anyone currently using our old event framework and names won't have their code broken until it is deprecated in version 3.8.0
2016-05-23 14:03:55 +01:00
PabstMirror
86b9022322
Fix VehLock Macros
2016-05-22 23:13:15 -05:00
SilentSpike
108ff4f644
Replace ACE event system calls with CBA counterparts
...
Regex used:
\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent
E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event
E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
2016-05-22 16:47:39 +01:00
SilentSpike
f0b8da33c4
Deprecate ACE events framework
...
CBA 2.4.0 entirely replaces the ACE events framework.
Adds wrappers with deprecated warnings to all of the public event framework functions and removes all of the underlying GVARs and code.
2016-05-22 16:09:49 +01:00
jonpas
bd0e05d7d6
Use CBA config functions, return correct value
2016-05-22 16:18:24 +02:00
jonpas
38b48390b5
Call CBA binocular functions - leave as wrapper
2016-05-22 16:03:41 +02:00
jonpas
bbd96f9e71
Call CBA delayed execution functions, remove ACE's PFH for handling them
2016-05-22 16:01:12 +02:00
jonpas
4b121480bb
Use new binocular magazine CBA functions, deprecate ACE functions
2016-05-22 15:48:03 +02:00
jonpas
d35e89892c
Use new get item and object config CBA functions, deprecate ACE functions
2016-05-22 15:36:31 +02:00
jonpas
e7dbcd7b58
Replace delayed execution functions with new CBA counterparts
2016-05-22 15:29:01 +02:00
jonpas
472e4631d6
Deprecate delayed execution functions
2016-05-22 15:25:59 +02:00
jonpas
d902d1182a
Replace ace_common_fnc_execRemoteFunc with events
2016-05-21 23:55:48 +02:00
SilentSpike
a7c1d0e5bf
Remove erroneous tabs
2016-05-21 17:45:50 +01:00
SilentSpike
3e16142ff6
Merge branch 'master' into zeusModuleUiExample
2016-05-21 17:37:49 +01:00
SilentSpike
b3192adbb7
Add support for a zeus module position attribute
...
Allows zeus to select a position for the module task to be carried out at - as a bonus it works alongside the radius attribute and will draw a circle preview if a radius is present.
Unfortunately control types 100 & 101 don't play nicely with controls groups and so I've commented out the position attribute from the displays that would currently use it. Otherwise it is all seemingly working fine, just that the position of the control is all wrong and it doesn't stay within the bounds of the controls group.
I opened an issue tracker ticket for the problem here: https://feedback.bistudio.com/T116708
2016-05-21 17:29:53 +01:00
commy2
c9ea5676ea
travis test
2016-05-21 13:29:42 +02:00
commy2
e40c814b04
Merge branch 'master' of https://github.com/acemod/ACE3 into improve_getTurretX
2016-05-21 13:27:51 +02:00
commy2
d395fcd792
travis pls
2016-05-21 13:22:13 +02:00
commy2
aee4d23bdb
fullCrew new parameter to improve FUNC(getTurretX)
2016-05-21 13:07:17 +02:00
Glowbal
dd60ac8170
Remove isEnabled check in sitting
...
IsEnabled check is not necessary here. It should not have been included, as it was a left over from testing for migrating sitting to ACEX.
2016-05-21 00:41:49 +02:00
PabstMirror
f69142dd45
Hearing - New XEH, Fix dead effects, Medical var ( #3802 )
...
* Hearing - New XEH, Fix dead effects, Medical var
* Use setHearingCapability
* Cleanup dead player vol update
* Don't change global hearing in medical
* Fix exitWith
2016-05-20 11:23:14 -05:00
PabstMirror
d464a23d21
Use the lovely CBA_fnc_canUseWeapon function
2016-05-20 01:10:12 -05:00
PabstMirror
0d5385ffaf
Update FCS hud when manually setting range.
2016-05-19 21:50:51 -05:00
PabstMirror
508b71e7ba
Scopes - Allow Scope Adjust from FFV
2016-05-19 21:39:15 -05:00
SilentSpike
adaa10aea5
Adjust center of zeus AI task modules
...
The tasks should center on the logic rather than the group leader.
The search nearby module is also deleted after it's processed.
2016-05-19 22:32:05 +01:00
SilentSpike
3a1dba4486
Add zeus defend, patrol and search modules
...
Using a shared `radius` attribute for all of these displays so a generalized method of initializing and retrieving the value associated that was implemented.
2016-05-19 01:24:08 +01:00
SilentSpike
e05f2ca637
Add search nearby building zeus module
2016-05-19 01:24:07 +01:00
SilentSpike
600b71817f
Update zeus module logic deletion behaviour
...
The teleport players module is reusable, while the global AI skill and group side modules should be deleted appropriately once the display is closed.
2016-05-18 16:30:14 +01:00
SilentSpike
8a70cfbcd8
Clean new zeus module config and functions
...
Adds function headers, stringtables and renames some display control classes.
2016-05-18 16:16:35 +01:00
commy2
25876d82ca
manual merge
2016-05-18 12:21:53 +02:00
commy2
230f0ab85e
manual merge
2016-05-18 12:20:33 +02:00
commy2
08bafd535f
deleted to much
2016-05-18 12:00:13 +02:00
commy2
655277cc17
remove previously deleted block
2016-05-18 11:58:42 +02:00
commy2
d93132dac8
more replacing
2016-05-18 11:57:40 +02:00
commy2
da70854568
manual merge
2016-05-18 11:48:27 +02:00
SilentSpike
81d854c56a
Add group side zeus module
...
The module is placed on a unit in order to switch the side of that unit's group. A "simple" dialog is used to select the new side.
The dialog code is a little ugly to say the least.
2016-05-17 23:44:17 +01:00
SilentSpike
4cbded1811
Fix zeus cargo display for empty vehicles
...
The cargo wasn't displaying for empty vehicles because they use a different display.
2016-05-17 23:44:16 +01:00
ir0n1e
4a7f5529f6
added gunbag to ACE_Box_Misc
2016-05-17 12:56:48 +02:00
ir0n1e
3e9cf73b0d
added readme
2016-05-17 12:24:18 +02:00
ir0n1e
1302ccb3fe
clean up
2016-05-17 12:19:17 +02:00
ir0n1e
7ef02400dc
adapted to #3378 and added support for UGL
2016-05-17 12:14:57 +02:00
ir0n1e
c89163316c
fixed idention tabs are 4 spaces now
2016-05-17 11:21:48 +02:00
ir0n1e
6d988524d3
Merge branch 'master' of https://github.com/acemod/ACE3 into gunbag
2016-05-17 11:03:57 +02:00
ir0n1e
1a14634b41
dissolved some edges
2016-05-17 10:57:24 +02:00
SilentSpike
d90d5a7ac1
Rewrite global AI skill zeus module
...
Remove the use of ace settings and makes the module more zeus specific. It might be worth adding a similar module or mission settings to ace_ai for mission editing.
2016-05-16 15:16:53 +01:00
commy2
473149b8ca
revert changes from other PR to make it compatible
2016-05-16 15:22:37 +02:00
commy2
cac7b9c0c3
optional param to skip deprecated warning
2016-05-16 15:15:51 +02:00
Glowbal
32055401d3
Add backwards compatability for InventoryChanged
...
The output of `getUnitLoadout` is different as `getAllGear`. Using a different format in the event would mean that any eventhandler depending on the inventory output would now be broken.
2016-05-16 00:09:53 +02:00
SilentSpike
5b460205a9
Add teleport player zeus module
2016-05-15 21:02:40 +01:00
Glowbal
487400b142
Add different warning messages based on current version of component
2016-05-15 20:13:10 +02:00
Glowbal
7a7e930024
Add deprecate sitting component
2016-05-15 19:38:37 +02:00
Glowbal
3d74c25c97
Add deprecate component solution
2016-05-15 19:38:24 +02:00
SilentSpike
4d028be876
Cleanup zeus display modules
...
Replaces display size and position defines with macros for readability and compactness.
Changes naming convention of functions and displays to distinguish categories and make more readable.
Converts the global set skill module to use display events rather than waiting in a loop for the module to be set and confirmed.
2016-05-15 18:08:54 +01:00
SilentSpike
77de1ec6eb
Update vanilla zeus functions
...
Merges the changes introduced by arma updates to vanilla functions with our overwrites.
I also reverted some of the command capitalization since it makes the process of going through differences quicker in future.
2016-05-15 12:48:32 +01:00
Glowbal
da3f6113d6
Merge branch 'master' into add-mine-detector
2016-05-15 00:20:46 +02:00
commy2
07caf1b0bd
fix for null player
2016-05-14 20:33:33 +02:00
PabstMirror
7628f9a4ab
Fix nils in array
2016-05-14 13:08:58 -05:00
commy2
e4c86a8af5
don't do 'playerInventoryChanged' just because ammo decreased after firing
2016-05-14 19:50:08 +02:00
commy2
cc9e128e74
Merge pull request #3792 from acemod/useGetUnitLoadout
...
use 'getUnitLoadout' instead of 'FUNC(getAllGear)' and deprecate it
2016-05-14 13:04:35 +02:00
commy2
c5275813a4
use 'getUnitLoadout' instead of 'FUNC(getAllGear)' and deprecate it
2016-05-14 10:49:09 +02:00
Glowbal
04b61ff32e
Fix missing semicolon
2016-05-14 10:37:29 +02:00
Glowbal
180a0f9d84
Merge pull request #3462 from acemod/medicalLoops
...
Cleanup medical PFHs
2016-05-14 09:39:14 +02:00
Glowbal
36e48554c2
Merge pull request #3787 from acemod/motorcycleInteraction
...
Add interaction support to Motorcycle class
2016-05-14 09:33:41 +02:00
Glowbal
4e109ae93b
Merge pull request #3781 from acemod/specTree
...
Fix spectator unit tree refreshing
2016-05-14 09:26:42 +02:00
Glowbal
e867db3a24
Merge pull request #3780 from acemod/lighter-bodybags
...
Adjusted weight of bodybag
2016-05-14 09:24:25 +02:00
Glowbal
eb8390741b
Change round down mass of body bag
...
Mass is an integer.
2016-05-14 09:23:29 +02:00
Glowbal
57e83f8b35
Merge pull request #3791 from acemod/dropTestMission
...
Remove old test-mission
2016-05-14 09:18:06 +02:00
PabstMirror
d48bd3ca83
Remove old testmission addon
2016-05-13 19:54:14 -05:00
PabstMirror
895bf2580a
Merge pull request #3773 from J3aLeiNe/master
...
fnc_getMGRSdata.sqf update3
2016-05-13 15:59:24 -05:00
jonpas
a950b2c2fe
Add canPush config entry to enable pushing on boats with mass higher than 2600
2016-05-13 16:33:15 +02:00
SilentSpike
ce3787b3c3
Merge pull request #3768 from acemod/add-zeus-objects-setting
...
Add zeus objects setting
2016-05-13 10:39:20 +01:00
jonpas
e984fcf715
Fix part name for Tank class
2016-05-12 21:56:12 +02:00
jonpas
2d2d5bc828
Readd mistakenly removed spare part adding
2016-05-12 21:52:06 +02:00
jonpas
58cc686aac
Remove initial spare part adding for classes not Car or Tank, Improve addSpareParts
2016-05-12 21:49:45 +02:00
jonpas
f6e4bd7a6b
Remove redundant spare part adding
2016-05-12 21:37:54 +02:00
jonpas
c591c7af64
Add interaction support to Motorcycle class
2016-05-12 21:30:32 +02:00
Glowbal
721b161161
Remove useless if statement
2016-05-12 19:56:07 +02:00
Glowbal
7ba02a21ec
Merge remote-tracking branch 'refs/remotes/origin/add-mine-detector'
...
Conflicts:
addons/minedetector/functions/fnc_detectorLoop.sqf
2016-05-12 19:49:32 +02:00
Glowbal
7cc423d48f
Change mindetector sound
2016-05-12 19:44:43 +02:00
jonpas
5147f366a5
Execute take nozzle actions only on progress bar success ( #3783 )
...
* Execute take nozzle actions only on progress bar success - fix #3739 , Prettify params
* Fix animation on holster
2016-05-12 17:11:35 +02:00
PabstMirror
09371bce96
Merge pull request #3776 from acemod/cleanupFastRopeSounds
...
FastRope Sounds - Fix Config, Merge PFEH, Add CC Attribution
2016-05-11 22:29:28 -05:00
commy2
7304bd3fda
Merge pull request #3779 from acemod/showvirtualloadingearmenu
...
show virtual load in inventory menu
2016-05-11 22:57:37 +02:00
commy2
dd6241e376
Merge pull request #3778 from acemod/fixGetWeaponState
...
fix getWeaponState, fix #3777
2016-05-11 22:57:25 +02:00
BaerMitUmlaut
f9c643b941
Modified fastroping thud sound
2016-05-11 21:05:59 +02:00
SilentSpike
1b1329b350
Increase spectator unit tree refresh rate
...
Reduce the time between automated refreshing of the unit tree. Also makes an initial call to the tree populating code upon first opening to remove the initial delay.
2016-05-11 16:01:07 +01:00
SilentSpike
9364ae60df
Fix spectator unit tree refreshing
...
- Account for decrement in node index when culling the tree of sides/groups/units
- Fix non-zero-based index `to` value when navigating the units in the tree
2016-05-11 13:30:17 +01:00
J3aLeiNe
078c1d585f
Add Kerama Islands by "Les Vétérans"
...
add Kerama Islands by "Les Vétérans" with the correct latitude (default config latitude : 1°)
2016-05-11 00:01:35 +02:00
BaerMitUmlaut
38bb4f6c29
Adjusted weight of bodybag
2016-05-10 23:40:03 +02:00
commy2
f738b17db7
show virtual load in inventory menu
2016-05-10 22:32:40 +02:00
commy2
53c9a96c77
fix getWeaponState, fix #3777
2016-05-10 22:14:01 +02:00
J3aLeiNe
c619bcb5a3
Fix "jacobi" latitude and elevationOffset
2016-05-10 19:39:01 +02:00
PabstMirror
518a873efd
Add module readme
2016-05-10 10:14:15 -05:00
PabstMirror
980da16826
FastRope Sounds - Fix Config, Merge PFEH, Add CC Attribution
2016-05-10 10:09:52 -05:00
J3aLeiNe
29e7dbf757
fnc_getMGRSdata.sqf update3
2016-05-10 12:39:56 +02:00
commy2
be99d4b3d7
Merge pull request #3772 from acemod/fixmissingmags
...
add missing magazines, fix #3685
2016-05-10 11:57:32 +02:00
commy2
505fa0d773
add missing magazines, fix #3685
2016-05-10 11:50:59 +02:00
Tim Beswick
19df821ff5
Moved IR Strobe to left shoulder when attached.
2016-05-09 11:51:28 +01:00
BaerMitUmlaut
3f96e11cbb
Made icons grey
2016-05-08 18:52:33 +02:00
Glowbal
74fd4b4b52
Add run at settings initialized auto add objects
2016-05-08 13:47:35 +02:00
Glowbal
a526d33aba
Fix inconsistent name for module setting
2016-05-08 13:44:51 +02:00
Glowbal
b08af3fea6
Add read auto add objects setting from module
2016-05-08 13:42:45 +02:00
Glowbal
220b8b6352
Merge pull request #3767 from alganthe/zeus_fix
...
Add new zeus addObjects setting to settings module (#2451 )
2016-05-08 13:41:13 +02:00
jonpas
a0bd521a40
Remove difficulties component
2016-05-07 23:48:31 +02:00
PabstMirror
2a5ec42148
Repair - Improve wheel detection for RHS ( #3760 )
...
* Repair - Improve backup wheel detection
Fix #3759
* Cleanup
2016-05-07 16:04:27 -05:00
Glowbal
dbe70a7094
Merge pull request #3761 from acemod/cleanupExplosiveSync
...
Fix explosive sync on dedicated server
2016-05-07 22:46:35 +02:00
Glowbal
ed9d05d6dd
Merge pull request #3753 from acemod/blockEngine-statusEffect
...
Add blockEngine status effect
2016-05-07 22:40:05 +02:00
J3aLeiNe
d79cbe0844
Getmgrsdata update2 ( #3736 )
...
* correct mildot reticle LRPS/AMS/KHS
correct mildot reticle LRPS/AMS/KHS
* replace 1 tab with 1 space
replace 1 tab with 1 space
* fix tab
* ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes
ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes,
same opticszoommax/min for each scopes : 1µ (1meter for 1000meter) / 4µ
(4meter for 1000meter),
LRPS : variable magnification / SOS : 2 magnifications
* fnc_getMGRSdata.sqf update2
fnc_getMGRSdata.sqf update2
* fnc_getMGRSdata.sqf update2
add new maps, in alphabetic order now
2016-05-07 22:37:58 +02:00
PabstMirror
9f6661f4db
Make 40mm Grenades Frag ( #3679 )
...
* Make 40mm Grenades Frag
* Just use existing force cfg instead of adding new
Add RHS compat entries
2016-05-07 15:35:39 -05:00
BaerMitUmlaut
4eb2ecb0b6
Fixed getting stuck on rope whilst fastroping ( #3734 )
2016-05-07 22:35:18 +02:00
BaerMitUmlaut
82f8eb758c
Removed remaining usage of player ( #3710 )
2016-05-07 22:27:33 +02:00
PabstMirror
1742629045
Add NonSteerable Reserve Parachute ( #3689 )
...
* Add NonSteerable Reserve Parachute
Close #3364
* Use params
2016-05-07 22:26:02 +02:00
Rebel
8bd4afed6b
Drag and carry icons. ( #3676 )
2016-05-07 22:23:38 +02:00
J3aLeiNe
fd8167b7e7
AB - correct mildot reticle LRPS/AMS/KHS ( #3664 )
...
* correct mildot reticle LRPS/AMS/KHS
correct mildot reticle LRPS/AMS/KHS
* replace 1 tab with 1 space
replace 1 tab with 1 space
* fix tab
* ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes
ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes,
same opticszoommax/min for each scopes : 1µ (1meter for 1000meter) / 4µ
(4meter for 1000meter),
LRPS : variable magnification / SOS : 2 magnifications
2016-05-07 22:20:50 +02:00
commy2
4a8e727ba5
end spectator by global mission end event from server ( #3659 )
...
* end spectator by global mission end event from server
* add ;
2016-05-07 22:17:21 +02:00
Ozan Eğitmen
b8abec0c61
Fix Capitalization of ACE Settings classes. ( #3627 )
2016-05-07 22:14:56 +02:00
Glowbal
f34d890e7a
Merge pull request #3612 from SzwedzikPL/trenchestweaks
...
Add remove trench and continue digging trench actions
2016-05-07 22:12:15 +02:00
Glowbal
1ad348d415
Merge pull request #3517 from gruppe-adler/master
...
Added fastroping sounds
2016-05-07 22:01:21 +02:00
Glowbal
5ff91484ed
Merge pull request #3438 from acemod/spareBarrelSimulation
...
AAR actions + track temperatures of spare barrels
2016-05-07 21:48:03 +02:00
PabstMirror
dd858c7e6b
Stringtables, Add Detector Pos Deubg
2016-05-07 12:08:36 -05:00
PabstMirror
dd049a9699
Merge pull request #3762 from acemod/toggleWindDisplay
...
Add key to toggle wind info display
2016-05-07 10:58:43 -05:00
PabstMirror
71b86a7525
Merge pull request #3746 from acemod/fixTacLaderModelCfg
...
Tactical Ladder - Update model cfg
2016-05-07 10:58:29 -05:00
PabstMirror
9b46e77f66
Add key to toggle wind info display
2016-05-06 12:47:59 -05:00
PabstMirror
28c65c4bed
Fix explosive sync on dedi
2016-05-05 14:36:56 -05:00
jonpas
59e412032e
Merge pull request #3756 from acemod/uiShowHud
...
UI - Don't overwrite other showHud indexes
2016-05-04 21:50:42 +00:00
PabstMirror
cf92ba9c46
Overheating - Add Master Enabled Setting (barrelPR)
2016-05-04 14:59:04 -05:00
ir0n1e
13dc56c435
added opening sounds
2016-05-04 20:06:56 +02:00
PabstMirror
bc584b4c95
Merge remote-tracking branch 'refs/remotes/origin/master' into spareBarrelSimulation
2016-05-04 13:00:34 -05:00
commy2
01cf551aba
Merge pull request #3730 from acemod/cleanupReloadLaunchers
...
Cleanup reload launchers
2016-05-04 16:18:37 +02:00
Glowbal
83a8c488d9
Merge pull request #3751 from acemod/wipeoutWhitespace
...
Cleaned up excessive whitespace
2016-05-04 11:46:56 +02:00
Glowbal
59d101ea75
Merge pull request #3754 from acemod/removeLegacy
...
Removed old occurances of AGM and CSE
2016-05-04 11:46:11 +02:00
ir0n1e
9af55d741b
added new load handling
2016-05-04 09:56:33 +02:00
ir0n1e
cbabae9253
Merge branch 'master' into gunbag
2016-05-04 06:39:26 +02:00
ir0n1e
ad7bd3efc1
Merge branch 'gunbag' of https://github.com/ir0n1e/ACE3 into gunbag
2016-05-04 06:32:17 +02:00
ir0n1e
ffbc5ca07d
fixed idention and code style
2016-05-04 06:31:35 +02:00
PabstMirror
398b76f30b
Get reload time from QGVAR(buddyReloadTime)
2016-05-03 23:13:43 -05:00
PabstMirror
98a74aca6e
UI - Don't overwrite other showHud indexes
2016-05-03 22:49:05 -05:00
Glowbal
0652978c86
Merge branch 'master' into add-mine-detector
2016-05-03 22:44:16 +02:00
Glowbal
b4fca958aa
Add mine detector port from ACE2
2016-05-03 22:37:02 +02:00
BaerMitUmlaut
012ce9fb16
Removed old occurances of AGM and CSE
2016-05-03 21:38:36 +02:00
BaerMitUmlaut
b6324e61e9
Improved params formatting
2016-05-03 21:24:10 +02:00
BaerMitUmlaut
304f1a22b4
Use blockeEngine status effect in refuel
2016-05-03 21:08:22 +02:00
BaerMitUmlaut
e125911c3b
Added blockEngine status effect
2016-05-03 20:52:43 +02:00
Cuel
66c2bf0506
Fix dead bodies removal, when forced = 1
...
- Removed unused(?) GVAR(Module)
- Removed "white space alignment" in module.sqf
2016-05-03 20:10:28 +02:00
commy2
736807f994
fix typo, make variable global
2016-05-03 18:16:39 +02:00
commy2
8585ea5688
add framework to add virtual mass to containers
2016-05-03 18:12:47 +02:00
ir0n1e
cd58eaf974
wrong command (removeAllPrimaryWeaponItems)
2016-05-03 12:52:06 +02:00
ir0n1e
def1d46152
remove weapon items player
2016-05-03 12:49:16 +02:00
ir0n1e
920b9b8e62
Update script_component.hpp
2016-05-03 12:44:58 +02:00
ir0n1e
a34490aca8
added missing }
2016-05-03 10:58:01 +02:00
ir0n1e
d3500d4bee
ACE syntax
2016-05-03 10:51:41 +02:00
ir0n1e
9567b587c6
added gunbag
2016-05-03 10:21:21 +02:00
BaerMitUmlaut
7fcbe93b71
Cleaned up excessive whitespace
2016-05-03 02:32:44 +02:00
PabstMirror
33b624c896
Tactical Ladder - Update model cfg
...
#3745
2016-05-02 12:10:44 -05:00
PabstMirror
7cc2da2bb1
Fix self swap action
2016-04-29 23:38:01 -05:00
ProfessorCZ
7d0fcde9fa
CZ Translate - Update
...
04/30/2016
2016-04-30 00:57:24 +02:00
PabstMirror
4eb657bfc7
Merge pull request #3718 from acemod/vehLockACRE
...
vehicle inventory lock - compatibility with acre
2016-04-29 13:10:21 -05:00
PabstMirror
7665935641
Use constant reload time value instead of config
2016-04-29 13:00:35 -05:00
commy2
ab09e0989b
Merge pull request #3722 from acemod/fixmacro
...
fix wrong macro names
2016-04-28 07:48:25 +02:00
PabstMirror
d826c91c99
Cleanup reload launchers
2016-04-28 00:43:33 -05:00
jonpas
3389bc5e1b
Add cargo to Taru pods
2016-04-28 04:44:57 +02:00
PabstMirror
d40735d5c2
Improve synced event error logging
2016-04-25 15:48:24 -05:00
commy2
5c3f5f5751
fix wrong macro names
2016-04-25 21:34:25 +02:00
PabstMirror
27c5598135
vehicle inventory lock - compatibility with acre
2016-04-24 11:26:13 -05:00
jonpas
b06659a2e4
Fix params error
2016-04-23 00:29:58 +02:00
jonpas
dbe4c6ae26
Merge branch 'master' into uiSettings
2016-04-23 00:17:16 +02:00
PabstMirror
efc956eb99
Merge pull request #3692 from acemod/unloadOnSlopes
...
Better handle unloading on slopes
2016-04-22 10:40:16 -05:00
PabstMirror
7366133629
Merge pull request #3699 from acemod/cWireFixes
...
Concertina Wire - Don't recoil broken wire, fix killer
2016-04-22 10:40:04 -05:00
PabstMirror
71ff7e9d8a
Merge pull request #3682 from acemod/javelinCursorTargetFix
...
Javelin - Verify player has LOS to cursorTarget
2016-04-21 19:50:23 -05:00
PabstMirror
72aa0fffea
Merge pull request #3713 from acemod/gesturesFixBIS
...
Fix BIS gesture keybinds
2016-04-21 19:48:26 -05:00
PabstMirror
d7e3f51ec2
Merge pull request #3705 from acemod/gforceSetting
...
Gforces - Add ace_setting to only run in aircraft
2016-04-21 19:47:29 -05:00
PabstMirror
9bd66bc40f
Cleanup scopeCurator
2016-04-21 15:07:13 -05:00
PabstMirror
c432ce714e
Make explosives helpers hidden in eden.
2016-04-21 13:56:32 -05:00
PabstMirror
097bba9b68
Spaces
2016-04-21 13:21:55 -05:00
PabstMirror
4214e31678
Fix BIS gesture keybinds
...
- From #3635 - FUNC(playSignal) needs "BIgesture" prefix
- Interaction conditions are checked on parent, don't need on every
child
2016-04-21 13:15:35 -05:00
Glowbal
392012bb4b
Merge pull request #3702 from acemod/dayVector
...
Add day (non night vision) version of the vector 21
2016-04-20 18:01:59 +02:00
PabstMirror
c2126c3bd4
Simplify binocular check
2016-04-20 10:48:25 -05:00
PabstMirror
cf9479efab
Non-hardcoded binocular / vector detection
2016-04-20 10:40:00 -05:00
PabstMirror
3adbb59f04
Geforce - Change default to aircraft only
2016-04-19 23:04:51 -05:00
PabstMirror
236ad912af
Gforces - Add ace_setting to only run in aircraft
2016-04-19 12:59:41 -05:00
Glowbal
db5d1d42b7
Merge pull request #3703 from acemod/fix-redundant-privates
...
Fixed redundant privates in setCardiacArrest
2016-04-18 15:39:35 +02:00
BaerMitUmlaut
65ccf66d00
Fixed redundant privates in setCardiacArrest
2016-04-18 15:23:04 +02:00
PabstMirror
23632281cf
Add day (non night vision) version of the vector 21
2016-04-17 23:22:41 -05:00
jonpas
0762e13816
Merge pull request #3655 from acemod/improveCargoXEH
...
Improve cargo initialization XEH
2016-04-17 11:29:09 +00:00
jonpas
10cadb535f
Merge pull request #3631 from acemod/customTaggingTextureSupport
...
Add support for custom textures in tagging
2016-04-17 11:28:14 +00:00
PabstMirror
7bd2378c41
Concertina Wire - Don't recoil broken wire, fix killer
...
Close #3695
- Don't recoil broken wire
- Use midpoint to search for nearby cars, and ensure the veh was moving.
2016-04-16 12:54:33 -05:00
Glowbal
f8fb75247d
Merge pull request #3693 from acemod/fixShipViewDistance
...
Fix ship view distance using foot instead of vehicle setting
2016-04-16 12:45:58 +02:00
PabstMirror
32cd23076f
Merge pull request #3690 from acemod/engineRepairMsg
...
Clarify repair while engine is running
2016-04-15 15:56:52 -05:00
jonpas
d90fc3dd06
Fix variable name and header examples
2016-04-14 18:58:01 +02:00
PabstMirror
d523ef1fcd
Try to use cursorObject first
2016-04-14 10:57:36 -05:00
jonpas
839d067797
Exclude base FRIES class
2016-04-14 17:38:11 +02:00
jonpas
300d069e78
Exclude FRIES from repair interactions
2016-04-14 13:59:31 +02:00
jonpas
04831267f2
Use lazy evaluation
2016-04-14 13:55:15 +02:00
jonpas
dec266a546
Fix ship view distance using foot instead of vehicle setting, Cleanup view distance component
2016-04-14 13:52:20 +02:00
PabstMirror
3360047204
Better handle unloading on slopes
...
Close #3667
2016-04-13 13:05:32 -05:00
PabstMirror
f16a65f381
Fix default
2016-04-12 20:05:56 -05:00
PabstMirror
4f6b11c2a6
Clarify repair while engine is running
...
#3348
- Show action, but exit and show warning when selected
- Optional (default off) setting to auto shut off engine to keep
compatibility with missions
2016-04-12 20:04:12 -05:00
PabstMirror
d7b0bde1ca
Fix Wildcat attach point
2016-04-12 12:28:48 -05:00
PabstMirror
5d70db3d9b
LoadPerson - Only try vehicles that have room
...
Fix #2965
The FRIES is a "Helicopter" so we were trying to load into it, because
it was closest.
Also disable Cargo system on it so we don't load other things into it
And remove all interactions on it as well.
2016-04-12 12:12:49 -05:00
PabstMirror
3744b980f4
Javelin - Verify player has LOS to cursorTarget
...
Fix #3668
2016-04-12 02:14:06 -05:00
PabstMirror
2869a53e6d
Googles - Only play wipe anim for primary weapon
...
Close #3638
Animation only makes sense for primary weapon, so skip for others.
2016-04-12 00:19:24 -05:00
James McCartney
153cd28f94
Change event name to weaponJammed
2016-04-11 23:09:45 +01:00
James McCartney
121c45eb84
Raise a local event when a weapon is jammed
2016-04-11 22:29:33 +01:00
jonpas
ccaec31a90
Use new QFUNC and QEFUNC macros
2016-04-08 20:43:26 +02:00
jonpas
014421e8ed
Remove redundant quoted function macro defines
2016-04-08 20:41:54 +02:00
jonpas
0c124a2af0
Remove redundant macro define
2016-04-08 20:35:50 +02:00
jonpas
85b4366368
Use new QPATHTOF and QPATHTOEF macros
2016-04-08 20:34:50 +02:00
Glowbal
f409ce8248
Add config style validation
2016-04-07 19:55:10 +02:00
PabstMirror
f8b46e859c
Wait until postInit to install playerChanged event
2016-04-03 23:36:38 -05:00
jonpas
d931eb4e15
Improve XEH adding in cargo
2016-04-03 14:17:16 +02:00
jonpas
357045a0ed
Merge pull request #3518 from ColdEvul/CargoAndInteractionCase
...
Carry, drag and load metal and plastic cases
2016-04-03 11:43:11 +00:00
jonpas
3abb3d321c
Merge branch 'master' into customTaggingTextureSupport
2016-04-03 13:41:26 +02:00
jonpas
f4074e981a
Merge pull request #3529 from acemod/tagEvents
...
Throw a globalEvent when a tag is created.
2016-04-03 11:38:24 +00:00
jonpas
caf06f58c8
Add map altitude to GPS - fix #3650
2016-04-02 18:53:34 +02:00
nomisum
5c87161118
fixed logic problem
2016-04-02 15:53:39 +02:00
nomisum
02e3e1c7ec
Merge remote-tracking branch 'refs/remotes/acemod/master'
2016-04-02 15:39:44 +02:00
nomisum
fed4662884
changed suggested lines to ace standards
2016-04-02 15:36:21 +02:00
Nicolás Badano
ec2c331bd9
Merge pull request #3644 from J3aLeiNe/master
...
fnc_getMGRSdata update1
2016-04-02 09:23:29 -03:00
commy2
a7cf010f7a
Merge pull request #3648 from acemod/fixtagging_master
...
fix script error in tagging
2016-04-02 10:12:38 +02:00
J3aLeiNe
4576ea0194
abbottabad altitude fix
...
altitude 0 for altitude 1256
2016-04-02 09:50:50 +02:00
PabstMirror
84c5a0d266
FCS - Minor firedEH optimization
2016-04-01 21:51:22 -05:00
jonpas
31953c5d52
Merge pull request #3635 from acemod/fixInvertedGestureStopFreeze
...
Fix inverted gestures Stop and Freeze and minor gestures cleanup
2016-04-01 19:30:48 +00:00
jonpas
723d27fc99
Rename tagging action classes
2016-04-01 21:29:03 +02:00
jonpas
fbaae2beb3
Fix stringtable casing
2016-04-01 21:25:00 +02:00
jonpas
9f7f176b1f
Merge branch 'master' into customTaggingTextureSupport
2016-04-01 21:24:31 +02:00
J3aLeiNe
d4a7d864aa
fnc_getMGRSdata update1
2016-04-01 11:53:33 +02:00
J3aLeiNe
093da2badf
Merge branch 'master' into master
2016-03-31 22:22:50 +02:00
PabstMirror
e104b0ac55
Merge pull request #3640 from acemod/fixZeusAutoAdd
...
Delay calling addCuratorEditableObjects for a frame
2016-03-31 10:04:44 -05:00
J3aLeiNe
c998ab622e
fnc_getMGRSdata update1
...
fnc_getMGRSdata update1
2016-03-31 14:41:09 +02:00
bux578
076803951d
Merge pull request #3628 from alef/translation/15bn/alef
...
Italian translation
2016-03-31 06:54:31 +02:00
commy2
92af6ffe2e
add cargo space to csat attack heli (can transport 8 troops)
2016-03-31 01:03:40 +02:00
commy2
28468bec82
specify helicopter cargo spaces, fix #3591
2016-03-31 00:57:04 +02:00
Joko
6038ab89c9
improve Code to String
2016-03-30 23:02:52 +02:00
PabstMirror
6f412c312a
Delay calling addCuratorEditableObjects for a frame
...
Fixes createVehicle not always being added on dedicated server.
2016-03-30 10:26:33 -05:00
PabstMirror
a83c3b5219
Merge pull request #3623 from acemod/fixAbTerrainProcessor
...
Fix AB Terrain Extension
2016-03-29 13:08:14 -05:00
commy2
89428dc55c
Merge pull request #3624 from acemod/compatPboWarnings
...
Compat pbo warnings
2016-03-29 17:01:53 +02:00
commy2
a4c848a090
formating
2016-03-29 17:00:54 +02:00
jonpas
ec2be36e81
Use boolean
2016-03-29 16:25:55 +02:00
jonpas
2d22b06150
Add README.md to gestures and update author URL
2016-03-29 16:08:33 +02:00
jonpas
330977a709
Remove including DIK KeyCodes definitions, use decimal codes, Improve BI gesture handling even further
2016-03-29 16:03:41 +02:00
jonpas
3489dd48bb
Remove unused gestures, Improve stringtabling and remove duplicate
2016-03-29 15:51:51 +02:00
commy2
49f6904f9e
Merge pull request #3634 from acemod/fixerrornoname
...
fix FUNC(setName) for Zeus and alive spawned units
2016-03-29 15:48:19 +02:00
jonpas
c24c1b9dc0
Fix inverted Stop and Freeze - prone Stop will still be freeze due to BI animation being wrong
2016-03-29 15:39:32 +02:00
commy2
4e1b2dd24a
just delay setName one frame
2016-03-29 15:32:05 +02:00
commy2
1f6f90a5b2
fixerrornoname
2016-03-29 13:59:07 +02:00
commy2
666a4030b5
make FUNC(scriptedExplosive) work in scheduled env, ref #3621
2016-03-29 13:21:13 +02:00
jonpas
6469b11f3c
Cleanup tagging, use internal getTexture for getting texture from color, move tag size definition
2016-03-28 20:07:02 +02:00
jonpas
dc1af390cd
Allow custom texture for tagging (only direct function call)
2016-03-28 18:44:30 +02:00
PabstMirror
bcde9f8ed6
Filter minor falling damage to non-leg hitpoints
2016-03-28 01:15:58 -05:00
Alessandro Foresi
e97c7c0f65
Translation: IT completed (with BOM)
2016-03-27 21:22:15 +02:00
Alessandro Foresi
e5a7578f92
Translation: IT completed (no BOM)
2016-03-27 21:20:15 +02:00
PabstMirror
e90609d043
Fix AB Terrain Extension
2016-03-24 12:23:48 -05:00
PabstMirror
86ad2ab415
Only warn for weapon compat if AB is on
2016-03-24 11:53:55 -05:00
PabstMirror
b0df31783d
Merge branch 'master' into compatPboWarnings
2016-03-24 11:23:29 -05:00
SzwedzikPL
174e69c3a5
move dogtag macros to CfgWeapons
2016-03-23 17:33:08 +01:00
SzwedzikPL
9b1b4a46fa
better polish translation
2016-03-23 17:17:16 +01:00
SzwedzikPL
cdcde46a7d
Fix double displayName in medical settings
2016-03-22 13:05:47 +01:00
SzwedzikPL
10d20472d3
Remove grass behind the trench
2016-03-22 11:26:40 +01:00
SzwedzikPL
203c059cc1
move placement data to config, setTrenchPlacement fnc, cleanup
2016-03-22 08:10:37 +01:00
Nicolás Badano
b4f6dbbc18
Merge pull request #3568 from acemod/settingsNameDescp
...
Ace_Settings - add name,descption,categories
2016-03-21 21:24:22 -03:00
SzwedzikPL
d6e9890b1b
Add remove trench and continue digging trench actions
2016-03-21 18:25:38 +01:00
esteldunedain
ec2920ed35
Improve protractor accuracy. Close #3606
2016-03-20 22:24:30 -03:00
commy2
5aeb19312b
fix script error in tagging
2016-03-20 17:09:03 +01:00
commy2
a841839aa6
don't overwrite helicopter sub class self actions
2016-03-19 19:37:26 +01:00
SzwedzikPL
1cdecf75da
double dogtag support, fix addDogtagItem event in mp, unconscious units support, little cleanup
2016-03-19 18:12:18 +01:00
SzwedzikPL
ca3171a33a
Initial commit dogtags
2016-03-19 16:17:26 +01:00
SzwedzikPL
8555f00889
remove needless tolower from mortarinit
2016-03-18 17:26:37 +01:00
Thomas Kooi
daceaa9dd8
Merge branch 'master' into settingsNameDescp
2016-03-18 14:48:11 +01:00
Thomas Kooi
e8b26a7a14
Merge pull request #3593 from BaerMitUmlaut/release
...
Fixed fastroping race condition
2016-03-18 12:07:43 +01:00
BaerMitUmlaut
fc06782256
Fixed broken ropeDetach
2016-03-18 00:16:31 +01:00
BaerMitUmlaut
b25ffdb54f
Fixed network race condition
2016-03-18 00:15:57 +01:00
commy2
5e52e22e81
Merge branch 'release' into fixNametagsRank
2016-03-17 20:14:40 +01:00
PabstMirror
218d333738
Fix nametag error when rank is empty string
2016-03-17 11:56:20 -05:00
Glowbal
485900dce8
increment patch version
2016-03-16 22:59:28 +01:00
Thomas Kooi
559d111e66
Merge pull request #3584 from SzwedzikPL/fixmk6mortarinit
...
Fix mortar ammo handling init on dedicated
2016-03-16 22:48:49 +01:00
commy2
0c42bb5345
Merge branch 'release' into revc65656a0
2016-03-16 22:44:19 +01:00
jonpas
72c9e9da39
Replace usage of filter to select in tagging
2016-03-16 20:17:23 +01:00
jonpas
c568c18865
Add module icon
2016-03-14 19:14:52 +01:00
jonpas
89924e927a
Disable debug
2016-03-14 17:25:20 +01:00
Nicolás Badano
8ff4fb8851
Merge branch 'release' into revc65656a0
2016-03-14 12:21:11 -03:00
esteldunedain
14183470bc
Revert "Improved rope glitchyness"
...
This reverts commit c65656a016
.
2016-03-14 12:16:23 -03:00
SzwedzikPL
32846014a1
fix ammo handling init on dedicated
2016-03-14 14:21:02 +01:00
PabstMirror
2ab169eb73
Merge branch 'release' into FixTrue
2016-03-12 13:46:44 -06:00
PabstMirror
1985e7e20a
Fix versioning true when compiled
2016-03-12 13:42:52 -06:00
Thomas Kooi
61f1959109
Fix morphine increasing viscosity
...
Morphine should decrease viscosity instead of increase. Closes #3579
2016-03-12 18:55:42 +01:00
commy2
fca8b51bb2
reset interaction menu time variables on save game load
2016-03-12 17:08:08 +01:00
esteldunedain
aad79eda85
The dead shouldn't interact (it's not TWD)
2016-03-12 10:06:45 -03:00
jonpas
32c32b6cc5
Add stamina bar selective UI
2016-03-09 18:58:46 +01:00
PabstMirror
ad3a03a9c7
versioning - Add warnings for missing compat PBOs
2016-03-08 13:52:34 -06:00
PabstMirror
94adcf4ccb
MicroDagr Scalar Values
2016-03-08 13:17:20 -06:00
esteldunedain
3122542814
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2016-03-08 15:25:04 -03:00
esteldunedain
69bd858167
Merge branch 'fr-fix-quotes' of https://github.com/BaerMitUmlaut/ACE3 into BaerMitUmlaut-fr-fix-quotes
...
Conflicts:
addons/fastroping/CfgMoves.hpp
addons/fastroping/CfgVehicles.hpp
2016-03-08 15:24:23 -03:00
BaerMitUmlaut
3710c04da4
Use head instead of body direction for compass
2016-03-08 19:22:04 +01:00
Thomas Kooi
bfe738ba80
Merge pull request #3513 from acemod/cbaVersioning
...
Add CBA 2.3.1 to versioning check
2016-03-08 19:21:36 +01:00
BaerMitUmlaut
f18094e7e4
MicroDAGR OS Upgrade
2016-03-08 19:21:28 +01:00
Thomas Kooi
ddd8187b19
Merge pull request #3534 from GitHawk/refuel_isEngineOn
...
Disallow refueling with running engine
2016-03-08 19:20:28 +01:00
esteldunedain
2b33dd7686
Merge branch 'fr-ai-deploy' of https://github.com/BaerMitUmlaut/ACE3 into BaerMitUmlaut-fr-ai-deploy
...
Conflicts:
addons/fastroping/XEH_preInit.sqf
2016-03-08 15:13:50 -03:00
esteldunedain
88f4c49c08
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2016-03-08 15:08:53 -03:00
esteldunedain
afe835816f
Merge branch 'fr-fixes' of https://github.com/BaerMitUmlaut/ACE3 into BaerMitUmlaut-fr-fixes
...
Conflicts:
addons/fastroping/CfgVehicles.hpp
2016-03-08 15:07:45 -03:00
commy2
4ceb1b34b8
Merge pull request #3566 from acemod/removeDragCarryFromCannons
...
Disable drag and carry for StaticCannon
2016-03-08 19:05:04 +01:00
jonpas
70100825cf
Fix params in clientInit
2016-03-08 18:49:19 +01:00
PabstMirror
1a77b0fcd4
Disable drag and carry for StaticCannon
...
#3528
2016-03-08 11:43:35 -06:00
jonpas
e90ef30904
Add return value to public setElementVisibility function
2016-03-08 18:42:37 +01:00
jonpas
23e2617db8
Change params order and improve clientInit
2016-03-08 18:40:23 +01:00
Thomas Kooi
60af0d3162
Merge pull request #3456 from acemod/StandardizeConfigArrayGVAR
...
Standardize GVAR array brackets in configs.
2016-03-08 18:19:50 +01:00
jonpas
64fe944b0f
Add public setter function, Optimize some checks
2016-03-08 18:12:01 +01:00
PabstMirror
3232654e13
Close #3565 -Fix spelling of local var _woundEffectiveness
2016-03-08 11:02:54 -06:00
PabstMirror
b5e95f3945
Add some names/descriptions to settings configs
2016-03-08 01:17:40 -06:00
commy2
e605ede04a
execute addActionEvents in unscheduled env
2016-03-08 01:19:32 +01:00
BaerMitUmlaut
35857f4523
Cleanup canPrepareFRIES
2016-03-07 20:42:13 +01:00
Thomas Kooi
d86f58f418
Merge pull request #3525 from acemod/sandbag3den
...
Set sandbag side to civ to show in 3den
2016-03-07 19:30:24 +01:00
Thomas Kooi
8946779c1a
Merge pull request #3527 from acemod/fixHrCallbackVar
...
Fix empty callback for hr adjustment
2016-03-07 12:51:23 +01:00
BaerMitUmlaut
c65656a016
Improved rope glitchyness
2016-03-06 20:33:23 +01:00
BaerMitUmlaut
84af4b7676
Force open ramps on helicopters
2016-03-06 19:53:37 +01:00
commy2
a85c5b14cf
Merge pull request #3547 from acemod/fixsavegamecrashmaybe
...
Store Interact Menus on CBA Namespaces
2016-03-06 19:28:26 +01:00
commy2
a9578ab473
Merge pull request #3524 from acemod/fixCancelAction
...
Fix Cancel (RMB) Action
2016-03-06 19:16:40 +01:00
commy2
81c29d8120
Merge pull request #3551 from acemod/disableOnlyActionMenuOnMouseHint
...
Disable only action menu on mouse hint and modifier where unnecessary
2016-03-06 19:13:10 +01:00
commy2
391aaeba89
Merge pull request #3548 from acemod/namespaceforcargofilters
...
use namespace for cargo filters, fixes problem with save games
2016-03-06 19:10:53 +01:00
commy2
c90775091e
Merge pull request #3549 from acemod/fixmagincompat
...
remove obsolete fix, fix #3545
2016-03-06 19:10:45 +01:00
jonpas
858c68f8d7
Don't use modifier for rotation where not needed
2016-03-06 16:54:27 +01:00
jonpas
c378cd9f12
Disable action menu on mouse hint with inGameUISetEventHandler rather than showHud, as showHud disables UI script commands
2016-03-06 16:47:46 +01:00
jonpas
f956675d35
Merge pull request #3542 from acemod/refuelGlobalEvents
...
Replace execRemoteFnc with events and increase fuel update delay in refuel
2016-03-06 16:23:02 +01:00
jonpas
b47b887a21
Fix event name already being used
2016-03-06 16:20:16 +01:00
jonpas
9b46e8856e
Merge modules, Add base allow client settings toggle, Add requires descriptions
2016-03-06 15:41:17 +01:00
jonpas
a064c0c98d
Modernize code
2016-03-06 12:50:16 +01:00
jonpas
0dc1e37874
Merge branch 'master' into uiSettings
2016-03-06 12:41:27 +01:00
jonpas
52007fab6a
Add sanity checks, fix explosives checks
2016-03-06 12:06:17 +01:00
commy2
79db282aca
remove obsolete fix, fix #3545
2016-03-06 09:12:49 +01:00
commy2
8892aeed9d
missed one
2016-03-06 07:55:34 +01:00
commy2
8603f2062a
simplify
2016-03-06 07:14:43 +01:00
commy2
f43b287093
use namespace for cargo filters, fixes problem with save games
2016-03-06 06:53:59 +01:00
commy2
6a58af5b33
fix save game crash?, ref #3397
2016-03-06 06:22:38 +01:00
esteldunedain
ae8cbb4834
Add "check temperature" and "swap barrel" actions for AARs
2016-03-05 23:33:30 -03:00
jonpas
ae3a41e6d8
Move common event handlers closer to their counterparts
2016-03-06 02:38:05 +01:00
Nicolás Badano
de6af27912
Merge pull request #3492 from acemod/Fix3491_MortarBoxes
...
Replace transportMax... with maximumLoad for mortar boxes.
2016-03-05 22:09:07 -03:00
Nicolás Badano
9f205b4a54
Merge pull request #3509 from acemod/fix3379
...
Increase interaction distance with explosives from 1m to 1.5m.
2016-03-05 22:08:31 -03:00
Nicolás Badano
1d3950bfff
Merge pull request #3497 from acemod/liteDrag
...
Fix portable light floating / dir when carrying
2016-03-05 22:07:43 -03:00
Nicolás Badano
e2c2495d52
Merge pull request #3496 from looterz/bftbug
...
Fix for player markers not showing up correctly with BFT_ShowPlayerNames
2016-03-05 22:05:33 -03:00