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
2,752 Commits 73 Branches 88 Tags 752 MiB
8b1bce3b3d
Commit Graph

2752 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
KoffeinFlummi
8b1bce3b3d Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-14 23:00:59 +02:00
KoffeinFlummi
9e64538bc7 Fix minor adjustment strings 2015-04-14 23:00:17 +02:00
ulteq
8aad369ed3 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-14 22:23:56 +02:00
ulteq
035ed573b8 Reworked the magazine configs 2015-04-14 22:23:36 +02:00
ulteq
1d64b8c36e Added the new magazines into various ammo boxes 2015-04-14 22:22:36 +02:00
ulteq
e214511e36 Added new magazine classes: 
*ACE_100Rnd_65x39_caseless_mag_Tracer_Dim
*ACE_200Rnd_65x39_cased_Box_Tracer_Dim
*ACE_30Rnd_556x45_Stanag_Mk262_mag
*ACE_30Rnd_556x45_Stanag_Mk318_mag
*ACE_10Rnd_762x51_M118LR_Mag
*ACE_20Rnd_762x51_M118LR_Mag
*ACE_20Rnd_762x67_Mk248_Mod_0_Mag
*ACE_20Rnd_762x67_Mk248_Mod_1_Mag
*ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag
*ACE_30Rnd_65x47_Scenar_mag
*ACE_10Rnd_762x54_Tracer_mag
 2015-04-14 22:19:51 +02:00
ulteq
f0a716fee8 Added new ammo classes: 
*762x67mm Mk248 Mod 0
*762x67mm Mk248 Mod 1
*762x67mm Berger Hybrid OTM
*65x47mm Scenar
 2015-04-14 22:17:27 +02:00
Nicolás Badano
462947a04c Merge pull request #585 from acemod/fix-clientSetable 
Fix spelling of "isClientSetable"
 2015-04-14 16:48:50 -03:00
KoffeinFlummi
ebcdafe610 Fix spelling of "isClientSetable" 2015-04-14 21:43:19 +02:00
ViperMaul
f9630f3a1c Merge pull request #582 from acemod/build_check_for_obsolete_pbos 
Added Obsolete PBO removal support added to build.py
 2015-04-14 12:01:46 -07:00
jaynus
2f2eab87e2 Merge branch 'master' of github.com:acemod/ACE3 2015-04-14 11:42:38 -07:00
jaynus
739807303b Fix script error for canceling designation and dying while designating. 2015-04-14 11:42:26 -07:00
jaynus
0ae27d16c5 Merge pull request #580 from acemod/seeker_fov 
Seeker FOV check optimizations
 2015-04-14 11:19:00 -07:00
jaynus
24830f815f random lock interval was causing phasing. 2015-04-14 11:18:16 -07:00
ulteq
cf7caf4549 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-14 20:18:03 +02:00
ulteq
837f155ad7 Fixed incorrect key handler return value 2015-04-14 20:17:54 +02:00
Nicolás Badano
5a84e65128 Merge pull request #581 from meat147/patch-1 
Update AUTHORS.txt
 2015-04-14 15:12:08 -03:00
Pierre (meat)
c76abbe98a Update AUTHORS.txt 
blackpixxel was twice listed
 2015-04-14 19:57:23 +02:00
ViperMaul
db890f3b48 #576 - Obsolete PBO removal support added to build.py 2015-04-14 10:52:30 -07:00
jaynus
1dd41a00ba integration. 2015-04-14 10:51:53 -07:00
jaynus
226312c504 Merge remote-tracking branch 'origin/master' into seeker_fov 
Conflicts:
	addons/missileguidance/functions/fnc_checkSeekerAngle.sqf
 2015-04-14 10:47:40 -07:00
jaynus
511ca860e0 Merge pull request #579 from acemod/moreJavelinLockingFixes 
More javelin locking + UI fixes
 2015-04-14 10:40:51 -07:00
jaynus
fb5b524023 Loosen DAGR curve 2015-04-14 10:39:00 -07:00
jaynus
f0940707be Disable locking on unloaded. Closes #539 2015-04-14 10:27:37 -07:00
jaynus
6f3ce27894 Javelin refined, working, locking fixes, UI fixes, missile guidance rewrite 2015-04-14 10:25:08 -07:00
jaynus
c436541f1c Reworked, fun fun. 2015-04-14 09:36:39 -07:00
jaynus
376f924999 Finish guidance rewrite. 2015-04-14 08:24:13 -07:00
Nicolás Badano
a93cb310d4 Merge pull request #513 from acemod/mainCleanup 
ACE_Main major cleanup
 2015-04-14 10:25:14 -03:00
esteldunedain
c827c72412 AB and Kestrel: Move macros from defines.h to script_component 2015-04-14 10:22:26 -03:00
KoffeinFlummi
57c526c04d Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-14 15:12:46 +02:00
KoffeinFlummi
c1fccecb21 Merge branch 'patch-4' of https://github.com/ruPaladin/ACE3 into russian-merge 2015-04-14 15:12:24 +02:00
Nicolás Badano
85d253cdc1 Merge pull request #574 from gienkov/master 
Advanced Ballistics PL translation
 2015-04-14 10:10:59 -03:00
KoffeinFlummi
b563bf8a8e Merge branch 'Update-Stringtable-Common' of https://github.com/licht-im-Norden87/ACE3 into german-merge 2015-04-14 15:04:42 +02:00
KoffeinFlummi
63fe4118d4 Merge https://github.com/FreeZbe/ACE3 into french-merge 2015-04-14 14:48:13 +02:00
ulteq
994071960c Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-14 12:52:30 +02:00
ulteq
1a39005e72 Removed debug output. 2015-04-14 12:52:21 +02:00
KoffeinFlummi
96319c8799 Merge https://github.com/ruPaladin/ACE3 into russian-merge 2015-04-14 12:50:14 +02:00
ulteq
44232987b0 Commented out deprecated icon paths 2015-04-14 12:34:27 +02:00
ulteq
3d558f376f Fixed some icon path names 2015-04-14 12:16:29 +02:00
Grzegorz Sikora
1be197728e AdvBal PL translation 2015-04-14 11:42:52 +02:00
Grzegorz Sikora
d94f89da10 Merge branch 'master' of https://github.com/gienkov/ACE3 2015-04-14 11:31:38 +02:00
ulteq
5f5820039e Merge pull request #373 from acemod/Kestrel4500 
Kestrel4500
 2015-04-14 11:14:38 +02:00
ulteq
864a3c3cda Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500 
Conflicts:
	addons/weather/XEH_postInit.sqf
 2015-04-14 11:14:27 +02:00
ulteq
5a7078ad2c Removed a deprecated workaround 2015-04-14 11:12:58 +02:00
ulteq
3fc539bdf3 Merge pull request #320 from acemod/AdvancedBallistics 
AdvancedBallistics
 2015-04-14 11:11:46 +02:00
ulteq
9f0388fa12 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into AdvancedBallistics 2015-04-14 11:09:38 +02:00
ulteq
1c98b97d1a Merge pull request #355 from acemod/ATragMX 
ATragMX
 2015-04-14 11:08:02 +02:00
ulteq
983a36e52d Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ATragMX 2015-04-14 11:06:32 +02:00
ulteq
81c510f230 Merge pull request #449 from acemod/largerScopeaAdjustments 
Scope adjustment overhaul
 2015-04-14 11:05:10 +02:00
ulteq
d931745f5c Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into largerScopeaAdjustments 2015-04-14 11:02:37 +02:00