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

13282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mharis001
f6f82d5ab0 Wiki - Fix incorrect fortify chat command example (#7190) 2019-09-25 03:14:20 +02:00
commy2
92b7ba10b1
Merge pull request #7181 from MatsuoYutani/master 
Portuguese Language Updated
 2019-09-20 07:06:10 +02:00
Matsuo Yutani
edc05b8056
Fixed Mistype 2019-09-19 21:44:46 -03:00
Matsuo Yutani
31f5eab2db
Removed weird dot from the first line 2019-09-19 21:42:28 -03:00
Matsuo Yutani
ec0533fd08
Removed weird dot from the firts line 2019-09-19 21:41:41 -03:00
jonpas
99b9d710e3
Update documentation packages and fix issues (#7183) 
* Fix YAML Exception (mapping keys not allowed in context)

* Fix weirdly split layout on smaller-width screens

* Run npm audit fix
 2019-09-17 17:21:42 +02:00
EckoMoire
f98aee7a98 Portugues Language Updated 2019-09-14 15:36:28 -03:00
PabstMirror
03576b86b9
MedicalSM - Tweak isPlayer checks style (#7178) 2019-09-12 21:50:50 -05:00
jonpas
2d0c61a874
Use CBA Versioning System properly (#7173) 
* Use CBA Versioning System properly

* Update CBA include to CBA v3.12.2 + excessive concatenation cleanup
 2019-09-10 17:49:07 +02:00
mharis001
5dbaef4e07 Improve medical statemachine settings (#7154) 
* Improve medical statemachine settings

* Multi-line condition and update fatal injury description

* Check isPlayer in DeathAI transition

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
 2019-09-09 23:30:56 -05:00
LachlanSneddon
b4c1d0cb57 Minor logic fixes (#7174) 2019-09-07 12:18:12 -05:00
PabstMirror
0880ea25a3
Medical Treatment - Add logging for splints (#7170) 
* Medical Treatment - Add logging for splints

* addToTriageCard
 2019-09-06 21:47:20 -05:00
jonpas
dd9692792d
Remove outdated CBA Shared Version Display (#7172) 
Replaced by Arma 3's main menu
 2019-09-06 21:57:54 +02:00
jonpas
84547da3bc
Change Todo to Enhancement template (#7167) 
Empty issue (Todo template) can still be created with a button below templates.
 2019-09-06 13:19:59 +02:00
PabstMirror
daa4581fe9
Maptools - Make GPS display a real 3d object (#7086) 
* Maptools - Make GPS display a real 3d object

* Fix header

* Apply suggestions from code review

Co-Authored-By: commy2 <commy-2@gmx.de>
 2019-09-05 15:58:05 -05:00
PabstMirror
edd5c44853
Medical - Improve loading/unloading of unconc patients (#7109) 
* Medical - Improve loading/unloading of unconc patients

* Update fnc_loadPersonLocal.sqf

* Multi-line

* Formating

* Update fnc_loadUnit.sqf
 2019-09-05 15:56:53 -05:00
PabstMirror
d6c39e661f
Medical StateMachine - Tweak dead state handling (#7061) 
* Medical StateMachine - Tweak dead state handling

- Don't call setDammage inside HandleDamage EH
- Add death reason on entering death state

* add a getVar disable in case this causes problems

* Cleanup

* cleanup

* Update addons/medical_statemachine/functions/fnc_enteredStateDeath.sqf

Co-Authored-By: Ferran Obon <magnetar5891@gmail.com>
 2019-09-05 15:56:14 -05:00
PabstMirror
9d0e474cf5
Fix statBarStatement still using AI values for firemodes (#7163) 2019-09-05 15:48:49 -05:00
PabstMirror
54125e3697
CSW - Add drag after deploy setting, fix container storage (#7164) 2019-09-05 15:48:26 -05:00
jonpas
48362e7ca6
Use Slack badge from shields.io (#7168) 
No longer using Slackin, Community Inviter does not provide a Markdown badge.
 2019-09-05 19:48:32 +02:00
jonpas
32b32ec9ec
Fix Bug report issue template (#7166) 
Double header data.
 2019-09-05 14:14:13 +02:00
Schwaggot
3bae64a76f Update wiki description of interaction framework (#7143) 2019-09-04 18:47:46 +02:00
Laid3acK
2e4e59f6e0 Ballistics - Contact DLC rifles added (#7156) 
* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added

* contact_dlc_rifles_added
 2019-09-03 19:09:12 -05:00
Josuan Albin
1caf6fb08f Rearm - Add distance setting (#7137) 
* Add rearm distance setting

* Set rearm distance slider maximum at 50m

* Update addons/rearm/stringtable.xml

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* Fix rearm action check

* Update addons/rearm/stringtable.xml

Co-Authored-By: Dedmen Miller <dedmen@users.noreply.github.com>

* Update addons/rearm/initSettings.sqf

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

* Update addons/rearm/functions/fnc_rearm.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
 2019-09-03 19:06:50 -05:00
PabstMirror
0fa8330833
Common - Handle changes to UAVControl command (multi seat) (#7161) 2019-09-03 19:05:45 -05:00
Josuan Albin
2950a48447 Fix statBarStatement still using AI values for firemodes 2019-09-03 15:32:27 +02:00
Filip Maciejewski
63dbdab0ae Wiki - Update "ace_cargo_fnc_loadItem" arguments (#7158) 
* Update cargo-framework.md

* Update cargo-framework.md
 2019-09-02 11:39:32 -05:00
dependabot[bot]
07a467e6cc Bump mixin-deep from 1.3.1 to 1.3.2 in /docs/src (#7153) 
Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/jonschlinkert/mixin-deep/releases)
- [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-08-29 00:02:05 +02:00
Laid3acK
db9807e1fb Wiki update (atragmx/scopes) (#7083) 
* Wiki update

* Wiki update

* Wiki update
 2019-08-28 11:04:25 -05:00
barman75
3cb10e0aa4 Translations - Russian (medical) (#7093) 
* Missing RUS translation (medical)

* Minor misspells corrections

Co-Authored-By: Dystopian <sddex@ya.ru>

* authors
 2019-08-28 10:28:56 -05:00
jonpas
d7800c084f Fix Fortify Framework documentation (#7151) 2019-08-28 09:30:53 -05:00
commy2
4204205908
Merge pull request #7140 from Bosenator/master 
Movement - Display Inventory Weight in Stream Friendly UI Mode
 2019-08-25 19:27:17 +02:00
jonpas
1a33bae91c
Update issue templates (#7148) 2019-08-24 18:47:23 +02:00
commy2
be09fd10a3
Merge pull request #7135 from acemod/slideshow-improv 
Fix slide order in slideshow
 2019-08-21 23:07:15 +02:00
commy2
100ac0ff72
Merge pull request #7138 from Elgin675/ace_medical_french_translation 
Addition / modification of the French translation
 2019-08-21 23:06:14 +02:00
commy2
d1784ad83b
Merge pull request #7142 from acemod/fix-viewdistance-undef-var 
Fix undefined variable in View Distance
 2019-08-21 23:04:06 +02:00
jonpas
f1b1ec0d55
Fix undefined variable in View Distance 2019-08-14 17:42:01 +02:00
Elgin675
d7bf026a00 Corections mineures 2019-08-14 14:56:26 +02:00
Bosenator
15fe3c0a18 display inventory weight in stream friendly UI mode 2019-08-14 09:47:24 +01:00
bux
6abe054e95 enable cache 2019-08-13 08:42:58 +02:00
bux
5e1411bee2 Remove Cover Image Stuff, Reverse Arrays 2019-08-13 08:41:30 +02:00
Elgin675
5754d6c506 Fixed an error on the last commit (merge incorrectly). 2019-08-13 02:38:54 +02:00
Elgin675
7f71980c85 Modifications demandées effectuées 2019-08-13 01:32:16 +02:00
Elgin675
927e051ea7 Addition / modification of the French translation 2019-08-12 22:47:16 +02:00
Josuan Albin
df8814e344 Add self stitching setting (#7134) 2019-08-12 20:05:59 +01:00
bux
2f0a5e0c84 Make slideshow add slides in proper order by going through the array backwards, add cover image filed for slideshows, fix wonky german translation 2019-08-12 13:23:32 +02:00
ace3mod
187bd6f698 [Docs] Update component dependencies 
Automatically committed through Travis CI.

[ci skip]
 2019-08-12 01:01:08 +02:00
ace3mod
4f52105c23 [Docs] Update component dependencies 
Automatically committed through Travis CI.

[ci skip]
 2019-08-12 01:01:00 +02:00
PabstMirror
9ffca544a6
Advanced Throwing - Call muzzle EH and fix RHS inheritance (Compat with RHS 0.4.9) (#6879) 
* Advanced Throwing - Call muzzle EH and fix RHS inheritance

* UBC for rhs
 2019-08-11 17:59:05 -05:00
PabstMirror
ebb1ef628f
Merge pull request #7042 from acemod/cswSuperBranch 
Crew Served Weapons - Final Integration
 2019-08-11 17:57:27 -05:00