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

13494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
PabstMirror
82e7b70f6e
Cargo - fix tankf (#7124) 2019-08-07 22:38:40 -05:00
PabstMirror
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
PabstMirror
75a8ba2b34
Cargo - No cargo on Contact UGV (#7123) 2019-08-06 08:10:05 -05:00
Dedmen Miller
15e6ad4523
Update addons/grenades/CfgAmmo.hpp 
Co-Authored-By: Oliver Blanthorn <oliver.blanthorn@manchester.ac.uk>
 2019-08-06 11:35:58 +02:00
jonpas
cd65c2f196
Update development environment requirements (#7120) 
* Update development environment requirements

- Disabled 'rebuild requiredAddons' in Mikero tools
- Remove DeRap as a requirement
- Simplify Arma 3 Tools and P-drive (obviously has to be 'properly' set up)

* Update Mikero tools download URL
 2019-08-04 22:43:07 +02:00
commy2
0fd442451f Interaction Menu - fix a crash when loading savegames (#7115) 
* fix a crash when loading savegames

* fix a variable name

* optimize

* Put CAManBase actions into seperate bucket

* Apply suggestions from code review

Co-Authored-By: commy2 <commy-2@gmx.de>

* Fast exit for All

* CaManBase

* can't skip mans
 2019-08-01 20:52:20 -05:00
Vdauphin
66f62bb1a2 Zeus - FIX ace_zeus_fnc_moduleSetMedicalVehicle setting wrong variable (#7107) 
* FIX set medical vehicle zeus module

Since https://github.com/acemod/ACE3/pull/6933 `isMedicalVehicle` should be use instead of `medicClass`

* isMedicalVehicle is a boolean

44050df98b/addons/medical_treatment/functions/fnc_isMedicalVehicle.sqf (L20)
 2019-07-31 11:20:27 -05:00
PabstMirror
3e97d99893 Merge branch 'master' into cswSuperBranch 
Conflicts:
	optionals/compat_rhs_usf3/CfgMagazines.hpp
	optionals/compat_rhs_usf3/config.cpp
 2019-07-25 15:19:17 -05:00
jonpas
06996d30e1 Update Load Order for 1.94 Contact DLC (#7101) 
* Update loadorder for 1.94 Contact DLC

* Require Arma 3 v1.94
 2019-07-25 13:43:04 -05:00
classic
a7723b793b Update Japanese translation (#7111) 
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation

* Update Japanese translation
 2019-07-22 09:49:54 -05:00
Vdauphin
e592b6b975 Missing return line in coding guide lines for SETPVAR (#7106) 2019-07-17 00:02:12 +02:00
commy2
06da5c33dd
Merge pull request #7105 from Vdauphin/patch-1 
FIX French STR_ACE_Common_Anywhere
 2019-07-16 23:17:39 +02:00
Vdauphin
8611bbb0bc
FIX French STR_ACE_Common_Anywhere 2019-07-16 22:54:38 +02:00
PabstMirror
ded81418e6
Medical Engine - Report any fatal head damage (#7103) 2019-07-16 13:00:28 -05:00