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,590 Commits 73 Branches 88 Tags 752 MiB
499a63e8e3
Commit Graph

5590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PabstMirror
499a63e8e3 External - Move to right of head 2015-07-08 15:53:31 -05:00
PabstMirror
b02086ca52 Intersection Check / FOV adjustment 2015-07-01 14:53:59 -05:00
PabstMirror
4570f77249 Privates / Cleanup 2015-06-20 20:40:17 -05:00
PabstMirror
25df7aad09 Attach use purely virtual object (no setPos) 2015-06-19 13:32:42 -05:00
Garth "L-H" de Wet
7129cb34fd Merge pull request #1688 from acemod/explosiveUnderwaterInteraction 
Enable interaction with explosives while swimming
 2015-06-19 11:52:49 +02:00
ulteq
474e694309 Enable interaction with explosives while swimming 2015-06-19 11:49:38 +02:00
ViperMaul
4eb39989e2 Merge pull request #1684 from acemod/fixMakeBuildErrorWithNOBIN 
make.py - Fix missing backup files forr $NOBIN$ situations
 2015-06-18 17:48:45 -07:00
ViperMaul
c0cdcbab62 fixing missing backup files for config.cpp and $pboprefix$ in $NOBIN$ situations 
#1682
 2015-06-18 17:43:12 -07:00
ViperMaul
394bcafc4a Set version to 3.1.2 2015-06-18 15:49:27 -07:00
PabstMirror
d7717448fa #1670 - Laser pointer - pass _brightness to drawFnc 2015-06-18 17:16:53 -05:00
ulteq
c3fea42bce Merge pull request #1622 from acemod/huntirHitpoints 
Added 'parachute' and 'camera' hitpoints to the HuntIR model:
 2015-06-18 11:03:15 +02:00
ulteq
95ae42ef41 Merge pull request #1671 from acemod/AceMiscBoxMissingItems 
Added HuntIR and tactical ladder to ACE_Box_Misc
 2015-06-18 11:02:28 +02:00
ulteq
bb877bc54c Added HuntIR and tactical ladder to ACE_Box_Misc 2015-06-18 11:02:04 +02:00
Glowbal
7b1015155c Merge pull request #1626 from acemod/cupCompatImprovment 
CUP weapon config improvement:
 2015-06-18 08:35:30 +02:00
Glowbal
0631a6ae7d Merge pull request #1647 from acemod/medicalStringtableFix 
Fixes: #1646
 2015-06-18 08:34:42 +02:00
Glowbal
160d659523 Merge pull request #1656 from acemod/wireCutterCwire 
Add concertinawire to wirecutters
 2015-06-18 08:34:02 +02:00
ViperMaul
7207aef5c2 Update proper file size for 3.1.1.zip 2015-06-17 19:24:44 -07:00
ViperMaul
85c40a4cf2 Merge pull request #1668 from acemod/release 
Release v3.1.1 merge into Master
 2015-06-17 19:15:35 -07:00
ViperMaul
bab33bfbe2 Bump the build number from 0 to 1 2015-06-17 08:15:19 -07:00
ViperMaul
6ee0672ba2 Update mod.cpp and readme to version 3.1.1 
#1651
 2015-06-17 07:52:30 -07:00
ViperMaul
e5a5832cac Merge branch 'release' of https://github.com/KoffeinFlummi/ACE3 into release 2015-06-16 22:43:46 -07:00
ViperMaul
47ef53201a Set version number to 3.1.1 2015-06-16 22:41:04 -07:00
Glowbal
a8998690ea Merge pull request #1650 from acemod/tacticalladderFixes 
Fixed model.cfg and requiredAddons
 2015-06-17 07:36:01 +02:00
Glowbal
d87ce29847 Merge pull request #1640 from acemod/fix-ab-extension 
New build of the AB extension
 2015-06-17 07:19:12 +02:00
