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,235 Commits 73 Branches 88 Tags 752 MiB
6b67c5e365
Commit Graph

13235 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Kooi
bc2d84289b Consistently make use of the dot (#6888) 2019-03-23 22:41:05 +01:00
PabstMirror
2ea029c219
Quickmount - optimize subActions (#6883) 2019-03-21 21:29:51 -05:00
Unknown
a8d28ebedc Merge remote-tracking branch 'upstream/master' into medical-rewrite 2019-03-21 17:51:19 -04:00
Rutger "RedBery" Meijering
15036d7fd8 Fixes to unconsciousness and damageTypes systems (#6589) 
* Fixes BleedingCoef having impact on bloodloss KO
Fixes incorrect var in setUnconscious

* Changes method for checking if typeOfDamage is valid
Adds check for if typeOfDamage is valid to extension version of woundsHandler

* Changes collision wound location select to a weighted system to make it more lethal at faster collisions
Adds collision and drowning damage types to config (drowning has no related wounds to prevent wounds being added while drowning).

* Fixes unneeded space

* Fixes minor mistake (body damage chance should go from 1 to 0 without ever becoming negative)
 2019-03-21 19:33:51 +01:00
PabstMirror
e8970ab8ad ACE_settings captiliaztion 2019-03-21 09:46:23 -05:00
PabstMirror
711e9073a8
Explosives - Allow setting custom timer limits (#6882) 2019-03-21 09:01:50 -05:00
ace3mod
61e88abf22 [Docs] Update component dependencies 
Automatically committed through Travis CI.

[ci skip]
 2019-03-21 14:54:11 +01:00
Dedmen Miller
d034324e88 More trivial code cleanup (#6859) 
* Added a3 include pboprefix

* Add defineDIKCodes header

* defineDIKCodes include case correct

* Use ui_f dikcodes

* Fix fnc_checkfiles macro and dll condition

* Incorrect macro usage in fnc_getVehiclePos

* Incorrect macro usage in fnc_getVehiclePosComplex

* Add defineResincl ui_f include

* Remove include guard from defineResincl

* Incorrect macro usage in fnc_handleMouseButton

* Incorrect macro usage in fnc_setMarkerJIP

* Semicolon after include

* Add defineResinclDesign ui_f include

* Incorrect macro usage fnc_rearmSuccessLocal

* Incorrect macro usage fnc_rearmSuccessLocal

* Stray backslash in fnc_camshake

* Incorrect macro usage in fnc_startNozzleInHandsPFH

* Incorrect amcro usage in fnc_tag

* Incorrect macro usage in fnc_moduleGlobalSetSkill

* Reenable linux checkFiles

* Non-captialized requiredAddons

* Non-captialized requiredAddons
 2019-03-21 08:52:32 -05:00
Magnetar
cc11ad051d Formatting. Lazy eval 2019-03-21 14:34:51 +01:00
Dystopian
d804d3afe6 Cleanup some functions headers and macro using (#6866) 
* Cleanup frisking

* Cleanup header format

* Cleanup FUNC macro using
 2019-03-20 15:18:43 -05:00
Magnetar
89927a8b94 Missing privates. Lazy evaluation. 2019-03-17 21:26:15 +01:00
Magnetar
934339d1df Fix missing INJURY string 2019-03-17 18:38:31 +01:00
Magnetar
99f5d2ea0a
Rewrite rectify convert option (#6825) 
* Rewrite Rectify - Adding option to convert vanilla medical gear

* Oops
 2019-03-17 17:59:49 +01:00
Magnetar
54208a1a78
Rewrite rectify - Skip distance check if in same vehicle (#6823) 2019-03-17 17:58:43 +01:00
Magnetar
1d34cc4cc0
Rewrite rectify. Medical - Add vehicle hint when loading unconscious (#6822) 
* Rewrite rectify. Medical - Add vehicle hint when loading unconscious

* Fix copy paste
 2019-03-17 17:54:50 +01:00
Magnetar
82131b3643 Fix include in wrong location 2019-03-17 17:48:44 +01:00
Magnetar
bb2d1e4e9e Merge branch 'master' into medical-rewrite 2019-03-17 17:39:43 +01:00
commy2
0a4d3d5b65
Merge pull request #6872 from acemod/fixVersionCheck 
version check handle minor versions below 10
 2019-03-16 21:09:54 +01:00
commy2
df8b23b9ba version check handle minor versions below 10 2019-03-16 11:05:01 +01:00
commy2
f248e81c65 version check handle minor versions below 10 2019-03-16 11:00:20 +01:00
commy2
e4391a8060
Merge pull request #6869 from veteran29/hideEjectSetting-polishTranslation 
hideEjectAction - Polish translation
 2019-03-15 08:23:59 +01:00
Filip Maciejewski
69b9f1e338 hideEjectAction - Polish translation 2019-03-15 00:58:12 +01:00
commy2
aef3073ee8 hide by default 2019-03-15 00:56:09 +01:00
commy2
2dbc4993d8 add setting to hide Eject action from action menu 2019-03-15 00:37:04 +01:00
PabstMirror
9d5b936d7c
Wiki - Add documentation for ace_interact_menu_newControllableObject (#6797) 2019-03-14 13:32:39 -05:00
mharis001
a06086f33c Wiki - Add field rations documentation (#6814) 
* Add field rations docs

* Add newlines
 2019-03-14 13:32:09 -05:00
PabstMirror
7d9a4f4744 Update wiki config.yml version numbers 2019-03-14 09:31:19 -05:00
PabstMirror
fb4f05e276 Prep 3.12.6 Build 43 2019-03-14 09:22:08 -05:00
PabstMirror
732368584a Merge branch 'master' into release-3.12.6 2019-03-14 09:21:14 -05:00
PabstMirror
57db905f7c
Zeus Actions - Fix config code breaking during build (#6864) 
* Zeus Actions - Fix config code breaking during build

* Update addons/rearm/XEH_preInit.sqf

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

* formating, add note
 2019-03-14 09:17:34 -05:00
markooff
b4639ed758 tlumaczenie_12_03_2019 (#6865) 
Translations - Polish
 2019-03-13 00:18:33 -05:00
PabstMirror
373f11338d Prep 3.12.6 Build 42 2019-03-12 13:35:51 -05:00
PabstMirror
88d4e32f48 Merge branch 'master' into release-3.12.6 2019-03-12 13:34:41 -05:00
xrufix
129cc26438 Add magazines with different tracer colors for some vanilla weapons (#6658) 
* Add magazines for some vanilla weapons with different tracer colors

* Removed obsolete comment

* unified naming of tracer magazines

* Add CfgMagazineWells

* Add 5.8mm mags

* Add Minimi boxes

* Added 5.56 Drum mags

* Add Katiba and 7.62x51 mags

* Remove magazine macro to make config easier to read and edit.

* Add pictures available in arma files

* Add magazines to vanilla magazinWells

* Fix wrong base class for Katiba tracer mags

* Removed duplicate strings

* delete blank lines in stringtable
 2019-03-12 13:32:47 -05:00
ace3mod
28b96e3efd [Docs] Update component dependencies 
Automatically committed through Travis CI.

[ci skip]
 2019-03-12 17:32:11 +01:00
Dedmen Miller
187b2f38ce Add rksl pm II 5-25x56 compat (#6845) 
* Add rksl pm II 5-25x56 compat

* Combine into existing compat

* Update ace_ScopeAdjus values
 2019-03-12 11:26:56 -05:00
mharis001
695416dfe7 Arsenal - Improvements to 3DEN attribute (#6849) 
* Improvements to arsenal 3DEN attribute

* Better alignment of button

* Remove magazineGroups copy
 2019-03-12 11:26:40 -05:00
Dystopian
2ff614c3a2 Safe Mode - Fix disabled laser on safety switch (#6639) 
* Fix disabled laser on safety switch

* Add workaround for switching to primary weapon

* Add UGL check
 2019-03-12 11:26:20 -05:00
Matsuo Yutani
842f9e5d3b Update stringtable.xml (#6860) 
Updated <Portuguese> values for the Saline quantity.
 2019-03-11 10:12:14 -05:00
Dedmen Miller
564fc8aa99 Trivial code fixes (#6858) 2019-03-10 21:42:08 -05:00
Dystopian
24d2aa647e Repair - Fix Typhoon rear wheel change (#6207) 2019-03-10 21:41:06 -05:00
Dystopian
56f9d76d0f UI - Fix selective UI in cargo (#6585) 
* UI - Fix selective UI in cargo

* Add FFV not in cargo check
 2019-03-10 21:40:28 -05:00
Dedmen Miller
51dfc081ac Fix M84 lods (#6854) 2019-03-09 20:19:58 -06:00
mharis001
d561fe09d6
Merge pull request #6855 from acemod/mharis-maintainer 
Add mharis001 to ACE3 maintainers list
 2019-03-09 11:04:02 -05:00
jonpas
792a3b42fb
Add mharis001 to ACE3 maintainers list 2019-03-09 16:44:29 +01:00
PabstMirror
28620d86d1
fix to weaponMuzzleVelocity (#6850) 
* Fix incorrect muzzle velocity displayed on magazine

* Apply suggestions from code review

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

* Remove garbage file

* Script header updates

* Update addons/ballistics/functions/fnc_statTextStatement_magazineMuzzleVelocity.sqf

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

* Add Pabst' fix to weaponMuzzleVelocity
 2019-03-08 09:12:07 -06:00
Dedmen Miller
5ad8b3c6bc Arsenal - Fix incorrect muzzle velocity stat displayed on magazine (#6844) 
* Fix incorrect muzzle velocity displayed on magazine

* Apply suggestions from code review

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

* Remove garbage file

* Script header updates

* Update addons/ballistics/functions/fnc_statTextStatement_magazineMuzzleVelocity.sqf

Co-Authored-By: dedmen <dedmen@users.noreply.github.com>
 2019-03-05 10:42:04 -06:00
C0kkie
ca71375259 Captives - Use the doApplyHandcuffs function for keybind (#6843) 
* Use the doApplyHandcuffs function that cabletie

* Update XEH_postInit.sqf
 2019-03-05 09:40:10 -06:00
classic
c37b7644af Update Japanese translation (#6838) 
* 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

* Update Japanese translation

* Update Japanese translation

* Update stringtable.xml
 2019-02-28 13:36:34 -06:00
jonpas
6a5811a9b2 Increase required Arma 3 version to 1.88 (#6836) 
No Uniform Restrictions got updated for 1.88
 2019-02-27 17:44:39 -06:00