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
10,298 Commits 73 Branches 88 Tags 752 MiB
e4c36d9fa0
Commit Graph

10298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glowbal
e4c36d9fa0 Change injuries include to ACE_Medical_Injuries 2016-07-15 12:10:18 +02:00
Glowbal
565da090bc Add missing bracket 2016-07-15 11:53:57 +02:00
Glowbal
ab2075c328 Merge branch 'master' into medical-rewrite 
Conflicts:
	addons/medical/CfgEden.hpp
	addons/medical/functions/fnc_reviveStateLoop.sqf
	addons/medical/functions/fnc_serverRemoveBody.sqf
	addons/medical/functions/fnc_unconsciousPFH.sqf
 2016-07-15 11:50:58 +02:00
Glowbal
c8a54fd090 Merge branch 'release' 2016-07-15 02:03:42 +02:00
bux578
2f73271d18 Merge pull request #4117 from acemod/fixCachedCallEvents 
Fix cached call events
 2016-07-14 21:55:42 +02:00
PabstMirror
1213c08e4b Fix cached call events 2016-07-14 13:06:45 -05:00
bux578
97f5374118 Merge pull request #4115 from acemod/cut-ropes-keybind 
Cut ropes keybind
 2016-07-14 15:35:31 +02:00
bux578
630ab70982 Merge branch 'release' into cut-ropes-keybind 2016-07-14 15:30:38 +02:00
bux578
0dcc89251c Merge pull request #4113 from acemod/microdagr-zero-fixes 
Fixed MicroDAGR trailing zero
 2016-07-14 15:28:11 +02:00
bux578
51bdf32f9f Merge branch 'release' into microdagr-zero-fixes 2016-07-14 15:25:25 +02:00
ColdEvul
492f075ac8 Added fixed name for Weapon_SMG_05_F (MP5K) for EDEN item. 2016-07-14 15:18:29 +02:00
ColdEvul
43c1c89cc1 Made new APEX crates draggable 2016-07-14 15:12:54 +02:00
Glowbal
2f2c4b91a1 3.6.2 2016-07-14 14:51:46 +02:00
BaerMitUmlaut
21f1329762 Added keybind to cut ropes 2016-07-14 08:13:52 +02:00
BaerMitUmlaut
40d460b1b6 Fixed MicroDAGR trailing zero 2016-07-14 03:32:30 +02:00
Glowbal
10b7e5d270 Merge pull request #4107 from acemod/fixMainMenuAceOptionsPlacement 
Fix MainMenu Ace_Options Placement to top left
 2016-07-14 01:39:18 +02:00
Glowbal
11a72431c2 Merge pull request #4099 from acemod/FixMinigunMags 
Add missing vanilla magazines to LMG_Minigun
 2016-07-14 01:38:58 +02:00
Glowbal
078647c403 Merge pull request #4097 from acemod/fixApex3denLayout-cherry-pick 
Fix 3den attribute layout for 1.62, target release
 2016-07-14 01:38:41 +02:00
Glowbal
9d14121a9e Merge pull request #4096 from acemod/func-dogesture 
use a function to do gestures
 2016-07-14 01:38:18 +02:00
Glowbal
53b42710d1 Merge pull request #4095 from acemod/blurScreenDoc 
Add description and example to blur screen function
 2016-07-14 01:37:32 +02:00
PabstMirror
13e182a7a9 Fix MainMenu Ace_Options Placement to top left 
Stick ace_options button placement to top left
so it doesn't interfere with apex singleplayer menu
 2016-07-13 13:49:05 -05:00
commy2
cc76ac482a add priority parameter to doGesture 2016-07-13 11:00:31 +02:00
commy2
404d5b49b4 add function to read vanilla keybinds 2016-07-13 10:40:28 +02:00
PabstMirror
981dc874a4 Add missing vanilla magazines to LMG_Minigun 
Fix #4098
Missing:
"500Rnd_65x39_Belt"
"500Rnd_65x39_Belt_Tracer_Red_Splash"
"500Rnd_65x39_Belt_Tracer_Green_Splash"
"500Rnd_65x39_Belt_Tracer_Yellow_Splash"
 2016-07-12 13:17:29 -05:00
