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,385 Commits 73 Branches 88 Tags 752 MiB
20a5c79431
Commit Graph

7385 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jokoho48
cc9cdae972 Merge branch 'release' of https://github.com/acemod/ACE3 into FixHCPPE 2015-09-09 20:25:48 +02:00
Glowbal
82d9e70c88 Merge pull request #2385 from jokoho48/BackBlastEnhanced 
Back blast enhanced
 2015-09-09 19:39:32 +02:00
bux578
abd22644e1 Merge pull request #2384 from jonpas/slackToForeignReadmes 
Added Slackin to DE and PL readmes
 2015-09-09 18:59:54 +02:00
jonpas
6f3ed6488e Added Slackin to DE and PL readmes 2015-09-09 18:56:02 +02:00
bux578
4639c5c4f9 Merge pull request #2377 from acemod/removeDocumentation 
remove documentation from master
 2015-09-09 18:48:26 +02:00
jokoho48
defbdf1b1a fix that HC throw a issue if PPEffect was used/applyed 2015-09-09 17:05:48 +02:00
Michael Braun
a5fb09a7e1 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros 
Conflicts:
	addons/repair/functions/fnc_moduleRepairSettings.sqf
 2015-09-09 02:55:12 +02:00
jokoho48
1ed52e08bf fix missing default 2015-09-08 19:45:46 +02:00
Glowbal
6a31140f7d Version 3.3.0 2015-09-08 19:38:52 +02:00
Glowbal
d6b51b2138 Merge pull request #2374 from acemod/microDagr 
Move MicroDAGR 3D model from BFT branch to microdagr module reopen #2373
 2015-09-08 19:31:02 +02:00
Glowbal
0c371ddf37 disabled debug for medical 2015-09-08 19:06:01 +02:00
bux578
6da19a43df remove documentation from master 2015-09-07 19:50:38 +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
ProfessorCZ
a28e9d96c7 Czech Translations - Update 2015-09-07 17:40:14 +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
jokoho48
7f6e7de68c Add LoD 
Lower Poly in Shadow LoD
 2015-09-07 16:10:55 +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
nsgundy
eee5664ec5 Move MicroDAGR 3D model from BFT branch to microdagr module 2015-09-07 11:05:18 +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
jokoho48
45eb8c4822 Add Code for CBA update 2.1 2015-09-06 19:34:46 +02:00
commy2
adb1a11211 increase leg and arm armor value, more TRACE debug 2015-09-06 11:49:08 +02:00
[OMCB]kaban
78084f271a Changed "Effect Zeus RC" to "Affects Zeus RC" 2015-09-06 07:11:27 +03: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
Jonathan Pereira
7147891710 Added latest ACE3 PT-BR translations 2015-09-05 15:12:31 -03: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
Jonathan Pereira
52147c43dc Merge remote-tracking branch 'acemod/master' into translating01 2015-09-05 13:07:05 -03: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