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
14,956 Commits 73 Branches 88 Tags 752 MiB
6e8a27c9a6
Commit Graph

224 Commits

Author SHA1 Message Date
VKing
2af3d9e769 Don't show adjustment or click sound if the adjustment doesn't happen 2016-01-18 16:16:53 +01:00
commy2
d037f00a92 fix forEachIndex capitalization 2015-11-30 17:25:16 +01:00
commy2
b3950bd7f0 fix forEach capitalization 2015-11-30 17:23:48 +01:00
commy2
ca9b909e75 fix CBA_fnc capitalization 2015-11-30 16:45:20 +01:00
commy2
e5c4d35969 1.55 use new selectRandom command 2015-11-29 16:33:25 +01:00
VKing
069169cc72 Changed ACE_time back to time in comments where appropriate 2015-10-21 22:52:21 +02:00
PabstMirror
5f0d73bab6 Cleanup more stuff 2015-09-18 14:24:20 -05:00
PabstMirror
c62ea5e406 Fix some nil functions 2015-09-18 13:47:19 -05:00
jokoho48
b7e02da1cc remove if (!hasInterface) from PFH 
move ! in ()
 2015-09-11 16:58:26 +02:00
Michael Braun
9352a8dbcb Hotfix for missreplaced variable in projectile direction adjustment 2015-08-23 18:38:19 +02:00
Glowbal
2b3c936e99 count should be a foreach 2015-08-09 00:41:43 +02:00
PabstMirror
d5a3c66b89 Minor Spelllings Fixes 2015-08-08 14:17:03 -05:00
Michael Braun
680bbebc02 Fixed missing private in scopes 2015-08-08 11:25:45 +02:00
Michael Braun
fb32bbf8de Code cleanup of scopes module 2015-08-07 16:43:06 +02:00
jonpas
332afb2174 Allow certain self-interactions while sitting 2015-06-09 16:17:05 +02:00
jonpas
763cb07629 Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
ulteq
ee022e1dea Fixes broken scope config (#1312) 2015-05-23 17:06:46 +02:00
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00
ulteq
458daad5bb Elevation and windage can now have different adjustment increments: 
* ACE_ScopeAdjust_VerticalIncrement
* ACE_ScopeAdjust_HorizontalIncrement
 2015-05-19 20:13:31 +02:00
ulteq
253ed6946e scope firedEH cleanup 2015-05-09 20:02:22 +02:00
PabstMirror
a4c710bd28 Switch scopes to use firedBIS 2015-05-08 13:36:24 -05:00
Lukas
3434964f4f Update stringtable.xml 2015-05-03 11:54:18 +02:00
ProfessorCZ
a0e443cfc6 Czech translation - Update 2015-05-03 11:48:56 +02:00
ToasterBR
021b00c722 Translation to Portuguese 
Done all remaining portuguese translations, including some minor
corrections
 2015-05-02 03:38:53 -03:00
KoffeinFlummi
e96f23c197 Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge 
Conflicts:
	addons/atragmx/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/medical/stringtable.xml
	addons/mk6mortar/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/respawn/stringtable.xml
 2015-05-01 17:30:59 +02:00
Glowbal
1ca0d66f30 Initial categories 2015-04-30 22:02:20 +02:00
Harakhti
4e165e2572 Update Hungarian translations 
Let us match the current revision. At the time of making, the Ballistics
XML was broken.
 2015-04-30 13:25:25 +02:00
ulteq
f83f8dad0e Fixes: https://github.com/acemod/ACE3/issues/904 2015-04-29 09:27:49 +02:00
ulteq
d6f757e096 Enabled scope adjustments for the Khalia (old) optic 2015-04-27 11:04:12 +02:00
KoffeinFlummi
3aafa2082d Merge https://github.com/nomisum/ACE3 into german-merge 
Conflicts:
	addons/atragmx/stringtable.xml
	addons/scopes/stringtable.xml
	addons/weather/stringtable.xml
 2015-04-19 00:39:44 +02:00
ulteq
21c772aa8d Fixed scope adjustment conflicting with vehicle weapon zeroing 2015-04-18 23:14:40 +02:00
FreeZbe
f55bd5a629 French: updates / fixes stringtable 2015-04-18 18:49:46 +02:00
PabstMirror
ed2e847247 More Privates 2015-04-17 18:13:09 -05:00
KoffeinFlummi
20e4858a0d Merge https://github.com/ramius86/ACE3 into italian-merge 2015-04-17 15:44:50 +02:00
nomisum
8813315f36 added missing translations german 2015-04-17 11:40:31 +02:00
KoffeinFlummi
11f9478035 Merge https://github.com/Legolasindar/ACE3 into spanish-merge 
Conflicts:
	addons/advanced_ballistics/stringtable.xml
	addons/atragmx/stringtable.xml
	addons/ballistics/stringtable.xml
	addons/javelin/stringtable.xml
	addons/kestrel4500/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/medical/stringtable.xml
	addons/scopes/stringtable.xml
	addons/weather/stringtable.xml
 2015-04-16 18:31:31 +02:00
Marco
fda1febc30 Update stringtable.xml 
IT
 2015-04-16 10:21:49 +02:00
ruPaladin
26d53d255f Update stringtable.xml 2015-04-15 20:08:39 +03:00
Ivan Navarro Cabello
40b784fb7a update stringtable 
added spanish translate
 2015-04-15 17:41:10 +02:00
KoffeinFlummi
9e64538bc7 Fix minor adjustment strings 2015-04-14 23:00:17 +02:00
ulteq
837f155ad7 Fixed incorrect key handler return value 2015-04-14 20:17:54 +02:00
Grzegorz Sikora
1be197728e AdvBal PL translation 2015-04-14 11:42:52 +02:00
ulteq
2f39067cb3 Removed TABs 2015-04-14 10:47:09 +02:00
ulteq
1b2691ff1c Fixed incorrect calculation of the scope adjustment limits 2015-04-13 21:17:30 +02:00
ulteq
9893d940df Disabled advanced scope zeroing if AB is not enabled 2015-04-11 19:47:14 +02:00
ulteq
fee65cd56f Overhauled the scope adjustment module: 
*Added configs for the new marksmen scopes
*Introduced minor and major steps
*Introcuded a new increment config (ACE_ScopeAdjust_Increment)
*Changed the default zero range to 100m
*Added a zero reference setting
*Added an interaction menu entry to update the zero reference setting
 2015-04-11 14:02:44 +02:00
ulteq
127d100628 Overworked the scope adjustment keybinds: 
*Fixed duplicate actionIDs
*Introduced minor/major steps
*Reset the stringtable.xml
 2015-04-10 20:17:26 +02:00
esteldunedain
b44f22c262 Add 1 mil scope adjustment keybinds 2015-04-10 14:41:34 -03:00
esteldunedain
6447b39d1a Merge branch 'master' of github.com:KoffeinFlummi/ACE3 
Conflicts:
	addons/scopes/XEH_postInit.sqf
 2015-04-09 09:32:58 -03:00
esteldunedain
34639c153c Allow holding scope adjustment keys 2015-04-09 09:31:18 -03:00
commy2
b0575bad21 improve infoDisplayChanged EH 2015-04-03 17:50:52 +02:00
commy2
6d3ddfeb5e 2d scripted optics 2015-04-03 12:33:12 +02:00
commy2
3b23006797 fix error when aborting mission 2015-04-03 00:41:11 +02:00
commy2
88b9d0899f shortdot scope onDraw 2015-04-03 00:03:08 +02:00
commy2
35ad71bbfd add testing scope 2015-04-02 22:40:21 +02:00
Nicolás Badano
5e79970740 Switching nicknames 2015-03-24 01:18:00 -03:00
PabstMirror
7e383dc10e #198 canInteractWith EGVAR -> EFUNC 2015-03-20 17:55:39 -05:00
commy2
b5f307919e replace canInteract with canInteractWith 2015-03-15 13:00:10 +01:00
PabstMirror
4018742f26 Return False on keyUp Code 2015-03-05 02:51:24 -06:00
PabstMirror
0919e59719 Key Bind Redo (except vector) 2015-03-05 01:32:26 -06:00
Nicolás Badano
4a70d16f95 scopes: switch throttledPublicVariable by setVariablePublic 2015-02-12 12:21:46 -03:00
Nicolás Badano
a3dc1df109 scopes: moved getWeaponIndex to common 2015-02-12 11:57:55 -03:00
Nicolás Badano
a4815cb8ac scopes: reduce control numbers 2015-02-12 11:51:17 -03:00
Nicolás Badano
ff5c5a5bac scopes: Code cleaned up, removed spawns, added standard headers. 2015-02-10 01:22:10 -03:00
Nicolás Badano
eadcd82366 scopes: fixed errors, throttled sync of scope adjustment to all client and local calculation of deflections. 2015-02-09 23:00:40 -03:00
PabstMirror
9631154926 Set ADDON variable in XEH_preInit 2015-01-29 01:38:46 -06:00
KoffeinFlummi
c407553d49 Add remaining READMEs, add helper script 2015-01-26 14:34:48 +01:00
Nicolás Badano
112c9f319f scopes: partial fix 2015-01-18 18:34:45 -03:00
Nicolás Badano
60649d780c scopes: cba keybinds 2015-01-18 17:01:07 -03:00
PabstMirror
6e8c394903 Standardize Config Version Stuff 2015-01-18 01:32:07 -06:00
bux578
a1c167844d fix errors, but still no overlay 
and lots of spawns
 2015-01-18 08:13:37 +01:00
bux578
b13502c5f9 spaces 2015-01-16 13:20:01 +01:00
bux578
b556097896 cbafyied scopes 
still lots of spawns and waitUntils in there
 2015-01-16 13:15:14 +01:00