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
941 Commits 73 Branches 88 Tags 752 MiB
3ff1bff2bf
Commit Graph

849 Commits

Author SHA1 Message Date
PabstMirror
3c65c422b1 More Surrender Fixes 
Increase "drop hands" animation speed (now just 1/2 of normal)
Use "AnimChanged" EH to watch for animation breaks while surrendering
Only "crack" the hands up animation if we are in the right animation
state
 2015-02-15 16:42:00 -06:00
PabstMirror
dec34b4b30 Surrender Fixes 
Remove XEH GetIn and use vehicleChanged Event
Handle Zeus (showHUD)
Attempt to handle failed animation change
 2015-02-15 14:55:17 -06:00
Nicolás Badano
25645c2ae9 mm 2015-02-15 16:25:09 -03:00
Nicolás Badano
be42738881 macros 2015-02-15 15:56:37 -03:00
Nicolás Badano
e8933d69c8 overpressure: renamed more config entries; avoid handheld launchers producing overpressure in addition to backblast. 2015-02-15 15:42:54 -03:00
commy2
618ac2f8f6 change overpressure readme.md 2015-02-15 18:44:10 +01:00
commy2
2252f82de7 rename backblast to overpressure 2015-02-15 18:11:50 +01:00
commy2
f3aa0e58aa clean up backblast 2015-02-15 17:55:20 +01:00
commy2
3f98d1485e author name 2015-02-15 17:17:20 +01:00
commy2
f3a94f03ed clean up backblast 2015-02-15 17:14:09 +01:00
commy2
f460f7fce0 manual merge backblast - master 2015-02-15 15:55:00 +01:00
commy2
0d650f2fad Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-02-15 15:48:58 +01:00
commy2
44aaf3955b some backblast cleanup 2015-02-15 15:48:40 +01:00
Nicolás Badano
7c95e33322 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-02-15 11:42:54 -03:00
Nicolás Badano
c094c10e46 visible ir strobes 2015-02-15 11:42:20 -03:00
commy2
4f5ab1f8e5 removed common as required addon for attach 2015-02-15 15:34:19 +01:00
commy2
baf9396459 cleanup attach 2015-02-15 15:31:09 +01:00
Glowbal
ac54e8dfd7 Added UAV exchange battery sound 2015-02-15 12:44:34 +01:00
Glowbal
6540158ce1 Removed left over CSE prefix 2015-02-15 10:05:48 +01:00
Glowbal
827ef91fce Ported CSE Ambiance sound module 2015-02-15 10:03:58 +01:00
commy2
df23b44df5 oops 2015-02-14 23:13:43 +01:00
PabstMirror
1a2a9dd584 Remove support for Anthropomorphism 2015-02-14 15:51:08 -06:00
Glowbal
c3cd9d281d Removed isHC function. #139 2015-02-14 20:31:44 +01:00
Glowbal
13c2127574 Clean up of old CSE code 
Removed all _F suffixes
Reorganized the RPEP list.
Removed unnecessary functions.
 2015-02-14 20:29:07 +01:00
commy2
0ae41609c2 no fcs for ais 2015-02-14 20:20:03 +01:00
Glowbal
155503d4a1 Merged GUI into common. 
Removed unnecessary GUI functions.
Updated displayIcon function to be more dynamic
Added client side settings for displaying icons.
 2015-02-14 20:06:55 +01:00
commy2
57f8595e9c clean up aircraft weapons config 2015-02-14 12:47:33 +01:00
commy2
075556c233 author aircraft 2015-02-14 11:36:54 +01:00
commy2
f358d099e6 aircraft config cleanup 2015-02-14 10:58:10 +01:00
commy2
8a348b0024 aircraft, remove old/redundant mag configs 2015-02-14 10:26:52 +01:00
commy2
06efab0082 fix inheritance, new little bird unarmed base class in 1.38 2015-02-14 10:04:50 +01:00
commy2
3d4c43c613 replace tabs with spaces 2015-02-14 09:50:26 +01:00
commy2
b1a1c855d9 fix wrong class inheritance in laser selfdesignate 2015-02-14 09:47:03 +01:00
commy2
20f161a9da aircraft, remove redundant config entries, documentation 2015-02-14 09:36:35 +01:00
commy2
e72742da31 add macros for transport cargo config 2015-02-14 08:26:30 +01:00
commy2
19cf05314e fcs reset was still broken 2015-02-14 08:09:52 +01:00
commy2
b2945c34d7 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-02-14 07:51:30 +01:00
commy2
983b44c02a air burst ammo PFH 2015-02-14 07:51:13 +01:00
PabstMirror
1a61148053 Grenades Cleanup 
Shouldn't be any change to functionality
Headers
Formating
simplifying (waitAndExecute)
exceptions/canInteract for keybind
 2015-02-14 00:39:09 -06:00
