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
12,068 Commits 73 Branches 88 Tags
Commit Graph

12068 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Kooi
10f19997bd
Armake install (#6356) 
Add building ace3 on CircleCI using armake. It will build it on every commit / PR
 2018-05-20 11:07:00 +02: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
jonpas
88963cdae8 Prepare release 3.12.1 (build 2) v3.12.1 2018-01-15 21:35:34 +01:00
jonpas
7c97e5fab6 Merge branch 'master' into release-3.12.1 2018-01-15 21:34:21 +01:00
Dystopian
70ca4d01a7 Fix house-type object carrying in building (#6049) 2018-01-15 19:02:06 +01:00
Josuan Albin
b7606800a1 Match case for magazines in fillRightPanel (ACE Arsenal) (#6044) 
* Match case for magazines in fillRightPanel

Apparently you can have different case between the entry in the weapon magazines array and its actual configname...

* Add possible fix for the mission end bug

* Add ded's proposed fix, remove closeOnMissionEnd

CloseOnMissionEnd is bugged in 3DEN and force close the display after it's opened
 2018-01-15 18:21:38 +01:00
Thomas Müller
fc037d1bc3 Improve function header documentation guidelines (#6042) 2018-01-11 18:34:51 +00:00
ulteq
a5523bc0c7
ATagMX - Allow one decimal place for the bullet mass (in grams) (#6041) 
Closes: #6040
 2018-01-10 19:44:53 +01:00
jonpas
2303f345af Prepare release 3.12.1 v3.12.1-rc1 2018-01-07 02:49:17 +01:00
PabstMirror
00ba133b21 Dev helper function to convert settings to code (#5752) 
* 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
Dystopian
e24ed0fa92 Fix back blast if damage not allowed (#6030) 2018-01-06 18:24:44 -06:00
commy2
3eddd5ef72 fix make error (#6028) 2018-01-06 16:57:44 +01:00
commy2
0eb809fb91
Merge pull request #6027 from acemod/cleanupMarkers 
Cleanup markers
 2018-01-06 15:00:18 +01:00
PabstMirror
2ced42ae3a Cleanup markers 2018-01-06 00:52:57 -06:00
Josuan Albin
3839f2f5fc Minor arsenal fixes (#6025) 
* Change "ok" to "apply" while in 3DEN

* Move execNextFrame from initBox's action to openBox

This was done in order to avoid crashes on custom actions
 2018-01-06 01:30:33 +01:00
SilentSpike
dbe6a04e8a Optimise spectator loops (#6021) 
* Optimise spectator loops

`count` is only quicker than `forEach` when the final command returns a
boolean or nil. `forEach` is quicker if the final command returns any
other data type.

* Use `forEach` instead of `count`
 2018-01-06 01:30:15 +01:00
PabstMirror
4eb7868f1a
NVG - Fix grain and color effects (#6018) 2018-01-05 18:23:56 -06:00
Cyruz143
a881e5e2d3 Removing unused classname from wiki (#6024) 2018-01-05 22:26:03 +01:00
SilentSpike
fd815c5ed8
Serialize spectator help control variable (#6023) 
Could result in an on-screen error if the spectator API was used in a scheduled environment.
 2018-01-05 20:41:43 +00:00