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
5,909 Commits 73 Branches 88 Tags 752 MiB
38bd2896ab
Commit Graph

5909 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ViperMaul
38bd2896ab Merge pull request #1851 from SzwedzikPL/hearing_in_zeus 
Disable hearing in zeus camera
 2015-07-25 10:44:34 -07:00
ViperMaul
55614b9ac3 Merge pull request #1839 from acemod/hearingUnification 
Hearing PFEH unification / Flashbangs
 2015-07-25 10:44:11 -07:00
PabstMirror
2a19521f68 Merge pull request #1820 from acemod/mk6-fixBISleveling 
Mk6 fix leveling
 2015-07-25 12:36:28 -05:00
KoffeinFlummi
88a5609016 Merge branch 'master' of https://github.com/acemod/ACE3 2015-07-25 19:35:26 +02:00
KoffeinFlummi
9805a8270a Merge branch 'master' into german-merge 2015-07-25 19:35:03 +02:00
PabstMirror
9e831d257d Merge pull request #1768 from acemod/10digitGrids2 
10 digit grids 2
 2015-07-25 12:32:02 -05:00
Glowbal
9d7374c893 Merge pull request #1307 from jokoho48/master 
Cut Parachute/Reserve parachute
 2015-07-25 19:17:37 +02:00
Glowbal
76c0108430 Merge pull request #1904 from SzwedzikPL/backpack_macro 
macro_addbackpack
 2015-07-25 16:49:42 +02:00
SzwedzikPL
6569fe1d62 macro_addbackpack 2015-07-25 13:13:31 +02:00
Glowbal
0ce50d7b17 Merge pull request #1896 from acemod/medicalTreatmentEndAnim 
Medical - Don't play *_medic anims at end
 2015-07-25 09:27:18 +02:00
Glowbal
216ea007f8 Merge pull request #1895 from acemod/revert-1894-fixNameTagsSettings 
Revert "Fixed NameTags Settings defaults"
 2015-07-23 21:05:46 +02:00
Glowbal
9c3afe3b82 Revert "Fixed NameTags Settings defaults" 2015-07-23 21:05:30 +02:00
PabstMirror
1b590bf0f9 More nametag fixes / setSetting casting 2015-07-23 14:05:20 -05:00
Glowbal
ae65198ed8 Merge pull request #1894 from jonpas/fixNameTagsSettings 
Fixed NameTags Settings defaults
 2015-07-23 20:31:23 +02:00
jonpas
817dfe94e2 Added possible values 2015-07-23 20:29:51 +02:00
jonpas
964f32a721 Fixed NameTags Settings defaults 2015-07-23 20:26:31 +02:00
PabstMirror
cbd74d768b Medical - Don't play *_medic anims at end 2015-07-23 02:43:19 -05:00
bux
2377a54051 replace underscore with dash 2015-07-23 09:05:26 +02:00
bux578
3e420b6bf6 replace underscore by dashes 2015-07-21 19:02:32 +02:00
bux578
d98b60dd17 fix typos in the right repo 
oh bux ...
 2015-07-21 18:59:53 +02:00
Glowbal
5508eae314 Merge pull request #1875 from jokoho48/3dModelUpdate2 
3D Model Update 2.0
 2015-07-21 12:22:28 +02:00
SilentSpike
186d4d0583 Fix for #1665 2015-07-20 21:14:30 +01:00
ViperMaul
22d41797ac Merge pull request #1804 from acemod/misGuideStuff 
Missle Guidance / Javelin Fixes
 2015-07-20 11:28:18 -07:00
Joko
9bdb192c8a Add New LitterGloves 
Add New Litter/packingbandage
Change all Litter Model and Texture to a nomenclature (littergeneric_name)
 2015-07-19 15:31:15 +02:00
Glowbal
da5afde324 Merge pull request #1874 from jokoho48/TacticalLadderShootFix 
Fix shoot through Tacticalladder
 2015-07-19 15:08:12 +02:00
SilentSpike
123825a6fe Updating zeus waypoint actions icon 2015-07-19 12:23:57 +01:00
Joko
2615d99178 Fix shoot through Tacticalladder 2015-07-19 03:32:07 +02:00
Glowbal
015fd1afb0 Merge pull request #1864 from jokoho48/TextureUpdate 
Update IV Blood and Plasma Texture
 2015-07-17 11:06:49 +02:00
Joko
1b9d02a8a5 Update IV Blood and Plasma Texture 2015-07-17 09:40:43 +02:00
Glowbal
0154dfc51e Merge pull request #1799 from jokoho48/3DModelUpdate 
Add and Update Some 3D Object and Textures
 2015-07-17 08:17:42 +02:00
PabstMirror
f845d54290 #1634 - Integrate with DAGR 2015-07-16 18:35:38 -05:00
PabstMirror
f438c6d0c5 Revert "Use new worldSize command instead of whileLoop" 
This reverts commit 7d26519b2e.
 2015-07-16 18:10:10 -05:00
PabstMirror
7d26519b2e Use new worldSize command instead of whileLoop 2015-07-16 17:47:39 -05:00
PabstMirror
b47a17230b Merge branch 'master' into 10digitGrids2 2015-07-16 17:26:19 -05:00
Nicolás Badano
04e137090b Merge pull request #1753 from jonpas/slideshow 
Slideshow
 2015-07-16 18:25:05 -03:00
Nicolás Badano
67d83d0d49 Merge pull request #1862 from acemod/disappearingActionsFix 
Cache the objects actions for nearby objects and set the GVAR(objectA…
 2015-07-16 18:24:55 -03:00
jonpas
77631eb61c Only add ACE_MainActions if one doesn't exist yet, Cleaned comments 2015-07-16 23:16:09 +02:00
jonpas
23e7e19100 Fixed macro, Added privates 2015-07-16 22:39:02 +02:00
esteldunedain
8da43d25c6 Cache the objects actions for nearby objects and set the GVAR(objectActionList) correctly. 2015-07-16 17:28:27 -03:00
jonpas
a136545b85 Merge branch 'master' into slideshow 2015-07-16 22:20:56 +02:00
PabstMirror
a5ba23ee88 Merge pull request #1855 from jonpas/sittingInheritanceFixes 
Fixed chairs inheritance in sitting
 2015-07-16 12:01:56 -05:00
Joko
d92e6af1c2 Add IRStrobe to CfgMagazines 2015-07-16 15:17:09 +02:00
Joko
0ba8a39dc5 Add LoD to Wirecutter 2015-07-16 14:46:08 +02:00
Joko
c9a47ec053 Add LoDs for IVBag 250/500/1000 
Add LoDs for Kestrell
 2015-07-16 14:41:42 +02:00
Joko
b2b7015b8e Remove Unessesary Comments in RVMAT 2015-07-15 21:35:30 +02:00
Joko
9aa0285064 Revert LoD Changes 2015-07-15 21:13:05 +02:00
Joko
fd4d4abb73 Move UAV Battery form models to data 
change LoD Distance
Fix IVBag names(my issue)
 2015-07-15 20:51:06 +02:00
Joko
a72312738e Add to all Objects a LoD with nothing in for "hiding" Objects in Distance 
Remove Old Earplugs
Use 3 Object instead of 9 for IVBag with Using of Model Config
 2015-07-15 20:34:35 +02:00
jonpas
e1fb4db63a Fixed chairs inheritance in sitting 2015-07-15 00:42:41 +02:00
PabstMirror
14eae93f4b #1814 - Save and restore last mortar charge setting 2015-07-13 19:09:55 -05:00