ulteq
a42dec6760
Added more missing privates
2015-05-01 17:40:30 +02:00
ulteq
5dcb45bd33
Finds the corresponding weapon class for each magazine type.
2015-05-01 17:39:38 +02:00
ulteq
6dc28f026f
Added missing private
2015-05-01 17:15:49 +02:00
KoffeinFlummi
761e23001f
Merge https://github.com/Dimaslg/ACE3 into spanish-merge
...
Conflicts:
addons/medical/stringtable.xml
addons/missileguidance/stringtable.xml
addons/optionsmenu/stringtable.xml
2015-05-01 16:51:20 +02:00
ulteq
800ccc07f3
Removed duplicate code
2015-05-01 16:24:16 +02:00
ulteq
3ad668605a
Fix for last fcs change
2015-05-01 16:02:34 +02:00
Nicolás Badano
cde80b2901
Revert "Takes negative initSpeed values into account"
2015-05-01 10:38:41 -03:00
ulteq
4c0bed609e
Fixed a typo
2015-05-01 11:53:53 +02:00
ulteq
965e45a53c
Takes negative initSpeed values into account
2015-05-01 10:25:33 +02:00
Glowbal
131468f0d8
plurals
2015-04-30 22:39:33 +02:00
Glowbal
1ca0d66f30
Initial categories
2015-04-30 22:02:20 +02:00
Dimaslg
f8d5c423ae
Merge conflicts resolved
2015-04-29 21:15:22 +02:00
KoffeinFlummi
a1e709047e
Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge
...
Conflicts:
AUTHORS.txt
addons/aircraft/stringtable.xml
addons/attach/stringtable.xml
addons/captives/stringtable.xml
addons/common/stringtable.xml
addons/disposable/stringtable.xml
addons/dragging/stringtable.xml
addons/explosives/stringtable.xml
addons/fcs/stringtable.xml
addons/frag/stringtable.xml
addons/grenades/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/kestrel/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/laserpointer/stringtable.xml
addons/logistics_uavbattery/stringtable.xml
addons/logistics_wirecutter/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/maptools/stringtable.xml
addons/markers/stringtable.xml
addons/medical/stringtable.xml
addons/microdagr/stringtable.xml
addons/movement/stringtable.xml
addons/nametags/stringtable.xml
addons/nightvision/stringtable.xml
addons/optionsmenu/stringtable.xml
addons/overheating/stringtable.xml
addons/parachute/stringtable.xml
addons/realisticnames/stringtable.xml
addons/reload/stringtable.xml
addons/reloadlaunchers/stringtable.xml
addons/respawn/stringtable.xml
addons/safemode/stringtable.xml
addons/switchunits/stringtable.xml
addons/vehiclelock/stringtable.xml
addons/weaponselect/stringtable.xml
addons/wep_javelin/stringtable.xml
addons/winddeflection/stringtable.xml
2015-04-29 12:52:55 +02:00
NukeDev
db82df6214
Italian's Translation's Changes v2
2015-04-28 18:10:35 +02:00
Dimaslg
274663e1b9
Spanish Translation
...
Minor fixes and spelling mistakes.
2015-04-25 18:53:45 +02:00
commy2
e207a11851
fix: Cannot zero when looking through optics of static weapons and vehicle mg/gmg, fix #836
2015-04-24 19:02:29 +02:00
commy2
ea368511b7
ace extensions class for modularity
2015-04-20 18:48:58 +02:00
jaynus
26e2917f79
Merge remote-tracking branch 'origin/master' into laserCodes
...
Conflicts:
addons/javelin/CfgWeapons.hpp
2015-04-18 10:36:07 -07:00
KoffeinFlummi
2ffbccbf20
Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge
2015-04-15 12:59:56 +02:00
jaynus
2ec74a6a3e
align correctly, create event, remove FCS from laserDesignator.
2015-04-14 16:20:03 -07:00
Harakhti
3c3f6ba4c3
Translation: A to I
...
Some parts filled out, other parts corrected or stylized.
2015-04-13 19:28:58 +02:00
KoffeinFlummi
118b5509ea
Merge https://github.com/gienkov/ACE3 into polish-merge
2015-04-13 13:00:59 +02:00
PabstMirror
36b92b3d44
Don't do client stuff on dedicated.
2015-04-12 22:44:19 -05:00
EpMAK
21abff3713
Revert "Revert "Russian Translation""
...
This reverts commit ea04f4ab3e
2015-04-11 21:33:34 +03:00
EpMAK
ea04f4ab3e
Revert "Russian Translation"
...
This reverts commit 17a552bb80
2015-04-11 21:33:07 +03:00
EpMAK
17a552bb80
Russian Translation
...
Russian translation of stringtables: new lines + old lines fixed a bit,
realistic names for armory are not yet filled.
2015-04-10 19:55:57 +03:00
EpMAK
68d08b8c7b
Revert "Translation"
...
This reverts commit fab5605ad5
2015-04-10 19:46:18 +03:00
EpMAK
fab5605ad5
Translation
...
Russian translation of the texts
2015-04-10 17:51:48 +03:00
VyMajoris
be7a579f7d
Added - Portuguese translation to LaseTarget
...
There is no way to translate Lase Target in a faithful way to portuguese. If "Marcar com laser" is too big, "Marcar Alvo" is a solid alternative for all intents and purposes...
2015-04-09 22:50:35 -03:00
Grzegorz
ae1b2f04b0
fcs PL translation
2015-04-10 03:39:05 +02:00
commy2
5ea35a01bb
sorting out required addons for modularity
2015-04-09 13:23:29 +02:00
commy2
3e3390750d
manual merge
2015-04-08 22:01:41 +02:00
commy2
518c704db6
manual merge
2015-04-07 23:18:31 +02:00
commy2
2e66e57535
manual merge
2015-04-07 23:08:17 +02:00
esteldunedain
765ae4ee64
Merge branch 'master' into tabCleanup
...
Conflicts:
addons/explosives/functions/fnc_addClacker.sqf
addons/explosives/functions/fnc_detonateExplosive.sqf
addons/explosives/functions/fnc_getPlacedExplosives.sqf
addons/explosives/functions/fnc_openDetonateUI.sqf
addons/explosives/functions/fnc_openPlaceUI.sqf
addons/explosives/functions/fnc_openTransmitterUI.sqf
addons/explosives/functions/fnc_openTriggerSelectionUI.sqf
addons/explosives/functions/fnc_placeExplosive.sqf
addons/explosives/functions/fnc_place_Approve.sqf
addons/explosives/functions/fnc_setPosition.sqf
2015-04-07 15:00:56 -03:00
jaynus
27caff5564
Fixed: Add platform velocity to FCS calculations; resolves #361
2015-04-06 18:36:39 -07:00
jaynus
446a30e4fc
Merge pull request #352 from KoffeinFlummi/comancheFixes
...
Goes along with FCS fixes, merging quickly due to overall fixes.
2015-04-06 15:07:09 -07:00
jaynus
e0605f9e81
Remove default hint for FCS but play sound, Resolves #317
2015-04-06 14:57:07 -07:00
jaynus
7fa8365d51
Remove debug, new Release build of extension.
2015-04-06 14:50:22 -07:00
esteldunedain
35129a7a41
Debug stuff for the velocity correction
2015-04-06 17:37:18 -03:00
jaynus
906612f954
Fixed: Gunner FOV, explosive rounds and FPS drop.
2015-04-06 12:54:06 -07:00
jaynus
1bb6be5654
Cleaning up of all tabs in source code files.
2015-04-06 09:22:43 -07:00
jaynus
aee7eb9406
Working save.
2015-04-04 16:55:53 -07:00
commy2
025c1ef63f
simplify optics
2015-04-03 19:25:28 +02:00
jaynus
84d801a45a
Added: ace_fcs_forceUpdate event for forcing the FCS to update from self-designate
...
Merged: in-vehicle interact for laser designator
Changed: Perf. tweaks on laser update times.
2015-04-03 09:49:41 -07:00
commy2
b0575bad21
improve infoDisplayChanged EH
2015-04-03 17:50:52 +02:00
Nicolás Badano
9a182b98b6
Fix the FCS keybinds
2015-03-31 18:09:14 -03:00
commy2
853c4d8dca
142 - fix inheritance changes
2015-03-28 07:50:52 +01:00
commy2
97ae218288
adjust functions to new syntax
2015-03-26 14:10:56 +01:00
Nicolás Badano
8b3648cf8d
Configure exceptions for self actions inside vehicles
2015-03-24 15:43:49 -03:00
PabstMirror
7e383dc10e
#198 canInteractWith EGVAR -> EFUNC
2015-03-20 17:55:39 -05:00
commy2
31db62a85d
manual merge
2015-03-18 17:53:26 +01:00
commy2
b5f307919e
replace canInteract with canInteractWith
2015-03-15 13:00:10 +01:00
PabstMirror
81a944457b
Merge pull request #170 from KoffeinFlummi/cba-NewKeyBinding
...
Key Bind Redo (switch to new CBA 150306)
2015-03-07 14:09:52 -06:00
Felix Wiegand
8f9ced3f8e
Merge pull request #154 from KoffeinFlummi/fcs-improvements
...
Refine bullet tracing in FCS extension
2015-03-07 19:31:33 +01:00
Nicolás Badano
8962ee5d51
Fix the FCS reset action
2015-03-07 14:56:20 -03:00
Nicolás Badano
bcf533292a
Remove weapon initVelocities for guns with FCS
2015-03-07 14:12:00 -03:00
PabstMirror
4018742f26
Return False on keyUp Code
2015-03-05 02:51:24 -06:00
PabstMirror
5d21cd6cc7
Fix Vector/FCS debounce
2015-03-05 02:46:24 -06:00
PabstMirror
0919e59719
Key Bind Redo (except vector)
2015-03-05 01:32:26 -06:00
PabstMirror
ebf42bb35c
Merge pull request #165 from KoffeinFlummi/arma140inhertiaceFix
...
Arma140inhertiace fix
2015-03-03 21:07:58 -06:00
PabstMirror
9d4a0be0db
FCS - FCSMags could be undefined, and cause probs
...
Shooting the B_apc_tracked_01_rcws_F, veh variables aren't defined and
cause problems downstream.
14:40:58 Error in expression <ir select 1) * _r,
_l
];
_vel = _vdir
vectorMultiply _adjustSpeed + vectorMagn>
14:40:58 Error position: <vectorMultiply _adjustSpeed + vectorMagn>
14:40:58 Error Type Number,Not a Number, expected Number
14:40:58 File
z\ace\addons\common\functions\fnc_changeProjectileDirection.sqf, line 42
2015-03-03 15:09:38 -06:00
PabstMirror
93d889031f
1.40 Changes In Config Inhertiance (RC)
2015-02-28 19:06:17 -06:00
Nicolás Badano
a1e5931f4e
avoid having to compute distance when it's already passed as a parameter
2015-02-15 18:06:17 -03:00
Nicolás Badano
2105bc18db
Fixes for the FCS; it was missing a lot of calls before FUNCs.
...
That made the rangefinder only work once. The flag for preventing holding is not needed becase GVAR(enabled) serving the same purpose.
2015-02-15 17:43:57 -03:00
Nicolás Badano
cb15a7106c
Allow adding FCS to static weapons
2015-02-15 17:26:08 -03:00
Nicolás Badano
b74175ec9e
Don't allow adjusting range if only rangefinder is available
2015-02-15 17:24:24 -03:00
commy2
df23b44df5
oops
2015-02-14 23:13:43 +01:00
commy2
0ae41609c2
no fcs for ais
2015-02-14 20:20:03 +01:00
commy2
06efab0082
fix inheritance, new little bird unarmed base class in 1.38
2015-02-14 10:04:50 +01:00
commy2
19cf05314e
fcs reset was still broken
2015-02-14 08:09:52 +01:00
commy2
983b44c02a
air burst ammo PFH
2015-02-14 07:51:13 +01:00
commy2
60a7d1d1e6
fix, fcs reset was broken
2015-02-14 06:38:01 +01:00
commy2
d4163223a9
fcs in MP
2015-02-14 05:05:02 +01:00
commy2
67b3442d17
getting the fcs to work in MP
2015-02-11 23:49:41 +01:00
commy2
d18f470394
allow rangefinder while the fcs is active
2015-02-11 22:39:31 +01:00
commy2
0d3e103de1
fcs work around for weaponDirection with commander turrets
2015-02-11 20:59:41 +01:00
commy2
4695376f55
fix eventhandler name
2015-02-11 18:49:14 +01:00
commy2
3568d0d72e
fix in fcs vehicleInit
2015-02-11 16:35:42 +01:00
commy2
7360277d09
fix error in canUseFCS
2015-02-11 15:29:42 +01:00
commy2
3f8f08cc8b
no holding key with fcs
2015-02-11 14:51:21 +01:00
commy2
49f0b79962
fcs for turrets
2015-02-04 03:20:55 +01:00
commy2
47d5befd12
fcs per turrets
2015-02-03 23:03:43 +01:00
Felix Wiegand
91bdd36268
Create README.md
2015-01-26 13:44:05 +01:00
Nicolás Badano
a5ac89dcb1
make some key events non blocking to allow some actions to share keybinds
2015-01-20 01:12:30 -03:00
KoffeinFlummi
4356c0d02b
Add addon variable to FCS
2015-01-19 12:38:07 +01:00
Nicolás Badano
e38eb5c09d
fix for fcs
2015-01-18 17:56:05 -03:00
KoffeinFlummi
a78730d387
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-01-18 20:03:59 +01:00
KoffeinFlummi
4978bb5294
Move FCS calculation to extension
2015-01-18 20:02:37 +01:00
Nicolás Badano
7bc356008c
fcs: cba keybinds
2015-01-18 12:42:33 -03:00
Nicolás Badano
84fd6de793
fcs: fix to make adjust range up/down work again
2015-01-18 12:40:41 -03:00
PabstMirror
6e8c394903
Standardize Config Version Stuff
2015-01-18 01:32:07 -06:00
KoffeinFlummi
d567785518
Change FCS indentation to 4 spaces
2015-01-14 21:07:41 +01:00
KoffeinFlummi
c8fd07a5ab
Finalize FCS port
2015-01-13 22:51:02 +01:00
KoffeinFlummi
d354f3796f
Replace version numbers with macros
2015-01-12 11:52:07 +01:00
KoffeinFlummi
cdf08ee2cd
Rename Optics.hpp to CfgOptics.hpp
...
That might not be a real class, but it makes it easier to tell config
includes from other files at a glance.
2015-01-12 11:34:36 +01:00
KoffeinFlummi
2942306e3c
Move EHs to seperate file, add preInit for PREPs
2015-01-12 11:33:50 +01:00
KoffeinFlummi
479c4b01e8
Add PBOPREFIX
2015-01-12 11:27:56 +01:00
KoffeinFlummi
7d9b03611a
Prefixes
2015-01-12 11:06:27 +01:00
KoffeinFlummi
e02e058ecb
First port of AGM_FireControlSystem -> ace_fcs
...
Untested
2015-01-12 11:02:44 +01:00
