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,193 Commits 73 Branches 88 Tags 752 MiB
d8fb60808a
Commit Graph

14193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PabstMirror
9e213f0e9a
Fix movedToSQF (#6124) 2018-02-09 14:27:21 -06:00
PabstMirror
e8da3e6435
Arsenal - Pass arsenal dispay to displayOpened event (#6109) 2018-02-08 13:42:07 -06:00
PabstMirror
5bef98d4ff
Decrease direct hit damage done by AGM-114N (#6121) 
Fix #6114
 2018-02-08 12:32:01 -06:00
PabstMirror
73e7ad5c79
Scopes - Use real zero for non-adjustable scopes (#6128) 2018-02-08 12:01:41 -06:00
Thomas Kooi
4179548417 Sort directories before extracting dependency information 2018-02-07 22:40:37 +01:00
ace3mod
f0b7203105 [Docs] Update component dependencies 
Automatically committed through Travis CI.

[ci skip]
 2018-02-07 22:15:51 +01:00
God of Monkeys
3c697ca80b Chinese Language Update (#6130) 
Chinese Language Update
 2018-02-07 15:15:15 -06:00
ace3mod
4534353e94 [Docs] Update component dependencies 
Automatically committed through Travis CI.

[ci skip]
 2018-02-06 21:31:02 +01:00
Thomas Kooi
f5e1a23ff2 Disable running deploy script on Travis CI 2018-02-06 21:30:09 +01:00
Thomas Kooi
ddf7046c44 Add run deploy job on master branch 2018-02-06 21:30:09 +01:00
BaerMitUmlaut
7b50d4a7a6 Add seperate setting for noise intensity (#6059) 2018-02-06 13:38:23 -06:00
jonpas
cdf6218619 Merge branch 'master' into armake 2018-02-06 19:51:15 +01:00
Thomas Kooi
0ab8c1dde8 Use CI Python Docker image to speed up build times 2018-02-06 19:46:12 +01:00
jonpas
c20c980486 Remove armake from CircleCI for now 2018-02-06 15:20:40 +01:00
jonpas
a28b2af05c Fix CircleCI 2018-02-06 15:15:00 +01:00
jonpas
8016f3de1d Disable armake building on CircleCI until image with tools is used 2018-02-06 15:12:21 +01:00
jonpas
03f4afd62a Remove apt-get in build process (missed before) 2018-02-06 15:09:29 +01:00
jonpas
390048662b Add used A3 material includes 2018-02-06 15:05:37 +01:00
jonpas
fb46fe7fe2 Use CirceCI dependencies 2018-02-06 15:04:48 +01:00
jonpas
c0f205fb8e Add armake building to CircleCI 2018-02-06 15:00:17 +01:00
jonpas
7df35808b6 Update version number in extensions 2018-02-06 14:53:08 +01:00
jonpas
59204b8999 Update includes, Ignore excessive concatenation (until armake supports ignoring include warnings) 2018-02-06 14:52:25 +01:00
jonpas
c55b6c3d23 Update Makefile (git hash in bisign, version update from central file, commit and push) 2018-02-06 14:48:38 +01:00
jonpas
4068411d84 Add missing A3 include 2018-02-06 14:37:55 +01:00
jonpas
2ac412a406 Merge branch 'master' into armake 2018-02-06 14:34:07 +01:00
Dystopian
f0a2b68f3d Aircraft - Disable scripted eject if vehicle is locked (#6096) 
* Add lock check

* Delete seat lock check
 2018-02-04 12:47:54 +01:00
mharis001
27504468e4 Change cargo menu to look better (#6112) 2018-02-01 16:41:56 -06:00
BrenSilent
4258b9a6d6 [German Translation] Update for new Settingsmenu (#6015) (#6016) 
* 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
Jo David
db93a42891 add muffling to new LOW headsets (#6106) 2018-01-31 16:19:28 -06:00
PabstMirror
1b6dc5ae2d
HuntIR - Fix connecting when ammo is null (#6099) 
Fix #6093

`[_nearestHuntIRs select 0] call FUNC(cam);` would pass nill
Also delay opening GUI for a frame to prevent issue with interaction menu
 2018-01-30 21:50:24 -06:00
PabstMirror
4857294510
Advanced Throwing - Disable when controlling UAV (#6092) 
Close #6069
 2018-01-30 10:54:34 -06:00
mharis001
b30e188d1a Change ace_map settings to use CBA init directly (#5984) 
* Make default channel setting a list

* Convert more map settings to CBA

* Give BFT settings own category

* Remove '?' from end of setting display names

* Fix mistake of ACE_Settings removal (movedToSQF = 1)

* Move settings to initSettings.sqf
 2018-01-28 15:50:28 -06:00
sbng-PAPA
6ce8b8473a korean translate 3.12.x (#6071) 2018-01-28 15:42:32 -06:00
Josuan Albin
29a0b2ef09 Misc arsenal fixes (#6083) 
* Change backpack and scope checks in scanConfig and addVirtualItems

Reason: was not a good implementation
Might cause issue of people compalining about tents.

* Give IDC to menuBar controls, disable import button in MP

Reason: copyFromClipboard is disabled in MP

* Add tooltip strings for the loadouts, export, import menu buttons

* Remove double space in onArsenalOpen
 2018-01-28 15:39:46 -06:00
Brunius
cc503e041b Add pylon whitelist option (#6080) 
* Adding pylon whitelist option

* Changing tabs to spaces :(

* Changing to use QGVAR

* Changing name in QGVAR to more clearly reflect function of variable

* Docs for the magazine whitelist function in pylons

* Changes to match style guide

* More docs

* More tabs

* Update pylons-framework.md

* Update pylons-framework.md
 2018-01-28 15:38:48 -06:00
BaerMitUmlaut
3c04d61a0d Fix medical AI activation (#6077) 2018-01-24 19:08:39 +01:00
Mark Ruffner
f46082a1fe fix (another) missing call (#6079) 2018-01-24 08:18:42 +01:00
Mark Ruffner
8ba81c53a3 Add spectator handling of grenades (#6012) 
* Handle non-local vanilla grenade tosses

* handle advanced throwing grenades

* Track through events

* Add missing calls
 2018-01-23 00:31:44 +01:00
PabstMirror
46a31e1f9c Add ace hellfire support to rhs apaches (#6056) 
Close #5956
 2018-01-22 23:15:23 +01:00
Laid3acK
9a9a2d0944 R3F compat: dispersion overhaul & AtragMx presets (#6003) 
* dispersion_overhaul

* atragmx_presets
 2018-01-22 23:09:40 +01:00
Jo David
693b8e468d
Merge pull request #6065 from chris579/patch-1 
Enabled cancel button when exiting arsenal
 2018-01-20 11:22:20 +01:00
Christian Klemm
7ba394c711
Enabled cancel button when exiting arsenal 2018-01-19 18:21:01 +01:00
classic
00af6844cd Update jpn translations (#6031) 
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation
 2018-01-18 20:16:24 -06:00
Drofseh
ab447d2051 fix my own mispelled name 2018-01-18 12:44:55 -08:00
Drofseh
79c68dd39d Add white tracers, adjust red, green, yellow 
- Green, Red, and Yellow tracers have been adjusted a little and show up
better in daylight now
- Added White tracers for bullets and shells
 2018-01-18 04:26:53 -08:00
Drofseh
294eb1872f remove medical treaments changes added in dro/master branch 
See title
 2018-01-17 04:14:51 -08:00
Drofseh
8e7a6c1491 remove unneeded decimals 
- all X.0 have been changed to X with no decimal
 2018-01-17 04:10:16 -08:00
Drofseh
cf5ada14cb tracer adjustment initial commit 
- allows ACE tracers to function properly at night
- all tracer rvmat's values have been changed to be closer or the same
as vanilla tracer rvmat values for the same tracer colour
- ace_shell_tracer_red is now a copy of ace_shell_tracer_yellow, but
using the red texture and rvmat.
This is because it had a completely different model then the other
ace_shell_tracer_xx models that was large, fuzzy, and translucent. it
made red tank tracers look like a big red cloud flying through the air.
* the new values for the rvmat's aren't perfect, but they work I will
probably tweak and test a little more
 2018-01-17 04:06:31 -08:00
Drofseh
5e396a3793
Revert "Update from acemod master (#1)" (#2) 
This reverts commit 4d1a5194ea.
 2018-01-17 03:36:10 -08:00
jonpas
88963cdae8 Prepare release 3.12.1 (build 2) 2018-01-15 21:35:34 +01:00