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
11,348 Commits 73 Branches 88 Tags 752 MiB
9cef8ea591
Commit Graph

11348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bux
d65ffb82f7 use https in PR tempalte 2016-12-27 09:14:10 +01:00
bux578
7ecccde340 use https for ace3mod 2016-12-27 09:11:58 +01:00
ace3mod
dff9e11569 [Docs] Update component dependencies 
Automatically committed through Travis CI.

[ci skip]
 2016-12-22 20:30:05 +01:00
PabstMirror
c22fce273f Overpressure changes (#4770) 
* Add setting to overpressure

* Change overpressure on 2a70 cannon

Close #4691
Also fix gl smoke causing frag

* Handle 2a28 cannon

* Fix base class
 2016-12-22 13:29:05 -06:00
Dystopian
78b655bc1f Simplify config crawling 2016-12-22 01:41:16 +03:00
PabstMirror
04d4353b5d Fix reversed RHS compats - Close #4759 (#4760) 2016-12-20 15:37:51 -06:00
bux578
886e23791f Merge pull request #4774 from classicarma/fix-jpn-translate-v383 
Fix jpn translate v383
 2016-12-17 15:59:50 +01:00
classic
6a93f58b52 added missing localization in jpn translation 
added missing localization in jpn translation
 2016-12-17 20:50:19 +09:00
classic
552e9ecd87 fix jpn translation for ballistics 
fix html tag in the japanese translation.
 2016-12-17 20:39:57 +09:00
PabstMirror
988c5b0a25 Minor wind deflection optimization (#4762) 2016-12-16 08:08:10 +01:00
bux578
d8fec7fbe3 improve german translation for entrenchment tool (#4769) 2016-12-15 13:42:13 -06:00
PabstMirror
56c4611919 Fix ace_particles smoke on arty shells (#4768) 
Close #4766
 2016-12-15 18:28:39 +01:00
bux578
f544d82472 add optionals meta.cpp files (#4763) 2016-12-15 10:55:44 -06:00
PabstMirror
fd09ec5958 Rebuild Dlls for x64 dev branch (#4765) 2016-12-15 10:51:47 -06:00
ulteq
1e79f35e43 Always visualize bandaged wounds 
* Even when GVAR(advancedBandages) or GVAR(woundReopening) are disabled
 2016-12-15 15:01:02 +01:00
ulteq
0ddfd5eb16 Disable wound reopening when advanced bandages are disabled 2016-12-15 14:51:24 +01:00
ulteq
70a2dc30e7 Refactored 'showPainInMenu' setting 
* showPainInMenu -> on/off switch
* medicSetting_PainVisualization -> 3 way switch on who can see it
 2016-12-15 14:45:58 +01:00
ulteq
cc19499e8f fieldDressing -> FieldDressing 2016-12-15 14:06:09 +01:00
ulteq
9ddaa01462 Always allow the use of tourniquets 
* Even when advanced bandages are turned off
 2016-12-15 14:05:08 +01:00
ulteq
91cbc0e4d4 Added new setting 'advancedDiagnose' 
* Which allows to choose between the old basic- and advanced diagnose actions
 2016-12-15 14:00:09 +01:00
classic
0842481c2f fix for jpn translate in medical_menu 
Delete unnecessary the HTML tags in line 134
 2016-12-15 20:58:21 +09:00
ulteq
0de405fe2a Fix morphine when advanced medication is disabled 2016-12-15 12:58:06 +01:00
Ozan Eğitmen
ef4d289836 Add Zeus Module for FRIES (#4597) 
* Initial commit

* Revert unrelated changes

* Add newline

* Fix undefined var, localize text

* Shorten strings, add missing parameters

* Fix logical error

* Fix capitalization, Update string, Only add EH on server

* Add missing uses of the private command

* Remove excess formatting

* Add module category
 2016-12-14 23:55:06 -06:00
Dedmen Miller
c009000bd9 Use new private syntax for winddeflection PFH (#4761) 2016-12-14 23:29:07 -06:00
ulteq
65f0f56474 Implemented 'showPainInMenu' 2016-12-14 21:30:28 +01:00
ulteq
8146cb427e Revert "Implemented 'showPainInMenu' logic" 
This reverts commit 964711a38b.
 2016-12-14 21:23:26 +01:00
ulteq
0d0cf38028 Fix bandage reopening classname/category lookup 2016-12-14 21:17:39 +01:00
PabstMirror
5379503772 Fix deadman range, fix clacker transfer, use setShotParents (#4689) 2016-12-14 14:06:32 -06:00
ulteq
e817e13cfd Only call 'handleIncapacitation' when it makes sense 
* Minor injuries should not trigger incapacitation
 2016-12-14 21:02:24 +01:00
ulteq
964711a38b Implemented 'showPainInMenu' logic 2016-12-14 20:55:03 +01:00
ulteq
196a3999a4 Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite 2016-12-14 20:44:22 +01:00
ulteq
151d4a4bfe Settings overhaul 
New settings:
* allowSelfIV
* showPainInMenu

Converted CBA -> ACE Settings:
* advancedBandages
* advancedMedication
* fatalInjuryCondition
* cardiacArrestTime

Fixed settings:
* useLocation_Epi
* medicSetting_Epi
* painCoefficient
 2016-12-14 20:44:06 +01:00
Dystopian
4f20d1f7c6 add rearm to Vehicle Ammo boxes (#4750) 2016-12-14 13:18:04 -06:00
Dystopian
cc3b669fcd Fix missing refuel menu on static fuel stations (#4533) 
* fix static fuel stations

* Directly compile menus and remove XEH from buildings
 2016-12-14 12:48:00 -06:00
PabstMirror
af4b3e31e1 Minor iv optimization 2016-12-14 11:50:31 -06:00
ulteq
dafefda04a Fixed typo 
Closes: https://github.com/acemod/ACE3/pull/4697
 2016-12-14 18:33:36 +01:00
ulteq
a2b964a993 Fixed bandage config lookup 2016-12-14 18:04:56 +01:00
ulteq
5d3f97ace7 Fix IV Bags work on limbs with a tourniquet applied 2016-12-14 12:36:51 +01:00
Glowbal
2151fcad8f #4692 Update dev homepage for v3.8.3 
[ci skip]
 2016-12-13 23:16:41 +01:00
Glowbal
86fd9347f8 #4692 update homepage for v3.8.3 
[ci skip]
 2016-12-13 23:16:12 +01:00
Glowbal
c8ef10341e Merged branch release-v3.8.3 into master 2016-12-13 23:14:12 +01:00
Glowbal
0df98f794c Prep 3.8.3 2016-12-12 19:50:16 +01:00
jonpas
1ecd674ac6 Exclude uniforms with inherited modelSides (#4720) 2016-12-12 19:36:53 +01:00
PabstMirror
06caea825b AdvThrow - Make sure ammo setVar is not empty (#4743) 2016-12-12 19:33:34 +01:00
commy2
757ab78191 fix usage of reserved variable "" in FUNC(getDetectorConfig), fix #4741 (#4742) 2016-12-12 19:33:05 +01:00
PabstMirror
11b464b585 Fix blood drop selection if blood loss is high 
close #4739
 2016-12-12 19:32:23 +01:00
PabstMirror
de34d57d5b Update SMG_02 base class for 1.66 (#4718) 2016-12-12 19:31:52 +01:00
PabstMirror
14c7e9af17 AF - Remove setVar when removing eh 2016-12-12 19:30:58 +01:00
magicsh0tz
d1287a471d Switched to CBA_fnc_waitAndExecute (#4709) 
* Switched to CBA_fnc_waitAndExecute

* Switched to CBA_fnc_waitAndExecute
 2016-12-12 19:30:21 +01:00
Glowbal
b72541df23 Jpn translation v382 (#4710) 
* jpn scopes translation

this is Japanese translation for scope

* fix jpn weather translation

Fix for Weather japanese translation

* fix jpn Repair translation

fix jpn Repair translation

* jpn zeus translation

Japanese localization for zeus
 2016-12-12 19:29:58 +01:00