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
14,739 Commits 73 Branches 88 Tags
3b42998f7b
Commit Graph

1494 Commits

Author SHA1 Message Date
commy2
d6a88ac34a
Merge pull request from xrufix/AimCoef 
Add ability to set aiming coefficient for mission scripting.
 2018-05-16 07:53:09 +02:00
classic
2cd4615d5d Update Japanese translations () 
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation
 2018-05-11 08:39:32 -05:00
Dystopian
c35a53ba79 Clean up deprecated in 3.13 2018-05-05 21:54:13 +03:00
mharis001
7239ad561f Change ACE Hint preview () 2018-04-15 13:14:31 -05:00
commy2
ede072cd5c
getMissionConfigValue instead of missionConfigFile 2018-04-15 12:59:14 +02:00
rufix
b6b58d4860 Update headers 2018-04-10 03:55:28 +02:00
Dedmen Miller
50abe911a5 Change stringToColoredText to accept a hex string () 2018-04-09 16:20:03 +01:00
commy2
1835ccebb8 Fix empty return value of getUnitTrait () 2018-02-21 11:05:17 +01:00
Dystopian
e683c524d7 Map - Add Camping Light support () 
* Add Camping Light support

* Add intensity check
 2018-02-13 13:27:57 -06:00
PabstMirror
c864a6d569 Vehicle Lock - Convert to cba settings () 
Switch vehicleStartingLockState from slider to list
Close
2018-02-10 03:32:14 +01:00
PabstMirror
2b89b3102b HuntIR - Register as a feature cam (block NVG border) () 
Fix
2018-02-10 03:31:38 +01:00
Dystopian
59783a2e7a Small changes to persistent laserpointer () 2018-02-09 15:31:05 -06:00
PabstMirror
ba5d44b848
Allow displayTextStructured to be moved via game layout settings () 
* Allow displayTextStructured to be moved via game layout settings

Fix 

* Fix comment, add upperleft bounds check
 2018-02-09 14:27:40 -06:00
PabstMirror
9e213f0e9a
Fix movedToSQF () 2018-02-09 14:27:21 -06:00
God of Monkeys
3c697ca80b Chinese Language Update () 
Chinese Language Update
 2018-02-07 15:15:15 -06:00
BrenSilent
4258b9a6d6 [German Translation] Update for new Settingsmenu () () 
* German translation update

This updates partially the german translation for the new cba settings UI

* Fix tooltipp

Fixes the tooltipp for the safezone when switching units

* Fixes

Various fixes after review

* Missed two

Fix in stringtable for arsenal

* Gonna catch em all

Another small mistake i missed.
 2018-02-01 12:09:11 -06:00
sbng-PAPA
6ce8b8473a korean translate 3.12.x () 2018-01-28 15:42:32 -06:00
Dystopian
70ca4d01a7 Fix house-type object carrying in building () 2018-01-15 19:02:06 +01:00
PabstMirror
00ba133b21 Dev helper function to convert settings to code () 
* Dev helper function to convert settings to code

* fix double //

* Add movedToSQF config

* Fix paramArray settings

* Add movedToSQF to moveMarkers

* Add tabs
 2018-01-07 02:46:47 +01:00
Josuan Albin
0acbde1489 Various ACE Arsenal fixes (see description) () 
* Copy the array properly when using preStart cache in openBox

* Fix add and removeVirtualItems erroring out when passing false as arg

* Disable face, voice, and insignia tabs in 3DEN

* Move grenadeList and putList outside of foreach in scanConfig

* Fix grenadeList and putList indentation

* Change the camera handling in onArsenalClose

Fixes the camera not being focused on the player after using ACE Arsenal on an other unit outside of zeus / 3DEN.
Remove the code that moved the curatorCam near the edited unit after ACE Arsenal is closed.

* Fix message control overflowing, move width defines to defines.hpp

* Add ability to exit arsenal and not apply a loadout in 3DEN

* Add ACE3 logo to common, fix config pathing to a non existing file
 2018-01-05 18:56:21 +01:00
SilentSpike
33e25535c9
Deprecate common function numberToDigitsString () 
* Deprecate common function numberToDigitsString
 2018-01-02 17:00:01 +00:00
commy2
183fc93c5a
Merge pull request from acemod/fishykins-master 
add allowFadeMusic setting
 2018-01-02 17:12:47 +01:00
commy2
ef77bb077e
Merge pull request from acemod/setHidden-forgetTarget 
make setHidden use forgetTarget
 2018-01-02 16:28:10 +01:00
