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
13,205 Commits 73 Branches 88 Tags 752 MiB
1534f8cd8d
Commit Graph

13205 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josuan Albin
24e1bffe80
Merge pull request #6719 from acemod/alganthe-maintainer 
add alganthe to ace3 maintainers list
 2018-12-03 21:03:52 +01:00
Thomas Kooi
6902915cc5
add alganthe to ace3 maintainers list 2018-12-03 20:58:42 +01:00
ace3mod
675c0a1c6c [Docs] Update component dependencies 
Automatically committed through Travis CI.

[ci skip]
 2018-12-03 19:05:14 +01:00
ace3mod
254be700de [Docs] Update component dependencies 
Automatically committed through Travis CI.

[ci skip]
 2018-12-03 19:04:51 +01:00
Jo David
26786f93a9 add bwc class name for orange chemlight (#6717) 2018-12-03 12:04:22 -06:00
PabstMirror
25c10e8cf6
Ballistics/Realistic Names - Integrate P90 Compat (#6667) 
* Ballistics/Realistic Names - Integrate P90 Compat

* Update CfgWeapons.hpp

* Remove old compat addon

* Update addons/realisticnames/stringtable.xml

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Update addons/realisticnames/CfgWeapons.hpp

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Update addons/ballistics/CfgWeapons.hpp

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Update addons/ballistics/CfgWeapons.hpp

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
 2018-12-03 12:03:49 -06:00
commy2
b055a0f633
Merge pull request #6714 from acemod/markers-server-log-warning 
change an ERROR to WARNING in Markers component
 2018-12-02 13:44:00 +01:00
commy2
438e34ac90
change an ERROR to WARNING in Markers component 2018-12-02 11:50:02 +01:00
Dedmen Miller
ba18d5f748 Custom Materials for tagging (#6704) 
* Allow custom materials for tags

* Fix quickTag

* More betterer
 2018-11-29 10:38:42 -06:00
Dedmen Miller
b3e0135e32 Fix Armake problems (#6697) 
* Armake model.cfg fix

* Spaces!

* Case sensitive filenames fix
 2018-11-29 11:18:22 +01:00
PabstMirror
c2b9cddfb0 Update wiki _config.yml for new releases 2018-11-28 11:29:55 -06:00
PabstMirror
cba6f72c9f Prep 3.12.4 Build 39 2018-11-27 09:48:36 -06:00
PabstMirror
9dfa6f0511 Merge branch 'master' into release-3.12.4 2018-11-27 09:46:24 -06:00
PabstMirror
79b77bc0da Javelin - Can disable thermal requirement via code (#6706) 2018-11-27 00:09:45 +01:00
classic
31a645997f Update Japanese translations (#6705) 
**When merged this pull request will:**
- Update translations for Japanese
- fix the miss translations
 2018-11-27 00:09:32 +01:00
PabstMirror
1c2e23052b Prep 3.12.4 Build 38 2018-11-25 10:53:15 -06:00
PabstMirror
bd5b360d7e Merge branch 'master' into release-3.12.4 2018-11-25 10:51:31 -06:00
commy2
a89dfccfb6
Merge pull request #6703 from acemod/fix-moving-marker-synch 
fix moved markers not synched
 2018-11-25 15:16:44 +01:00
commy2
d0bbc111bc
disable debug mode 2018-11-25 15:05:05 +01:00
commy2
7b8fbe10b2 fix moved markers not synched 2018-11-25 15:02:27 +01:00
PabstMirror
a357675ad3
MicroDagr - Fix waypoint scrolling (#6700) 
Fix #6521
 2018-11-19 17:57:02 -06:00
PabstMirror
03e01f02df
Arsenal - Fix script error from hide changes (#6699) 
https://github.com/acemod/ACE3/pull/6694/files#r234542372
 2018-11-19 13:05:44 -06:00
Ozan Eğitmen
73adedff42
Merge pull request #6698 from acemod/654wak654-maintainer 
add 654wak654 as maintainer
 2018-11-19 20:53:02 +02:00
Thomas Kooi
7a0250e002
add 654wak654 as maintainer 2018-11-19 19:44:11 +01:00
PabstMirror
cce5d804c4 Prep 3.12.4 Build 37 2018-11-18 23:57:54 -06:00
PabstMirror
830536504d
RHS Compat - Fix config (#6696) 2018-11-18 23:51:26 -06:00
PabstMirror
e3421cbf8f
Arsenal - Add config to force show (mortars) (#6694) 
* Arsenal - Add config to force show (mortars)

* Update CfgMagazines.hpp

* Update arsenal-framework.md
 2018-11-18 23:04:50 -06:00
Dystopian
e8c3be8016 Quick Mount - Add Get In and Change seat action menu (#5745) 
* Add quickmount GetIn menu

* Add compartment support

* Check engine, check pilot, check static turret driver

* Add doc, condition, translation

* Add hybrid config entries, fix MP issue

* Optimize condition

* Ignore Enabled setting in vehicle

* Work around SQF validator macro issue

* Fix config macro entries

* Add workaround for getting damage when seat changing while moving

* Add setting for Get In menu disabling

* Fix race when 2 players try to get the same seat

* Convert if-else to switch

* Decrease move-back timeout to 0.5s

* Check if vehicle is flipped

* Add getin statement for parent menu

* Improve canShowFreeSeats

* Apply latest trends

* Improve fnc_addFreeSeatsActions

* Change copilot and gunless turret icons

* Fix macro name

* Fix FFV icon

* Optimize turret icon code

* Extend setting to 4 values

* Fix menu is shown when vehicle is full

* Optimize UAV checking code

* Fix bug with disabled FFV turrets

* Remove bugged FFV, Add turret locality check, Add Failed message

* Replace some macros with function

* Fix validator

* Remove global variables, Add debug
 2018-11-18 22:33:50 -06:00
Thomas Kooi
cad3421e50
Replace placed modules by additional information in the issue template (#6695) 2018-11-19 00:20:41 +01:00
Thomas Kooi
336c9ec31b
Merge pull request #3747 from acemod/armake 
Changes for Linux development and armake
 2018-11-18 21:13:42 +01:00
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