PabstMirror
fb3a610649 Fix bad STR_ACE_Common_ACETeam 2015-02-14 00:39:09 -06:00
commy2
ec29bf37a8 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-02-14 06:38:33 +01:00
commy2
60a7d1d1e6 fix, fcs reset was broken 2015-02-14 06:38:01 +01:00
PabstMirror
f83d83a820 Fix from AGM FFV-holster bug 2015-02-13 22:09:37 -06:00
commy2
d4163223a9 fcs in MP 2015-02-14 05:05:02 +01:00
PabstMirror
ba2ee53804 Nametag changes 
Adds user options for showing soundwaves and default nametag color
Before nametags would show effectiveCommander for cursorTarget vehicles,
moved this to a module option (default off).
 2015-02-13 21:23:40 -06:00
PabstMirror
dbd33d5230 Missing fnc define 
Why doesn't calling a nil function throw an error?
 2015-02-12 22:13:51 -06:00
PabstMirror
19f3154104 CSE Soundwaves 2015-02-12 21:53:15 -06:00
PabstMirror
d0b0a0e066 Missing = 2015-02-12 20:43:50 -06:00
commy2
a41299b05a Merge pull request #135 from KoffeinFlummi/syncedScopeAdjustment 
Synced scope adjustment
 2015-02-12 16:24:41 +01:00
Nicolás Badano
4a70d16f95 scopes: switch throttledPublicVariable by setVariablePublic 2015-02-12 12:21:46 -03:00
commy2
8b8abd640c Merge pull request #141 from KoffeinFlummi/setVarPub 
add common_fnc_setVariablePublic
 2015-02-12 16:04:11 +01:00
Nicolás Badano
a3dc1df109 scopes: moved getWeaponIndex to common 2015-02-12 11:57:55 -03:00
commy2
7c8840df56 transfer value even if it changed 2015-02-12 15:56:57 +01:00
Nicolás Badano
a4815cb8ac scopes: reduce control numbers 2015-02-12 11:51:17 -03:00
commy2
b32849a68e no left hand - weapon IK when swag walking (combat pace) 2015-02-12 14:18:34 +01:00
commy2
ff0348a169 add common_fnc_setVariablePublic 2015-02-12 13:23:38 +01:00
commy2
ba80eb63eb Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-02-11 23:49:58 +01:00
commy2
67b3442d17 getting the fcs to work in MP 2015-02-11 23:49:41 +01:00
Nicolás Badano
e9892f4f7b Merge pull request #131 from KoffeinFlummi/MagRepackRedo 
Rewrite: Magazine Repack
 2015-02-11 19:42:47 -03:00
PabstMirror
7545a6c3d8 Code cleanup 2015-02-11 15:43:08 -06:00
commy2
93927ac77d Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-02-11 22:39:51 +01:00
commy2
d18f470394 allow rangefinder while the fcs is active 2015-02-11 22:39:31 +01:00
Nicolás Badano
681d83f922 Merge pull request #129 from KoffeinFlummi/agmCaptivesPort 
Port: AGM Captives
 2015-02-11 18:09:33 -03: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
PabstMirror
b3f68467bb Wrong Actions in CfgMoves 2015-02-09 23:33:50 -06: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
Nicolás Badano
f163e307c8 ace_common: throttledPublicVariable function 2015-02-09 22:59:43 -03:00
PabstMirror
24bd515814 Commenting and some stringtables 2015-02-08 22:44:23 -06:00
PabstMirror
45c9b65bad Merge pull request #123 from KoffeinFlummi/attachToVehicles 
Attach to vehicles
 2015-02-08 22:21:38 -06:00
PabstMirror
da9fc39103 Headers and Finish Notice 2015-02-08 17:35:21 -06:00
Nicolás Badano
a2b1cf1259 g-forces: updated headers 2015-02-08 19:58:41 -03:00
Nicolás Badano
80778cf8db overheating: updated headers 2015-02-08 19:54:12 -03:00
PabstMirror
e770a74630 Headers 2015-02-08 16:36:58 -06:00
Nicolás Badano
bedf059af5 Merge branch 'PFH_SwitchUnits' of github.com:KoffeinFlummi/ACE3 into PFH_SwitchUnits 
Conflicts:
	addons/switchunits/functions/fnc_module.sqf
 2015-02-08 19:17:07 -03:00
