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

7181 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BaerMitUmlaut
a29902ddb3 More use of params, event system, removed compile 2015-09-11 15:36:23 +02:00
BaerMitUmlaut
45bfa3eaf5 Fixed vanishing mags and localized hint 2015-09-10 22:23:37 +02:00
BaerMitUmlaut
c26107bc5c Added ability to pass a magazine 2015-09-08 14:07:16 +02:00
BaerMitUmlaut
da423672cf Merge branch 'master' of https://github.com/acemod/ACE3 2015-09-08 10:54:05 +02:00
bux578
74cb948323 Merge pull request #2177 from alganthe/documentation_pass_11 
documentation pass 11
 2015-09-07 18:49:24 +02:00
alganthe
b3da51c1c5 information center typo fix 2 
THE FINAL COUNTDOOOOWN TADADA DAA DDADADA DA DA
 2015-09-07 18:28:08 +02:00
alganthe
46b4c43911 reloadlauncher typo fix and sitting framework removed 2015-09-07 16:59:29 +02:00
alganthe
a602feb5ba information center typos fix 2015-09-07 16:54:09 +02:00
alganthe
aac356cff8 how to report an issue typos fix 2015-09-07 16:45:05 +02:00
alganthe
12caa51040 reloadlaunchers typos fix 2015-09-07 16:30:59 +02:00
alganthe
5cefa11c68 HuntIR typos fix 2015-09-07 16:27:52 +02:00
alganthe
d2013794ec mk6 mortar typos fix 2015-09-07 16:25:37 +02:00
Glowbal
127af91037 Merge pull request #2308 from gienkov/pl-translation-7 
PL Translation
 2015-09-07 16:16:54 +02:00
gienkov
ad50c1ab4b medical and repair translation 2015-09-07 16:15:18 +02:00
gienkov
c4475ff5be Merge branch 'pl-translation-7' of https://github.com/gienkov/ACE3 into pl-translation-7 2015-09-07 16:06:17 +02:00
gienkov
1edcc320d1 Merge remote-tracking branch 'origin' into pl-translation-7 2015-09-07 16:05:45 +02:00
alganthe
84afb0f602 medical system typos fix 2015-09-07 15:56:09 +02:00
alganthe
96b7c42a63 maptools typos fix 2015-09-07 15:56:09 +02:00
Glowbal
7b349ab388 Merge pull request #2361 from acemod/medical-adjustments2 
Medical adjustments2
 2015-09-07 15:51:27 +02:00
ViperMaul
2fc35338d5 Build number for Release Candidate 2015-09-06 21:37:20 -07:00
Felix Wiegand
fe99cf83b3 Change alt text on slack badge 2015-09-07 00:50:22 +02:00
Felix Wiegand
ad8660c989 Add slack badge to README 2015-09-07 00:44:15 +02:00
commy2
adb1a11211 increase leg and arm armor value, more TRACE debug 2015-09-06 11:49:08 +02:00
ViperMaul
98202f4f38 Additional debug statements for caching and wounds. 2015-09-05 15:31:14 -07:00
Glowbal
a745b07cb6 Merge pull request #2365 from jonpas/addSparePartsSettingInitDelay 
Used new setting init delay function in addSpareParts
 2015-09-05 21:18:25 +02:00
jonpas
a8412361bd Use setting init delay function for addSpareParts 2015-09-05 19:33:25 +02:00
Joko
b03589ec34 Merge pull request #2364 from TheMagnetar/patch-1 
Repair: Fix possible out of bounds setting
 2015-09-05 19:18:15 +02:00
TheMagnetar
27a0e8f639 Repair: Fix possible out of bounds setting 
Setting "engineerSetting_fullRepair" had an out of bounds default value.
 2015-09-05 16:30:00 +02:00
Glowbal
315f46c6c6 Merge branch 'master' into medical-adjustments2 2015-09-05 14:41:25 +02:00
Glowbal
0a6b77b902 Removed more deprecated wound sync code 2015-09-05 14:10:28 +02:00
Glowbal
e4c246984f Removed another debug trace that should not be there 2015-09-05 14:10:04 +02:00
Glowbal
d9af19df28 properly fixes unconscious weird behavior. Because it never registered any unconscious conditions. 2015-09-05 14:08:46 +02:00
Glowbal
41db78b52b Merge pull request #2341 from acemod/323tracers 
better scaling for tracer sizes, fix #1008
 2015-09-05 13:47:37 +02:00
commy2
46d741281b Merge pull request #2358 from acemod/322flashbangexplosive 
sort flashbang under explosive grenades, not misc grenades
 2015-09-05 13:40:24 +02:00
Glowbal
a4b4c5d2a3 Merge pull request #2187 from jonpas/trackToTrackedVehicles 
Added Spare Parts module handling
 2015-09-05 13:36:42 +02:00
Glowbal
dad96822be Only add 1/4 of the new damage to pain instead of everything. 2015-09-05 13:27:02 +02:00
Glowbal
6405ef7d91 Merge branch 'master' into medical-adjustments2 2015-09-05 13:22:44 +02:00
Glowbal
f15a1c033d Added allowSelfTreatment attribute to treatment actions 2015-09-05 13:20:19 +02:00
Glowbal
f0a074072f Merge pull request #2329 from acemod/323medicalstrcturaldamage 
setStructuralDamage function
 2015-09-05 13:16:13 +02:00
Glowbal
446f367f8b Merge pull request #2359 from acemod/fixRestoreGear 
fix restore gear
 2015-09-05 13:09:21 +02:00
Glowbal
9c7f7429d1 Merge pull request #2350 from jonpas/cargoHideActionOnLocked 
Prevent Cargo opening if vehicle is locked
 2015-09-05 13:09:14 +02:00
Glowbal
a4e406658f Reduced initial knockdown time for basic medical 2015-09-05 13:02:19 +02:00
Glowbal
17ad7ecb8c replaced diag_logs by trace 2015-09-05 12:59:09 +02:00
Glowbal
9c0288cd3f Removed debug message 2015-09-05 12:55:49 +02:00
Glowbal
c8a7b94777 Merge pull request #2363 from acemod/MedicalMenuBlackoutBlur 
Add Screen Blur and Blackout for Medical Menu by Interact_menu setting
 2015-09-05 12:53:04 +02:00
Glowbal
d617fba6c6 Merge branch 'master' into medical-adjustments2 2015-09-05 12:51:18 +02:00
Glowbal
c828544d02 Added init stacking 2015-09-05 12:50:32 +02:00
jokoho48
c70c9cdee6 Add Screen Blur and Blackout for Medical Menu by Interact_menu setting 2015-09-05 12:49:23 +02:00
Glowbal
23d45c53cf Merge branch 'master' into medical-adjustments2 2015-09-05 12:47:32 +02:00
Glowbal
c673ea2cbb Restored uniqueIds 2015-09-05 12:38:12 +02:00