PabstMirror
0281bc8f3d Fix 3den attribute layout for 1.62 2016-07-12 17:54:16 +02:00
commy2
ce72bfd07a replace tabs with spaces 2016-07-12 16:28:36 +02:00
PabstMirror
a0aea441b4 Fix reload mutex with binocs or mounted 
Fix #4088
 2016-07-12 16:22:27 +02:00
commy2
8a4514f8e7 use a function to do gestures 2016-07-12 16:16:01 +02:00
jonpas
845dca9ea5 Add description and example to blur screen function 2016-07-12 16:13:53 +02:00
Glowbal
96a08dfc01 Merge pull request #3923 from voiperr/grenadesounds 
Grenade + Chemlight Sounds
 2016-07-12 13:37:40 +02:00
Glowbal
02fea363b6 Merge pull request #3940 from acemod/particles 
Custom smoke particles
 2016-07-12 13:36:36 +02:00
Glowbal
ee8e03a1ae Merge pull request #3916 from acemod/merge-basic-and-advanced 
Merge basic and advanced injury systems
 2016-07-12 13:36:02 +02:00
Glowbal
0e740f00c3 Merge branch 'release' 2016-07-11 23:42:03 +02:00
Glowbal
de612d9613 Merge branch 'apex' into release 2016-07-11 20:59:34 +02:00
Glowbal
8e3ad9a032 Merge pull request #4083 from acemod/required-addons-apex-cherry-pick 
Required addons for APEX
 2016-07-11 20:58:50 +02:00
Glowbal
0869cf96bd required arma3 version 1.62. closes #4081 2016-07-11 19:27:40 +02:00
Glowbal
d0c30577af Remove usage of setUnconscious 2016-07-11 19:18:40 +02:00
Glowbal
86c67d9e33 Merge branch 'apex' into release 2016-07-11 19:04:53 +02:00
Glowbal
d2a40f16da Merge pull request #4084 from acemod/add-component-dependency 
Add ACE javelin as required addon dependency
 2016-07-11 18:45:25 +02:00
commy2
17f848fba9 Merge pull request #4063 from acemod/gunbag-assault-rifles-cherry-pick 
enable gunbag for all non-machinegun primary weapons
 2016-07-11 17:40:53 +02:00
Glowbal
35a6636ca3 Add ACE javelin as required addon dependency 2016-07-11 12:08:12 +02:00
commy2
25a3405d1f required addons apex, close #4020 2016-07-11 12:01:47 +02:00
Glowbal
dbac1c6398 Merge branch 'apex' into release 2016-07-11 11:16:50 +02:00
Glowbal
02f08939f2 Merge pull request #4052 from acemod/fix4049 
Mine detector optimization and cleanup
 2016-07-11 11:16:16 +02:00
Glowbal
9b85bc3e29 v3.6.1 2016-07-11 11:15:36 +02:00
Nicolás Badano
aa01c0d940 Merge pull request #4078 from acemod/fixNavalMines 
Allow defusing naval mines
 2016-07-11 00:40:13 +02:00
PabstMirror
74da791610 Proper fix for naval mines 2016-07-10 17:29:19 -05:00
PabstMirror
721bc205ef Allow defusing naval mines 
Fix #4074
- Workaround for naval mines not working with deactivate
- Add "isNotSwimming" exception to defuse progress bar
 2016-07-10 13:49:06 -05:00
esteldunedain
9323314da5 Merge branch 'fix4049' of github.com:KoffeinFlummi/ACE3 into fix4049 2016-07-09 20:04:20 -03:00
esteldunedain
165bd4b3f8 Make volume consistent 2016-07-09 20:00:53 -03:00