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
15,369 Commits 73 Branches 88 Tags 752 MiB
fe9f59bed7
Commit Graph

235 Commits

Author SHA1 Message Date
ulteq
3e0f85b4f1 RangeCard - Take bore height into account (#4715) 2016-12-01 21:20:51 +01:00
classic
05ddca5b90 Jpn translation v382 (#4710) 
* jpn scopes translation

this is Japanese translation for scope

* fix jpn weather translation

Fix for Weather japanese translation

* fix jpn Repair translation

fix jpn Repair translation

* jpn zeus translation

Japanese localization for zeus
 2016-11-25 18:50:07 +01:00
PabstMirror
a3c50a6c76 Add dev macro to quickly recompile functions (#4699) 2016-11-23 13:35:25 -06:00
ulteq
dbb59c8fd1 New 'overwriteZeroRange' setting 2016-11-20 09:05:42 +01:00
ulteq
bb71885b42 Added config settings to optic_Nightstalker, optic_NVS and optic_TWS 2016-11-20 09:05:42 +01:00
ulteq
273e603cad Fix 'ACE_ScopeZeroRange' setting being ignored when placed in weapon classes 
* Only relevant for weapons with integrated scopes
 2016-11-20 09:05:42 +01:00
ulteq
1f364da0df Fix 'forceUseOfAdjustmentTurrets` affecting all scopes including iron sights 2016-11-20 09:05:42 +01:00
ulteq
79d087e784 Reset scope adjustments when either the weapon or the scope change. 2016-11-15 23:11:22 +01:00
ulteq
8c49433b49 Added new ace_scopes module setting 'correctZeroing' (default on) 2016-11-15 23:11:22 +01:00
ulteq
2f23f1ca6c Bugfix - Fixes ace_scopes affecting under-barrel grenade launchers 2016-11-15 23:11:22 +01:00
ulteq
7fa73744e9 Cleanup - partly merged #4658 
* Removed getVariable QGVAR(Adjustment) boilerplate
* Less calls to setVariablePublic
* Removed vanilla zeroing element hiding (fixes warning in log file)
* Moved settings evaluation into ace_settingsInitialized event handler
 2016-11-15 23:11:22 +01:00
ulteq
10cc0ba951 Moved all zero angle calculations into the advanced_ballistics.dll 
* Speeds up ATragMX
* Speeds up RangeCards
* Speeds up Scopes
 2016-11-15 23:11:22 +01:00
ulteq
789a169b0e Allow using adjustment turrets on weapons with integrated scopes 2016-11-15 23:11:22 +01:00
ulteq
429bffd039 Moves the bore height calculation into FUNC(inventoryCheck) 2016-11-15 23:11:22 +01:00
ulteq
a687c49d2a Adds settings module for ace_scopes 
* Interconnects the rangecard and scopes modules
* Hides the zeroing text when the vanilla zeroing is overwritten
* Makes the scopes module fully compatible with any 3rd party weapon pack without the need for addition compat pbos (though their use is still recommended)
 2016-11-15 23:11:22 +01:00
ulteq
36c14c5dc4 Feature - Vanilla zeroing fix 2016-11-15 23:11:22 +01:00
commy2
05d30c5573 convert log macros to cba versions (#4282) 
* convert log macros to cba versions

* Add changes to AB

* remove obsolete macro
 2016-10-02 12:55:31 +02:00
classicarma
686b534701 translate scopes 2016-09-28 01:22:56 +09:00
Glowbal
b489750d5b Minor optimizations using private, params, and isEqualType (#4323) 
* Optimizations with private, params, and isEqualType

* Fixed tab being used instead of space

* Fixed tabs inserted by notepad++

* More usage of new private syntax and params

- changed a few checks for an array being empty to `_arr isEqualTo []`
rather than `count _arr == 0`
- added more uses of `private` on the same line as the variable is
declared
- added more uses of params to assign variables passed as parameters
- removed unnecessary parentheses
- removed several unnecessary variable declarations with private array
syntax

* clean up and formatting
 2016-09-04 16:44:22 +02:00
PabstMirror
455f65947a Minor cleanup of fired EH listeners 2016-07-23 23:08:40 -05:00
commy2
89ecc81111 convert common events to CBA playerEvents 2016-06-22 01:39:20 +02:00
BaerMitUmlaut
88b58216ee Added beautified component names 2016-06-20 11:44:36 +02:00
commy2
c481ddedaf add 'name' to components 2016-06-19 09:38:39 +02:00
jonpas
03e923aa68 Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
SilentSpike
90ebf9638b Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
SilentSpike
9e4fd77745 Update common event names to meet new standard 2016-06-03 22:39:43 +01:00
PabstMirror
d7f9c52c2f Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -05:00
jonpas
95573ee711 Stringtable URL (#3855) 
* Move url into stringtable to display it properly, Add some missing author and url entries

* Fix main

* Remove duplicate author
 2016-06-01 23:45:51 +02:00
jonpas
1354826d56 Put semi-colon to the correct place 2016-06-01 14:11:32 +02:00
jonpas
1331265e65 Move url into a macro 2016-06-01 13:49:10 +02:00
jonpas
6730d016c2 Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility 2016-06-01 13:27:02 +02:00
jonpas
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
commy2
fd26e2e44e Merge pull request #3516 from acemod/cbamissiontime 
replace timePFH with CBA_missionTime
 2016-05-30 21:23:57 +02:00
commy2
7512c4e52e manual merge 2016-05-30 21:14:34 +02:00
jonpas
7a307393a4 Merge branch 'master' into useQuotedPathMacros 2016-05-30 21:14:17 +02:00
SilentSpike
207d6612da Remove duplicate ACE_newEvents entries 2016-05-24 15:06:17 +01:00
SilentSpike
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
SilentSpike
108ff4f644 Replace ACE event system calls with CBA counterparts 
Regex used:

\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent

E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event

E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
 2016-05-22 16:47:39 +01:00
PabstMirror
d464a23d21 Use the lovely CBA_fnc_canUseWeapon function 2016-05-20 01:10:12 -05:00
PabstMirror
508b71e7ba Scopes - Allow Scope Adjust from FFV 2016-05-19 21:39:15 -05:00
commy2
da70854568 manual merge 2016-05-18 11:48:27 +02:00
commy2
c5275813a4 use 'getUnitLoadout' instead of 'FUNC(getAllGear)' and deprecate it 2016-05-14 10:49:09 +02:00
J3aLeiNe
fd8167b7e7 AB - correct mildot reticle LRPS/AMS/KHS (#3664) 
* correct mildot reticle LRPS/AMS/KHS

correct mildot reticle LRPS/AMS/KHS

* replace 1 tab with 1 space

replace 1 tab with 1 space

* fix tab

* ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes

ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes,
same opticszoommax/min for each scopes : 1µ (1meter for 1000meter) / 4µ
(4meter for 1000meter),
LRPS :  variable magnification / SOS : 2 magnifications
 2016-05-07 22:20:50 +02:00
BaerMitUmlaut
7fcbe93b71 Cleaned up excessive whitespace 2016-05-03 02:32:44 +02:00
jonpas
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02:00
commy2
467075ad67 replace timePFH with CBA_missionTime 2016-03-02 11:01:39 +01:00
BlackWindowS
c61e7b5104 Tweaked & added translations 
Translation of almost every STR to French
 2016-02-28 14:48:04 +01:00
jonpas
7f022eda00 Replace Purista with Roboto - everywhere, close #3401 2016-02-24 15:06:27 +01:00
commy2
c45523475f manual merge 2016-02-22 16:06:30 +01:00
commy2
46a239f9f6 precompile on game start 2016-02-22 15:20:36 +01:00
commy2
e1db193099 remove unused config and remove some wrong base classes 2016-02-21 22:50:15 +01:00
ChairborneIT
0021bc08df Added translation for most Italian stringtable entries 2016-02-20 21:39:05 +01:00
commy2
be8f7f9cc0 Merge pull request #3276 from acemod/156selectapply 
replace filter and map with select and apply
 2016-02-18 14:23:02 +01:00
PabstMirror
be742c13cd Merge branch 'master' into 155selectRandom 2016-02-17 15:58:19 -06:00
commy2
82086efca0 manual merge 2016-02-10 10:11:33 +01:00
esteldunedain
cdfdfffff6 Apply the ufeh to ACE_Scopes 2016-02-06 18:24:48 -03:00
commy2
ac007e6995 replace more map with apply 2016-02-06 12:08:04 +01:00
Thomas Kooi
ce27575de3 Merge pull request #3244 from acemod/fixScopesCapturingKeys 
Fix ace_scopes capturing native adjustment keys for the PSO scope.
 2016-02-04 19:58:21 +01:00
ProfessorCZ
61611d0ec7 Czech Translation - Update 
Update
 2016-02-03 18:31:31 +01:00
esteldunedain
f744e164d3 Fix #3238 even if ACE_ScopeAdjust_Vertical = 0 or ACE_ScopeAdjust_Horizontal = 0 2016-02-01 14:58:01 -03:00
PabstMirror
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
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