Nicolás Badano
8a26fbc957 ace_settings: remove debug stuff 2015-02-08 18:36:00 -03:00
Nicolás Badano
1b9d0aa635 ACE_Settings: do not load client settings on dedi servers or HC 2015-02-08 18:29:49 -03:00
PabstMirror
3f6ffa6ac2 Mag Repack - Keep Progress prototype 
Ideas from AGM and CSE
Keeps Progress While Repacking if interrupted
Added sounds from CSE
 2015-02-08 13:48:53 -06:00
PabstMirror
6d534e8846 #130 - Surrender Module Prototype 2015-02-07 15:20:51 -06:00
Nicolás Badano
1717d75a20 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into aceSettings 2015-02-07 10:49:26 -03:00
PabstMirror
fcf39a3916 #118 Sound Effect from CSE 2015-02-06 23:23:33 -06:00
PabstMirror
ed3f28ec6d Minor Cleanup 2015-02-06 22:24:27 -06:00
PabstMirror
c117e9bf16 Header Examples 2015-02-06 17:03:56 -06:00
PabstMirror
98564fae68 Surrendering 2015-02-06 15:54:26 -06:00
PabstMirror
7a3029b9fd replace spawns 2015-02-06 03:38:27 -06:00
PabstMirror
82a8fc8ca3 exceptions 2015-02-05 23:11:28 -06:00
PabstMirror
122a38a6aa More Refactoring 2015-02-05 16:39:45 -06:00
commy2
350741918b Merge pull request #121 from KoffeinFlummi/moduleSounds 
Module sounds
 2015-02-05 01:49:38 +01:00
PabstMirror
435b3b8b86 Move Code out of CfgVehicles 2015-02-04 13:16:19 -06:00
PabstMirror
11cd426b87 Redo XEH 2015-02-04 00:35:51 -06:00
PabstMirror
24ab11a1e2 More work 2015-02-03 23:56:51 -06:00
PabstMirror
4c727fbff5 remoteFncs -> events 2015-02-03 23:13:44 -06:00
commy2
49f0b79962 fcs for turrets 2015-02-04 03:20:55 +01:00
Garth L-H de Wet
4d38e19f8c Should avoid potential conflicts of IED codes. 2015-02-04 02:19:56 +02:00
Garth L-H de Wet
749d068d2d Added IED handling (for the player and support for AI). Can dial an IED and it will ring before exploding. 2015-02-04 02:16:47 +02:00
Garth L-H de Wet
f2ef53168b Added the cellphone as a item. 2015-02-04 02:15:31 +02:00
Garth L-H de Wet
357927902d Fixed incorrect variable getting in openPlaceUI function. 2015-02-04 02:14:55 +02:00
commy2
47d5befd12 fcs per turrets 2015-02-03 23:03:43 +01:00
Nicolás Badano
18fa6f9850 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into aceSettings 2015-02-03 17:48:24 -03:00
bux578
509bfefff1 fixed SwitchUnits 
needed to wait in initPlayer
 2015-02-03 21:47:48 +01:00
Nicolás Badano
d65a740b7a WindDeflection using ace_settings 2015-02-03 17:47:25 -03:00
Nicolás Badano
e57a135750 Missing prep 2015-02-03 16:49:40 -03:00
bux578
903c41308c works in singleplayer 2015-02-03 20:33:15 +01:00
Nicolás Badano
146e87f02e nametags: slightly changed module options to use the new ACE_Settings 2015-02-03 15:47:17 -03:00
Nicolás Badano
b119d5246b fix in setsettings 2015-02-03 15:46:33 -03:00
commy2
4185299efd rename agm burst mode to ace burst mode (ai) 2015-02-03 19:38:49 +01:00
Nicolás Badano
9773f7b838 Merge pull request #124 from KoffeinFlummi/GogglesHeaderFix 
Updated headers of the goggles to be as required.
 2015-02-03 15:12:30 -03:00
Nicolás Badano
91d2a8c343 Merge pull request #125 from KoffeinFlummi/agmParachutePort 
Agm parachute port
 2015-02-03 15:12:12 -03:00
Nicolás Badano
eee5ff604a Merge pull request #122 from KoffeinFlummi/ExplosivesHeaderFix 
Fixed the headers of the explosives system to be the correct style.
 2015-02-03 15:12:00 -03:00
