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
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
b4c1d0cb57
Minor logic fixes ( #7174 )
2019-09-07 12:18:12 -05:00
0880ea25a3
Medical Treatment - Add logging for splints ( #7170 )
...
* Medical Treatment - Add logging for splints
* addToTriageCard
2019-09-06 21:47:20 -05:00
dd9692792d
Remove outdated CBA Shared Version Display ( #7172 )
...
Replaced by Arma 3's main menu
2019-09-06 21:57:54 +02:00
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
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
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
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
9d0e474cf5
Fix statBarStatement still using AI values for firemodes ( #7163 )
2019-09-05 15:48:49 -05:00
54125e3697
CSW - Add drag after deploy setting, fix container storage ( #7164 )
2019-09-05 15:48:26 -05:00
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
32b32ec9ec
Fix Bug report issue template ( #7166 )
...
Double header data.
2019-09-05 14:14:13 +02:00
2487d6c8ff
Removes tabs in CfgAmmo
2019-09-04 18:22:43 -07:00
3bae64a76f
Update wiki description of interaction framework ( #7143 )
2019-09-04 18:47:46 +02:00
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
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
0fa8330833
Common - Handle changes to UAVControl command (multi seat) ( #7161 )
2019-09-03 19:05:45 -05:00
2950a48447
Fix statBarStatement still using AI values for firemodes
2019-09-03 15:32:27 +02:00
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
6f96ca1a64
Added missing magazine and ammunition definitions.
2019-08-31 15:13:38 -07:00
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
db9807e1fb
Wiki update (atragmx/scopes) ( #7083 )
...
* Wiki update
* Wiki update
* Wiki update
2019-08-28 11:04:25 -05:00
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
d7800c084f
Fix Fortify Framework documentation ( #7151 )
2019-08-28 09:30:53 -05:00
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
1a33bae91c
Update issue templates ( #7148 )
2019-08-24 18:47:23 +02:00
be09fd10a3
Merge pull request #7135 from acemod/slideshow-improv
...
Fix slide order in slideshow
2019-08-21 23:07:15 +02:00
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
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
f1b1ec0d55
Fix undefined variable in View Distance
2019-08-14 17:42:01 +02:00
d7bf026a00
Corections mineures
2019-08-14 14:56:26 +02:00
15fe3c0a18
display inventory weight in stream friendly UI mode
2019-08-14 09:47:24 +01:00
6abe054e95
enable cache
2019-08-13 08:42:58 +02:00
5e1411bee2
Remove Cover Image Stuff, Reverse Arrays
2019-08-13 08:41:30 +02:00
5754d6c506
Fixed an error on the last commit (merge incorrectly).
2019-08-13 02:38:54 +02:00
7f71980c85
Modifications demandées effectuées
2019-08-13 01:32:16 +02:00
927e051ea7
Addition / modification of the French translation
2019-08-12 22:47:16 +02:00
df8814e344
Add self stitching setting ( #7134 )
2019-08-12 20:05:59 +01:00
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
187bd6f698
[Docs] Update component dependencies
...
Automatically committed through Travis CI.
[ci skip]
2019-08-12 01:01:08 +02:00
4f52105c23
[Docs] Update component dependencies
...
Automatically committed through Travis CI.
[ci skip]
2019-08-12 01:01:00 +02:00
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
ebb1ef628f
Merge pull request #7042 from acemod/cswSuperBranch
...
Crew Served Weapons - Final Integration
2019-08-11 17:57:27 -05:00
15c65c5779
Adds HEI magazine.
...
Configs default "1000Rnd_Gatling_30mm_Plane_CAS_01_F" magazine as CM5:1.
Keeps "ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM51" for legacy reasons.
2019-08-08 12:17:00 -07:00
7d9c7d5483
Merge branch 'patch-1' of github.com:LorenLuke/ACE3 into patch-1
2019-08-08 12:08:22 -07:00
82e7b70f6e
Cargo - fix tankf ( #7124 )
2019-08-07 22:38:40 -05:00
f5782fd1ff
Medical - Various debugging and fix cpr anim speed ( #7122 )
...
* Medical - Various debugging and fix cpr anim speed
* Update fnc_setCardiacArrest.sqf
2019-08-06 08:10:33 -05:00
75a8ba2b34
Cargo - No cargo on Contact UGV ( #7123 )
2019-08-06 08:10:05 -05:00
15e6ad4523
Update addons/grenades/CfgAmmo.hpp
...
Co-Authored-By: Oliver Blanthorn <oliver.blanthorn@manchester.ac.uk >
2019-08-06 11:35:58 +02:00
