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,481 Commits 73 Branches 88 Tags 752 MiB
67395f3494
Commit Graph

12481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jonpas
c42e0107e8 Update to latest version number 2018-11-18 20:50:07 +01:00
jonpas
979ec08036 Merge branch 'master' into armake 2018-11-18 20:47:03 +01:00
jonpas
24e7a33d8b Fix armake building on latest master, Fix version application not adding newlines properly 2018-11-18 20:46:04 +01:00
Thomas Kooi
4c0056b737
fix armake issues with latest release against ACE3 (#6693) 
This issue has been resolved in Armake on the master branch. By switching to the `:master` tag we can use armake to build the ACE project again.
 2018-11-18 20:36:40 +01:00
Thomas Kooi
d69cfdb286
Expand contributing docs (#6692) 
* Expand contributing docs

Mention PR process and where to go for assistance.

* Use prefix instead of suffix for WIP PR.

Co-Authored-By: thojkooi <thomasjkooi@gmail.com>

* fix PRs

Co-Authored-By: thojkooi <thomasjkooi@gmail.com>
 2018-11-18 20:36:22 +01:00
jonpas
5bfd64f066 Merge branch 'master' into armake 2018-11-18 20:23:50 +01:00
PabstMirror
69a3ae823a
Wiki - Update feature list for AH9 (#6691) 
Close #5299
 2018-11-18 10:48:12 -06:00
Thomas Kooi
e1774a848c Revert "Support # command in SQF Validator (quick, will miss missing semi-colons on actual # command) (#6338)" (#6689) 
This reverts commit 7ee08fa4c9.
 2018-11-18 17:10:28 +01:00
jonpas
7ee08fa4c9 Support # command in SQF Validator (quick, will miss missing semi-colons on actual # command) (#6338) 2018-11-18 16:46:10 +01:00
Thomas Kooi
b8c4329388
clean up gibot configuration (#6686) 
It is no longer used since we enabled stale bot.
 2018-11-18 16:32:01 +01:00
Thomas Kooi
71a206591a
Ignore issues listed in a project or milestone (#6688) 2018-11-18 15:42:03 +01:00
Thomas Kooi
48e81ff45d
Ignore focus feature issues (#6687) 2018-11-18 14:12:03 +01:00
Thomas Kooi
17eed99a93
Add stale configuration (#6682) 
* Add stale configuration

Add stale bot configuration. Mark anything inactive for >6 months as stale.

* Update close comment
 2018-11-18 12:26:11 +01:00
commy2
9a064ec9c7
Merge pull request #6684 from Cyruz143/fence_update 
Logi Wire Cutter - Adding primary fence used on Sarahni
 2018-11-18 08:27:59 +01:00
Cyruz143
621cd77025 Adding primary fence used on Sarahni 2018-11-18 01:13:21 +00:00
PabstMirror
6f97a4ad39
RHS Compats - Update allowSwapBarrels for some guns (#6675) 
* RHS Compats - Update allowSwapBarrels for some guns

Close #6653

* Update comments
 2018-11-17 10:11:47 -06:00
zharf
e00723039b Nametags - Adjustable colors settings (#6641) 
* Move hard coded nametag team colors to settings

Also made the default colors lighter to make them easier to read

* Added myself to contributors

* Fixed Nametag to Name Tag

* Optimized array copying

* Moved team color settings to color subcategory and used vanilla localization strings

* Split a long line into a more readable multiline solution
 2018-11-16 21:30:46 -06:00
BaerMitUmlaut
8119e87aa0 Fix wind roughness on airports (#6631) 2018-11-15 10:49:43 -06:00
jonpas
0745e249fc Merge branch 'master' into armake 2018-11-14 18:32:47 +01:00
madpat3
b35d5c8295 Update script_component.hpp (#6678) 2018-11-14 10:36:37 -06:00
Dedmen Miller
efb53ed181 Arsenal - Add Night Vision support stat for scopes (#6671) 
* Add Night Vision support Arsenal stat for scopes

* contrive correct configClasses camel case compliance

* Change priority
 2018-11-14 10:36:10 -06:00
madpat3
8201a6bd08 Update script_component.hpp (#6677) 
Wirecutters - Add compatibility with more fences from CUP
 2018-11-13 17:06:40 -06:00
PabstMirror
64a06ddb07
Merge pull request #6674 from acemod/pr/6424 
Rearm - Fix for 3den PR
 2018-11-11 15:25:39 -06:00
diwako
3e5995ee3d Updated treatment time (#6670) 2018-11-11 12:25:29 -06:00
Dystopian
40f371c063 Interaction - Add condition to zeus actions (#6665) 
* Add conditions to zeus actions

* Add condition caching
 2018-11-11 11:26:36 -06:00
Josuan Albin
69a67ff4e2 Arsenal - Fix NVG overlay appearing in ace arsenal (#6673) 
* Fix NVG overlay appearing in ace arsenal

* Change center to ACE_Player in nvg check to avoid edge case
 2018-11-11 11:22:53 -06:00
Dystopian
32fc6bb437 Add possibility to create zeus during mission (#6203) 
* Add possibility to create zeus during mission

* Use LLSTRING

* Allow deleting when setting is disabled

* Delete canCreate function

* Delete workaround for missed vehicles

* Revert "Delete workaround for missed vehicles"

This reverts commit e33102ee3c.
 2018-11-10 14:33:20 -06:00
Thomas Kooi
6ade76ee1d
Reflect current maintainers on team page (#6669) 2018-11-10 14:38:08 +01:00
nomisum
ada07758c5 Explosives - Add Event for tripflare triggering (#6663) 
* Add Event for tripflare triggering

_flare might be useful to delete / replace flare
_position is already available, so why not send it too

* added documentation

also added missing wirecutter event
 2018-11-09 12:27:43 -06:00
ace3mod
866a381598 [Docs] Update component dependencies 
Automatically committed through Travis CI.

[ci skip]
 2018-11-09 19:26:56 +01:00
Laid3acK
070abfa11b Compat R3F : updated with the last version 3.6 (#6664) 
* requiredAddons_r3f_v3.6

* update_r3f_v3.6

* update_r3f_v3.6

* update_r3f_v3.6

* update_r3f_v3.6

* update_r3f_v3.6

* update_r3f_v3.6
 2018-11-09 12:26:22 -06:00
Dystopian
86b4f08101 Fix CBA_fnc_getActiveFeatureCamera call (#6660) 2018-11-04 00:32:37 +01:00
commy2
b84b83ec7a add empty geometry to earplugs model (#6659) 2018-11-03 11:19:35 -05:00
PabstMirror
d5b3696c02 Fix -1//disabled and JIP issues 2018-11-02 16:56:16 -05:00
PabstMirror
0104030666
Add param for settings that require restart (#6512) 2018-11-02 12:58:57 -05:00
Brett
50d9fa4230 Zeus - Group Side Module: preserve group id and assigned team (#6569) 
* Group Side - preserve group id and assigned team

* use findIf instead of breakOut
 2018-11-02 12:36:20 -05:00
Dystopian
601b4c1e7b Add Smash Windshield action (#6152) 2018-11-02 12:32:04 -05:00
commy2
8541716bee Medical - optimize handle damage caching (#6657) 
* optimize handle damage caching

* delete some rogue code

* it was 2 all along

* add calls
 2018-11-01 13:05:56 -05:00
Josuan Albin
25b6e73985 Chemlight and IR strobe improvements (#6645) 
* Make IR chemlight brighter

* Improve IR strobe light visibility

* Make chemlights more realistic

* Tweak IR strobe light to make it brighter

* Increase chemlight TTL to realistic durations

* Add blue and green hi chemlights, replace orange hi by orange utlra-hi

* Add ACE chemlights to 3DEN chemlight module

* Add zeus chemlight modules for ACE chemlights

* Add time to live stat for hand smokes and chemlights

* Add hi blue and hi green pictures by @Drofseh
 2018-11-01 12:49:46 -05:00
mharis001
4c047702c8 Improve mouse hint (#6652) 2018-11-01 12:46:46 -05:00
Josuan Albin
328853e36b Fix mk6 mortar being reloadable via rearm when ammoHandling is enabled (#6648) 
Rearm - Fix mk6 mortar being reloadable when ammoHandling is enabled
 2018-10-28 16:14:11 -05:00
BaerMitUmlaut
a90dd7210e Safemode - Fix indicator when switching units (#6612) 
* Fix safe mode indicator when switching units

* Use DIK macro instead of magic number
 2018-10-27 15:13:40 -05:00
Josuan Albin
4d5f2d0de2 French translation (#6644) 
* Add french strings for advanced fatigue, finger and rearm

* Add french strings for rearm, fix some of the old ones

* Add missing strings for ACE Nightvision

* Add missing strings for ACE Pylons

* Add missing string for ACE mk6 mortar

* Add / Fix french strings in ACE CookOff

* Update addons/nightvision/stringtable.xml

Co-Authored-By: alganthe <alganthe@live.fr>

* Update addons/nightvision/stringtable.xml

Co-Authored-By: alganthe <alganthe@live.fr>

* Update addons/nightvision/stringtable.xml

Co-Authored-By: alganthe <alganthe@live.fr>

* Update addons/pylons/stringtable.xml

Co-Authored-By: alganthe <alganthe@live.fr>
 2018-10-27 15:10:45 -05:00
Josuan Albin
83ce5345da Make small UAVs battery life more realistic (#6647) 2018-10-26 16:15:37 +02:00
commy2
10468c6156
Merge pull request #6654 from acemod/noLaserLight 
Common - disable light from green weap lasers
 2018-10-26 15:10:35 +02:00
PabstMirror
b97ec2c8c8 Common - disable light from green weap lasers 2018-10-25 11:40:27 -05:00
Dystopian
1fe7c5c29c Map - Improve flashlight support (#6608) 
* Improve flashlight support

* Speed up items check loop

* Speed up more

* Remove useless var
 2018-10-25 11:39:27 -05:00
Josuan Albin
8580cb250a AI - Fix units not being removed from the garrison unitMove list consistently (#6651) 
* Fix units not being removed from the garrison unitMove list consistently

Not sure how I missed that.

* fix whitespace

* Fix typo in unGarrison check

dedmen saw nothing :D
 2018-10-24 12:55:12 -05:00
Josuan Albin
25f36d9340 Improve ai garrison pathing (#6649) 
AI - Fix garrison pathing
 2018-10-23 13:28:30 -05:00
Dedmen Miller
b8d4f981b2 Fix major typo in a popular Radio mod's name (#6650) 2018-10-23 13:23:10 -05:00