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
3,207 Commits 73 Branches 88 Tags 752 MiB
9618fefa67
Commit Graph

82 Commits

Author SHA1 Message Date
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
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