Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,416 Commits 73 Branches 88 Tags 752 MiB
0bccaf698d
Commit Graph

10416 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
commy2
8ddc025a16 Merge pull request #4060 from acemod/tweakSpottingScope 
Tweak spotting scope anims / mem points
 2016-07-07 09:02:05 +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
Glowbal
62a0c49fc2 Merge pull request #4056 from acemod/fixReviveLoop 
Fix order of revive loop
 2016-07-06 13:40:20 +02: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
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
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
Nicolás Badano
287adb16e6 Merge pull request #4040 from acemod/fixObscuedInteractionPoints 
Less aggressive overlap detection
 2016-07-03 17:33:10 +02:00
PabstMirror
bbc708e3e0 Less aggressive overlap detection 
Ensure the 2d screen pos distance is significant.
 2016-07-02 22:46:36 -05:00
Nicolás Badano
f2359cb243 Merge pull request #4037 from acemod/fixCargoSpareParts 
Fix cargo event name - spare parts not being added
 2016-07-02 14:19:23 +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
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
a47168e31b Merge pull request #4019 from acemod/customizable-faction 
add possibility to overwrite a units faction for determining name tags
 2016-06-29 20:16:21 +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
Glowbal
2fa8141721 Merge pull request #4022 from acemod/apexLauncherConfig 
Add javelin configs for new apex launchers
 2016-06-29 12:03:37 +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
f1bf5f8e7b Merge pull request #4013 from acemod/fix-color-medicaldisplay 
Fix injuries shown as blue instead of red
 2016-06-27 19:57:52 +02: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
3928d8a2cb Merge pull request #4005 from acemod/tagUpward 
Align tags upward in non-horizontal surfaces
 2016-06-27 19:03:08 +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