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
9,768 Commits 73 Branches 88 Tags 752 MiB
46b12bd6c3
Commit Graph

9768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jonpas
46b12bd6c3 Merge pull request #3861 from acemod/unify-deployables 
Unify deployables
 2016-06-03 16:32:52 +02:00
bux578
c0400ff24e Merge pull request #3865 from acemod/huehuehue 
Portuguese translations
 2016-06-03 08:41:41 +02:00
PabstMirror
77baeda976 Merge branch 'master' into huehuehue 2016-06-03 00:01:13 -05:00
jonpas
c110121b1a Merge pull request #3811 from acemod/abolishExecRemoteFnc 
Replace execRemoteFnc with events
 2016-06-02 17:08:01 +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
5c7148de1f Merge pull request #3851 from acemod/huntIR-multipara-fix 
Fixed HuntIR deployment
 2016-06-02 10:38:37 +02:00
Glowbal
5a50751eda Merge pull request #3856 from acemod/fixGogglesCba 
Goggles - Fix script error from CBA_fnc_waitAndExecute
 2016-06-02 10:38:14 +02:00
BaerMitUmlaut
cc83bf64d6 Moved all deployables to equipment submenu 2016-06-02 10:35:33 +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
commy2
13d55313d3 Merge pull request #3848 from acemod/fixCCIP 
Fix vanilla CCIP on A-10
 2016-06-01 11:38:07 +02:00
BaerMitUmlaut
7a8506cefd Update handleFired header comment 2016-05-31 23:12:57 +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
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
f6359907a3 Merge pull request #3669 from acemod/useQuotedPathMacros 
Use new quoted path macros
 2016-05-30 21:23:44 +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
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
bux578
1b5d0ccc7a Merge pull request #3835 from acemod/fix_comma 
replace a comma with semi colon
 2016-05-29 12:02:54 +02:00
commy2
1bd44e562a replace a comma with semi colon 2016-05-29 11:44:00 +02:00
nic547
37068a5247 compat for adr-97 (#3728) 
* Added compat_adr_97 and realisticnames

p90 cyka blyat

* typo

* Added Balistics stuff for p90 compat

* 2 spaces to 4 spaces

* styled my shit

* Name for Hex variants, firemodes for the civilian variant

* Also changed the magzine names

* fixed ubc warning

* fixed my style once again

* my stuff looks even better now ...

* ...
 2016-05-28 18:48:39 +02: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
Nicolás Badano
9cccacd74d Merge pull request #3823 from gpgpgpgp/patch-1 
add a line to support JSRS Eden (getting rid of JSRS explosion sound …
 2016-05-25 10:39:30 -03: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
Glowbal
5e64ee0c6c Merge pull request #3820 from acemod/ffvSafeMode 
Fix Can't toggle safemode in FFV seats
 2016-05-24 11:25:06 +02: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
commy2
36205e3864 Merge pull request #3809 from acemod/improve_getTurretX 
fullCrew new parameter to improve FUNC(getTurretX)
 2016-05-22 17:02:45 +02:00
commy2
bb52c55984 Merge branch 'master' of https://github.com/acemod/ACE3 into improve_getTurretX 2016-05-22 17:01:10 +02:00
jonpas
bd0e05d7d6 Use CBA config functions, return correct value 2016-05-22 16:18:24 +02:00