Garth L-H de Wet
9c20706c83 Added a event handler for player vehicle changing. As well as covered the canInteract in key handler. 2015-02-03 11:51:16 +02:00
Garth L-H de Wet
b4d1d6b230 Removed the PFH when the player vehicle is no longer a parachute. 2015-02-03 11:50:33 +02:00
Garth L-H de Wet
c08494cc43 Made use of time instead of diag_ticktime, to take care of time acceleration and so forth. 2015-02-03 11:50:11 +02:00
PabstMirror
4156143ecf Captives Progress 2015-02-03 00:42:34 -06:00
Nicolás Badano
74d0ae95ff Change ACE_Settings from modules 2015-02-03 02:53:02 -03:00
Nicolás Badano
92d21af8c6 ACE_Settings: function for updating settings from modules 2015-02-03 02:52:07 -03:00
Nicolás Badano
66045b8d51 ACE_Settings: setSettings tab to space, casting 2015-02-03 02:51:41 -03:00
Nicolás Badano
051ad00806 ACE_Settings: added function to add settings at runtime 2015-02-03 02:37:38 -03:00
Nicolás Badano
658f30b9a2 ACE_Settings: various fixes 2015-02-03 02:37:13 -03:00
Nicolás Badano
2c0d2013d4 ACE_Settings: Added a function to change settings on runtime (e.g. for modules) 2015-02-03 01:45:04 -03:00
Nicolás Badano
857b45453a ACE_Settings: fix option to reset user setable settings to default 2015-02-03 01:03:26 -03:00
Nicolás Badano
99cf0a75ee Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git into aceSettings 2015-02-03 00:45:29 -03:00
Nicolás Badano
91cfb40e6f ACE_Settings: updated optionsmenu to use the the new system 2015-02-03 00:44:34 -03:00
Nicolás Badano
173169bc3d Fix in goggles 2015-02-03 00:44:06 -03:00
Nicolás Badano
354b261677 ACE_Settings: added sample setting entry for documentation 2015-02-03 00:43:53 -03:00
Nicolás Badano
67f7842722 ACE_Settings: store settings data on a list 2015-02-03 00:43:23 -03:00
PabstMirror
b38bd016f5 Semicolon and bad p3d data paths 
P3d's had bad \data\ folder, Models not actually used anywhere, but
pboProject complains
 2015-02-02 20:15:45 -06:00
PabstMirror
982f3b230a Captives First Pass 2015-02-02 20:04:50 -06:00
PabstMirror
3865598095 AGM_Captives 2015-02-02 19:48:33 -06:00
Nicolás Badano
37199f2ba2 Load client setable settings from profile 2015-02-02 21:14:16 -03:00
Nicolás Badano
0600a72147 Fixes 2015-02-02 21:13:31 -03:00
bux578
d339b9567d add header & PFH 
WIP
 2015-02-02 23:28:27 +01:00
Garth L-H de Wet
9e1cd9a194 Fixed headers to be more consistent with ACE. 2015-02-03 00:05:03 +02:00
Garth L-H de Wet
aca1c0c6cf Converted to use CBA PFH's and MACROs. 2015-02-02 23:58:24 +02:00
Garth L-H de Wet
966cb6ffdf Performed initial conversion from AGM to ACE. Added necessary boilerplate files. 2015-02-02 22:52:08 +02:00
Garth L-H de Wet
03cef93ac7 Initiated AGM_Parachute merge. 2015-02-02 22:31:48 +02:00
Garth L-H de Wet
c96882dd02 Fixed incorrect header comment for explosives. 2015-02-02 11:42:14 +02:00
Garth L-H de Wet
7acd7854b7 Updated headers of the goggles to be as required. 2015-02-02 11:04:53 +02:00
Garth L-H de Wet
2440e4fa69 Fixed incorrect indenting with headers in explosives. 2015-02-02 10:35:17 +02:00
PabstMirror
fa002b4db6 Formating and Headers 2015-02-01 14:56:19 -06:00
PabstMirror
01ee35d6c5 Geforces: Fix "Error Zero divisor" 
Adds some simple checks before dividing.
Before dropping uniform or playing as a dog would throw script error.
 2015-02-01 13:09:17 -06:00
Garth L-H de Wet
eafc9e659c Fixed the headers of the explosives system to be the correct style. 2015-02-01 20:38:15 +02:00
PabstMirror
1921c73ee8 Merge pull request #99 from KoffeinFlummi/agmUAVRechargePort 
Port AGM: Logistics-UAV refuel/recharage
 2015-02-01 11:59:40 -06:00
PabstMirror
42bc8eff1a wirecutter typenames to lowercase 2015-02-01 11:56:54 -06:00
PabstMirror
58a71e6a66 Merge pull request #97 from KoffeinFlummi/agmWirecutterPort 
Port: AGM Wirecutters
 2015-02-01 11:03:20 -06:00
Glowbal
0419b7cbe5 Formatting 2015-02-01 11:17:15 +01:00
Glowbal
96e0d0e758 Removed rouge debug code & dead code 2015-02-01 11:14:21 +01:00