commy2
32755e4e91
forget only different side 2018-01-02 16:26:13 +01:00
commy2
be56c991ed
Update stringtable.xml 2018-01-02 16:00:35 +01:00
commy2
f8ff279c6b Merge branch 'master' of https://github.com/acemod/ACE3 into medical-rewrite 2018-01-02 15:11:14 +01:00
commy2
68228e9fef merge 2018-01-02 15:06:53 +01:00
commy2
6a70ab1ff4 allowFadeMusic setting 2018-01-02 14:57:19 +01:00
commy2
6dec4c8259 Merge branch 'master' of https://github.com/fishykins/ACE3 into fishykins-master 2018-01-02 14:37:13 +01:00
Dystopian
03ade05611 Add parentheses to GETVAR macros 2017-12-30 16:38:45 +03:00
commy2
13e52b4410 make setHidden use forgetTarget 2017-12-29 02:48:20 +01:00
commy2
4db844e596 merge 2017-12-23 01:47:43 +01:00
Christian Klemm
ead5fb4a5e Added config params for white/blacklisting digging () 
* Added config params for white/blacklisting digging

* changed to canDig option

* Update README.md

* Update fnc_canDig.sqf
 2017-12-20 15:41:50 -06:00
commy2
801afb3061 update extension check () 2017-12-20 15:41:06 -06:00
SilentSpike
2bf67ea057 Use common icon function for vehicle actions () 
* Use common icon function for vehicle actions

* Always create vehicle icon namespace
 2017-12-20 14:30:50 -06:00
PabstMirror
c2d6fa53d4
Remove enum warnings () 2017-12-19 12:13:38 -06:00
PabstMirror
e6683e8077
Add slider settings () 
* Add slider settings

* WARNING to INFO

* tweak scopes / adv fatigue
 2017-12-16 11:51:15 -06:00
commy2
0eccca6174 display carried weight in SI and imperial () 2017-12-16 04:50:17 +01:00
Andrea Verano
2ecc835438 Italian Translation Update () 
Added new strings in:
-Advanced ballistics
-Arsenal
-Common
-Cookoof
-Interaction
-Nightvision
-Parachute
-Repair
-Scopes

Fixed some strings in:
-Medical
-Scopes
 2017-12-14 23:32:51 -06:00
Christian Klemm
d83ce62ee8 Adjusted dig surface whitelist for jungle maps () 
* Added grasstall to dig surface whitelist

* Added forest to dig surface whitelist
 2017-12-12 17:20:55 +01:00
classic
51f29b7b37 Update Japanese translation () 
* Update Jpn translation

* Update Jpn translation

* Add Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn tranlastion

* Update Jpn tranlation

* Update Jpn translation

* Updatr Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* fix for incorrect indentation

* re-fix incorrect indentation
 2017-12-12 17:17:51 +01:00
PabstMirror
2aaef9e791
Fix some undefined funcs / strings () 
* fix missing respawn func / spectator string

* fix readSettingsFromParamsArray, cleanup spec event

* cleanup usless if statement
 2017-12-11 13:10:30 -06:00
PabstMirror
be67cf0737
Transfer old client settings to CBA () 
* Transfer old client settings to CBA

* Remove cleanup code
 2017-12-10 12:13:17 -06:00
PabstMirror
61c99cb5d8
Attempt to make enum errors more clear () 
* Add note to enum script error

* Bump Arma/CBA versions

* req 1.78
 2017-12-08 21:39:35 -06:00
Dedmen Miller
18d4b9660d Add endRadioTransmissions Event () 
* Add endRadioTransmissions Event

* Update fnc_endRadioTransmission.sqf
 2017-12-08 10:44:24 -06:00
commy2
44912253af
Merge pull request from acemod/avoid-setCaptive 
replace usage of setCaptive with camouflageCoef trait
 2017-12-07 23:08:37 +01:00
commy2
24214fc576 Add zeus-like compass control to common () 2017-12-07 21:51:57 +00:00
PabstMirror
6a6b03eb57 Fix undefined var 2017-12-07 12:45:59 -06:00
commy2
2ca398ea71
Merge branch 'master' into avoid-setCaptive 2017-12-07 19:11:09 +01:00
Dystopian
36b61fdb6e Block adv. throwing when player is busy () 
* Add throw blocking status effect

* Add concertina_wire and tripod support

* Add launcher in hands support

* Disable effect sending more than once

* Fix EFUNC using, add trace

* Disable vanilla throw blocking

* Improve status handling

* Fix rearm status key
 2017-12-07 11:26:21 -06:00