ulteq
82d80359d1 Fixes: https://github.com/acemod/ACE3/issues/1646 2015-06-16 21:57:12 +02:00
Nicolás Badano
2afcf92643 Merge pull request #1440 from legman/akalegman 
IED Class Inheritance Fixes
 2015-06-16 13:35:19 -03:00
Glowbal
6374a39edb Fixed extra [ 2015-06-16 17:08:39 +02:00
Glowbal
e701f35b7b Build extension with strcpy instead of sprintf 2015-06-16 08:04:05 +02:00
Glowbal
154cf9d032 strcpy instead of sprintf 2015-06-16 08:03:11 +02:00
PabstMirror
196f3bd86b Add concertinawire to wirecutters 2015-06-15 23:59:21 -05:00
Glowbal
b6b203b57f New build of the AB extension 
Might fix the avx issue
 2015-06-15 22:30:22 +02:00
AKALegman
c027db2e0e final fixes 2015-06-15 20:55:49 +01:00
Nicolás Badano
fbf99224c4 Merge pull request #1635 from jonpas/fixCheckPBOkick 
Fixed CheckPBO Kick
 2015-06-15 15:43:28 -03:00
jonpas
04c06b51ed Fixed #1632 - CheckPBOs kick serverCommand changed to display 46 2015-06-15 20:23:16 +02:00
Nicolás Badano
57ac97707a Merge pull request #1633 from jonpas/checkPBOfix 
Fixed checkPBO function not executing on server
 2015-06-15 15:16:42 -03:00
jonpas
f61066f11a Fixed checkPBO function not executing on server 2015-06-15 19:55:30 +02:00
Glowbal
f8aa9a3171 Merge pull request #1621 from acemod/hrIncrease 
Medical - change hrIncrease random min/max
 2015-06-15 10:42:43 +02:00
ulteq
3c775b19ba CUP weapon config improvement: 
* Adjusted magazine initSpeed values
* Adjusted weapon initSpeed coefficients
* Recalculated all airFriction values
* Added missing ace configs to some classes
 2015-06-14 17:46:46 +02:00
AKALegman
5915e24f5d some fixes 2015-06-14 16:09:01 +01:00
Nicolás Badano
a730469868 Merge pull request #1623 from Legolasindar/master 
Updated spanish translation
 2015-06-14 11:57:49 -03:00
ulteq
32f02b72a5 Fixed missing 'HitEngine' RPT warning. 2015-06-14 13:57:38 +02:00
Ivan Navarro Cabello
76f7962dac Updated spanish stringatable 
Updated spanish stringatable for (Common, Medical, Optionsmenu,
Tacticalladder).
 2015-06-14 13:52:55 +02:00
Legolasindar
4d598d27cd Merge pull request #2 from acemod/master 
update my master fork
 2015-06-14 13:26:58 +02:00
ulteq
14fd5c930b You can no longer connect to destroyed HuntIR cameras 2015-06-14 12:54:10 +02:00
ulteq
af2e2f71fd Added 'parachute' and 'camera' hitpoints to the HuntIR model: 
* You can now shoot the parachute to make it fall faster
* And you can shoot the camera to kill the video feed
 2015-06-14 12:25:56 +02:00
PabstMirror
1c5788baab Medical - change hrIncrease random min/max 2015-06-14 03:54:50 -05:00
ulteq
8d6b7de0ad Fixed model.cfg and requiredAddons 2015-06-14 10:37:21 +02:00
AKALegman
0690e6f745 fixed conflicts 2015-06-14 09:36:03 +01:00
Glowbal
6d94f69cd8 Merge pull request #1620 from acemod/master 
Master > release for upcoming release
 2015-06-14 10:01:22 +02:00
ulteq
55fa94ebc4 Merge pull request #1619 from acemod/dagrMultipleDevices 
DAGR now supports the new multiple devices framework
 2015-06-14 09:59:20 +02:00