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
1,329 Commits 73 Branches 88 Tags 752 MiB
f8e758e136
Commit Graph

1211 Commits

Author SHA1 Message Date
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
Glowbal
cd5b06da78 Added _returnDamage parameter to damageCaching. 2015-02-13 23:00:23 +01:00
Glowbal
4441b7d0a5 Added missing include 2015-02-13 22:58:48 +01:00
Glowbal
4896198ec2 Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite 
Conflicts:
	addons/medical/functions/fnc_handleDamage.sqf
 2015-02-13 22:57:43 +01:00
Glowbal
5b507ed9f5 Combined medium and advanced into one, with options to turn on other features. 
Changed wounds for a more diverse variation.
Added handleDamage caching for advanced.
 2015-02-13 22:55:13 +01: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
PabstMirror
444f88eb05 Merge branch 'master' into disarmingTest 2015-02-11 16:53:01 -06: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
PabstMirror
69835ec7fb Fix HMD bug and disarm types 2015-02-11 14:37:18 -06: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
a7004cf0e9 Disarm Types Examples 2015-02-11 02:33:18 -06:00
PabstMirror
13c9db75a7 Disarming Prototype 2015-02-10 19:55:53 -06:00
KoffeinFlummi
89a505ea44 Remove old effects code 2015-02-10 23:14:56 +01:00
KoffeinFlummi
675b89f360 Add blinding effect to wakeup 2015-02-10 23:14:39 +01:00
KoffeinFlummi
28dbd857c2 Fix generic error 2015-02-10 23:14:11 +01:00
KoffeinFlummi
faa7e1fb63 Merge alive and Zeus conditions 2015-02-10 23:13:52 +01:00
KoffeinFlummi
4ec19429ae Fix initial value of bloodVolume 2015-02-10 23:13:14 +01:00
bux578
5ef729ee80 small fix 2015-02-10 19:11:58 +01:00
bux578
40e422f95a added PM's solution 2015-02-10 18:57:23 +01:00
bux578
e14d49393a Revert "remove file and comments" 
This reverts commit 58b557bd99.
 2015-02-10 18:40:06 +01:00
KoffeinFlummi
fe0eac7896 First port of AGM's visual loop. 2015-02-10 18:17:26 +01:00
KoffeinFlummi
fba44f490d First draft of death prevention 2015-02-10 13:33:40 +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
bux578
58b557bd99 remove file and comments 2015-02-09 19:07:58 +01:00
bux578
b8fb1cb86d SwitchUnits: remove PFH and code cleanup 2015-02-09 19:06:28 +01: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
Glowbal
a609d00730 Implemented a setDead function. Allows for interception of all kills and using a revive script instead. 
Added playInjuredSound for damaged units.
Fixed some mistakes with variable names.
 2015-02-08 13:18:08 +01:00
Glowbal
a3c4c60b7f Added possibility to add unconscious conditions. 2015-02-08 13:06:44 +01:00
Glowbal
633037c1b4 Replaced injuredCollection array for separate PFH for each unit. 2015-02-08 11:34:20 +01:00
Glowbal
3be442c31a Added initial draft of new player effects handling. 2015-02-08 11:24:36 +01:00
Glowbal
0a161319d2 Added initial draft of setUnconscious 2015-02-08 10:25:03 +01:00
Glowbal
bf762bbdf1 Updated headers to correct format 
Reorganized function names.
Added unit vitals loop
 2015-02-08 10:01:32 +01:00
Glowbal
35de875382 Added cardiac arrest 2015-02-08 00:08:36 +01:00
Glowbal
b8be7775bd Updated open wounds injuries to newest CMS version. 2015-02-08 00:07:49 +01:00
Glowbal
aadb289962 Added initial rewrite of CMS vitals script for medium and advanced medical. 2015-02-07 23:55:48 +01:00
Glowbal
26527489d6 Added initial medium wounds. 
Fixed merge conflict.
 2015-02-07 23:48:24 +01: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
KoffeinFlummi
35386f19d6 Merge branch 'medical-rewrite' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite 
Conflicts:
	addons/medical/XEH_preInit.sqf
	addons/medical/functions/fnc_handleDamage.sqf
 2015-02-06 13:48:28 +01:00
KoffeinFlummi
a2ee41f01d First draft of basic damage handling. 2015-02-06 13:47:17 +01: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
Glowbal
596d018f45 Added function PREPs. 2015-02-03 21:48:53 +01:00
Nicolás Badano
18fa6f9850 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into aceSettings 2015-02-03 17:48:24 -03:00
Glowbal
0a403ff422 Added initial advanced medical handleDamage functionality. 2015-02-03 21:48:08 +01:00
bux578
509bfefff1 fixed SwitchUnits 
needed to wait in initPlayer
 2015-02-03 21:47:48 +01:00
Glowbal
a50276ddaf Added a getTypeOfDamage function. 2015-02-03 21:47:45 +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
KoffeinFlummi
79aa8d1c7a Use macros, remove var assignments 2015-02-03 20:14:34 +01:00
KoffeinFlummi
930fb51a20 Medical: First Draft 2015-02-03 20:09:25 +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
Glowbal
3f0b6650e0 Added weapon resting & weapon jam sounds 2015-02-01 11:11:51 +01:00
PabstMirror
8ceb2aabc1 Attach Stuff 2015-01-31 11:43:58 -06:00
PabstMirror
3f9d96abd3 Placement rewrite 2015-01-31 03:05:07 -06:00
Nicolás Badano
96b7c0d30c ACE_Settings: replace all ACE_Options 2015-01-30 19:19:45 -03:00
PabstMirror
7519fefee9 Fix Interaction 2015-01-30 16:11:16 -06:00
Nicolás Badano
981978d043 ACE_Settings: replace all ACE_Parameters 2015-01-30 19:06:25 -03:00
Nicolás Badano
e277b05aff ace_settings: first draft 2015-01-30 18:56:45 -03:00
PabstMirror
08763b6b9f Initial port of old pull 
Still some problem with interaction...
 2015-01-30 14:32:21 -06:00
Thomas Kooi
b2b6591fdd Merge branch 'master' into cseBasicBallisticsPort 2015-01-30 12:33:00 +01:00
Thomas Kooi
27798fbe8f Minor optimizations 
Renamed from basic ballistics to wind deflection
 2015-01-29 13:58:22 +01:00
PabstMirror
9631154926 Set ADDON variable in XEH_preInit 2015-01-29 01:38:46 -06:00
PabstMirror
aabae5a3bc ace_interaction to required 2015-01-29 01:01:58 -06:00
PabstMirror
3581ab480c ace_interaction to required 2015-01-29 01:01:00 -06:00
KoffeinFlummi
bb48d1234c Merge remote-tracking branch 'origin/interact_menu' 2015-01-28 22:17:27 +01:00
PabstMirror
3bb8775bd2 readme 2015-01-28 14:39:36 -06:00
PabstMirror
9a616a85fc VehicleSetFuel event 
setFuel says it needs to be local, so switching to event.
Put event in common
 2015-01-28 14:38:04 -06:00
PabstMirror
4b1e40570e Port AGM: Logistics-UAV refuel/recharage 2015-01-28 14:29:43 -06:00
Nou
5dfa4304d3 Tweaks 2015-01-28 12:03:30 -08:00
PabstMirror
54ab834e5c Fix stringtable 2015-01-28 12:54:14 -06:00
Nou
26f353b94d Merge branch 'master' into interact_menu 2015-01-28 10:19:58 -08:00
Nou
984fee03ac Merge branch 'interact_menu' of https://github.com/KoffeinFlummi/ACE3 into interact_menu 2015-01-28 10:19:30 -08:00
Nou
8e9883a111 Make sure object actions are set. 2015-01-28 10:18:19 -08:00
PabstMirror
719e308f9b readme 2015-01-28 12:04:30 -06:00
PabstMirror
bb473f95f0 Func Headers 2015-01-28 12:01:40 -06:00
PabstMirror
d62595e76d Added some AIA fences 2015-01-28 11:51:42 -06:00
Thomas Kooi
794379c774 Fixed incorrect classname CfgAddons 2015-01-28 18:51:27 +01:00
Thomas Kooi
2e05e5ac39 Replaced isPlayer by EFUNC(common,isPlayer) 2015-01-28 18:02:49 +01:00
Thomas Kooi
44997e1d4a Removed bullet database concept 2015-01-28 17:58:28 +01:00
Thomas Kooi
8014da1407 Added ACE_weather dependency 2015-01-28 17:48:49 +01:00
Thomas Kooi
b092ecf280 Replaced wind by ACE_wind 2015-01-28 17:48:36 +01:00
Thomas Kooi
a5cef8da3d Added readme file 2015-01-28 17:38:33 +01:00
Thomas Kooi
2def603a58 Finalized port of basic ballistics 2015-01-28 17:36:47 +01:00
PabstMirror
0647a80aad Wirecutter - Self->Equipment Action 2015-01-28 03:22:39 -06:00
PabstMirror
39a4977efe Port: Wirecutting from AGM 
by gpgpgpgp, edited by commy2

Doesn't really work as well as I'd like (some fences are uncuttable)
 2015-01-27 22:42:45 -06:00
PabstMirror
3b3944b56c ProgressBar - Check canInteract (w/ exceptions) 2015-01-27 20:51:12 -06:00
PabstMirror
c14514a3f9 VehLock - canInteract check 2015-01-27 20:11:06 -06:00
PabstMirror
5bfaf7da7d VehLock - new progessBar 2015-01-27 19:49:21 -06:00
PabstMirror
c0e76dd3c7 Merge pull request #91 from KoffeinFlummi/agmVehicleLock 
Port: Vehicle Lock
 2015-01-27 19:30:46 -06:00
PabstMirror
bf791e32c4 Merge pull request #93 from KoffeinFlummi/progresBarNew 
#87 - New Progress Bar
 2015-01-27 19:28:51 -06:00
Nicolás Badano
d42be7b5f8 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-01-27 19:26:32 -03:00
Nicolás Badano
7a08bd3722 common: fixed fnc_addLineToDebugDraw 2015-01-27 19:26:09 -03:00
Nicolás Badano
8bc92482f3 common: function for drawing debug lines 2015-01-27 19:26:06 -03:00
Nicolás Badano
60fa6dfbe6 gforces: fixed prefix for config entries 2015-01-27 19:25:37 -03:00
Thomas Kooi
f52417cc3b Added readme file 2015-01-27 17:10:16 +01:00
Glowbal
c57cf88965 Merge pull request #85 from KoffeinFlummi/cse_medical_port 
PORT: CSE Medical
 2015-01-27 17:06:22 +01:00
bux578
f0c06beb23 fix #95 & add ADDON = bool 2015-01-27 09:01:57 +01:00
KoffeinFlummi
c407553d49 Add remaining READMEs, add helper script 2015-01-26 14:34:48 +01:00
Felix Wiegand
0f027e7e09 Create README.md 2015-01-26 13:56:37 +01:00
Felix Wiegand
7c1703ae11 Create README.md 2015-01-26 13:46:21 +01:00
Felix Wiegand
59563a934c Create README.md 2015-01-26 13:45:24 +01:00
Felix Wiegand
91bdd36268 Create README.md 2015-01-26 13:44:05 +01:00
Felix Wiegand
bf452b2c24 Create README.md 2015-01-26 13:42:07 +01:00
Felix Wiegand
6037f8e05b Create README.md 2015-01-26 13:40:31 +01:00
Felix Wiegand
3ed88ca17a Create README.md 2015-01-26 13:37:41 +01:00
Felix Wiegand
8d24c9fdbd Create README.md 2015-01-26 13:35:31 +01:00
KoffeinFlummi
3e00ebd12b Add README for ballistics 2015-01-26 07:36:45 +01:00
PabstMirror
5e932f8c71 Replace calls to progressBar 
Mag repack
Defuse
Swap Barrel
 2015-01-26 00:24:33 -06:00
PabstMirror
7c9dd335e7 Formating 2015-01-25 18:53:08 -06:00
PabstMirror
ce8e0fd938 New Progress Bar 2015-01-25 18:48:32 -06:00
Thomas Kooi
b28fa367cb Fixed unconscious. Now functions properly again after move from common to medical. 2015-01-25 16:40:47 +01:00
Thomas Kooi
3c60af5a14 Fixed: Changed medicClass to isMedic. 2015-01-25 16:05:09 +01:00
Thomas Kooi
69c45cf54d Fixed assignMedicalEquipment module 2015-01-25 16:02:49 +01:00
Thomas Kooi
5f8a00a45f Removed last remaining spawns and sleeps in medical. 2015-01-25 15:41:29 +01:00
Thomas Kooi
8045ebb6ab Fixed damage parsing for AI & non medical enabled units 2015-01-25 15:02:14 +01:00
Thomas Kooi
73d3869a04 Minor improvements made to handleDamage functions 2015-01-25 14:00:51 +01:00
PabstMirror
c07120c439 Fix Googles Macros 2015-01-25 00:55:35 -06:00
Nicolás Badano
30cd9a7499 me too 2015-01-25 01:16:44 -03:00
Nicolás Badano
05d209191c common: fixed fnc_addLineToDebugDraw 2015-01-25 01:05:19 -03:00
Nicolás Badano
8d1ee8c2c2 backblast: overhaul 
- Replace firedNear by firedBIS XEH
- Calculate the origin of the backblast and overpressure zones using the projectile position and direction
- Handle all effects for each unit on their local machine
- Posibility of drawing effect cone for debug
- Simplified angle calculations
 2015-01-25 00:59:20 -03:00
Nicolás Badano
8f0c6f7a1f common: function for drawing debug lines 2015-01-25 00:56:23 -03:00
Thomas Kooi
95cfe5ce3a Minor code refactor 2015-01-24 21:16:51 +01:00
commy2
7e4407b9f5 Merge pull request #89 from KoffeinFlummi/byebyeAgmKeys 
Remove AGM key handling routines and remaining stuff from AGM options menu
 2015-01-24 20:17:57 +01:00
PabstMirror
a419587042 remove testing debug 2015-01-24 13:14:43 -06:00
PabstMirror
69893a7e99 Attach-use waitAndExecute 2015-01-24 13:14:01 -06:00
PabstMirror
0ca2cb34ea setVariable names 2015-01-24 12:58:01 -06:00
PabstMirror
09eb5d6c65 Update readme.md 2015-01-24 12:48:28 -06:00
PabstMirror
04d4d5b9ec Readme 2015-01-24 12:45:11 -06:00
Nicolás Badano
f3dac73fa2 interaction: removed debug info 2015-01-24 15:40:41 -03:00
Nicolás Badano
fc7f778d3e Reverted deletion of HintConfig.hpp 2015-01-24 15:35:58 -03:00
Nicolás Badano
b8abc85051 Merge branch 'byebyeAgmKeys' of github.com:KoffeinFlummi/ACE3 into byebyeAgmKeys 2015-01-24 15:34:48 -03:00
Nicolás Badano
30b97d7b6b common: removed commented stuff 2015-01-24 15:34:27 -03:00
Nicolás Badano
33485f6d3f common: remove AGM key handling routines and remaining stuff from AGM options menu 2015-01-24 15:32:06 -03:00
Nicolás Badano
be550836ea common: remove AGM key handling routines and remaining stuff from AGM options menu 2015-01-24 15:25:03 -03:00
Felix Wiegand
1c074e8096 Create README.md 2015-01-24 19:13:02 +01:00
Felix Wiegand
232420d21e Create README.md 2015-01-24 18:53:41 +01:00
Felix Wiegand
b356e3f5ba Create README.md 2015-01-24 18:51:43 +01:00
Felix Wiegand
bdd9532c24 Add README.md for ai 2015-01-24 18:50:42 +01:00
Nicolás Badano
8affcc0a2e fixes 2015-01-24 14:30:30 -03:00
Nicolás Badano
dc55ea517e interaction: cba keybinds 2015-01-24 14:02:47 -03:00
Thomas Kooi
8d34f98909 Moved relevant functions from common to medical. 
Removed unnecessary event function.
 2015-01-24 17:18:38 +01:00
Thomas Kooi
e06c5010bb Moved GUI functionality to medical 2015-01-24 16:34:39 +01:00
PabstMirror
4e31a4b57f First Pass 2015-01-23 16:40:39 -06:00
PabstMirror
5c8614f11c Port Vehicle Lock Inital 2015-01-23 16:14:22 -06:00
PabstMirror
47e8282d98 Movement/Climb Keybind 2015-01-23 16:05:14 -06:00
PabstMirror
75c87dfd9b Option Menu Tweaks 2015-01-23 02:43:43 -06:00
PabstMirror
8a27a49d31 #84 - goggles option error 2015-01-22 16:58:11 -06:00
Thomas Kooi
5234bb984f Fixed default debug values 2015-01-22 23:49:04 +01:00
Thomas Kooi
80f90751cd Removed some spawns 2015-01-22 23:47:06 +01:00
Thomas Kooi
dce0b61d57 Added damage threshold module 
Removed debug prints
 2015-01-22 23:29:18 +01:00
Thomas Kooi
dc1098233e Added broadcast flag to addOpenWounds, so we can stack call it followed by a broadcast. 
Improvements made to assignOpenWounds, now better results for single hits.
 2015-01-22 22:28:04 +01:00
Thomas Kooi
b173b21c51 Fixed advancedLocal treatment function. Now also selects primary weapon of caller when performing treatment. 2015-01-22 22:25:59 +01:00
Thomas Kooi
e7ebcbe3fb Added new unconscious condition for bleeding 2015-01-22 22:25:24 +01:00
Thomas Kooi
8137080bbc Minor code clean up 2015-01-22 22:00:37 +01:00
Thomas Kooi
68ab7b5143 Added AGM handleDamage caching 2015-01-22 22:00:04 +01:00
Thomas Kooi
23f8b8a9ad Added AGM config changes 2015-01-22 21:59:34 +01:00
Thomas Kooi
183b36d55e Menu now opens for ACE_player instead of player 2015-01-22 13:33:12 +01:00
Thomas Kooi
0c221c2912 Changed effects only display while in curator view 2015-01-22 13:28:45 +01:00
Thomas Kooi
ae5996bcd2 Fixed animations for carry/drag 2015-01-22 13:12:46 +01:00
PabstMirror
47c3ad1e5e Remove debug config 2015-01-22 00:17:31 -06:00
Nicolás Badano
14d2a6ee69 Merge pull request #83 from KoffeinFlummi/cseOptionsMenu 
Port: CSE options menu
 2015-01-22 02:57:34 -03:00
Nicolás Badano
0d24ddf994 optionsMenu: tweak columns 2015-01-22 02:56:11 -03:00
Nicolás Badano
0c3c0b0e33 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 
Conflicts:
	addons/weather/XEH_postInit.sqf
 2015-01-22 02:48:48 -03:00
Nicolás Badano
58db703db7 weather: small fix 2015-01-22 02:47:02 -03:00
Nicolás Badano
86e841bc64 optionsMenu: matched the size and font style of the main menu buttons 2015-01-22 02:45:27 -03:00
Nicolás Badano
96289b6395 optionsMenu: added localization to menu name 2015-01-22 02:44:45 -03:00
jaynus
0df7f86d66 Merge pull request #74 from KoffeinFlummi/lasers 
laser_selfdesginate commit for commanche
 2015-01-21 21:39:17 -08:00
Nicolás Badano
f73a456fb0 optionmenu: increase size 2015-01-22 02:33:51 -03:00
jaynus
81ae9e6e8f Javelin fixed and firing TDA terminal kill. Direct selection needs to be completed. 2015-01-21 21:31:58 -08:00
Nicolás Badano
b6f35cc015 define all sizes and offsets through macros 2015-01-22 01:48:39 -03:00
Nicolás Badano
91f066b84d remove quotes 2015-01-22 01:40:17 -03:00
jaynus
eaa157b4c5 Fixed script error on launch missing ; 2015-01-21 20:35:27 -08:00
Nicolás Badano
ccc96eb71c Merge branch 'cseOptionsMenu' of github.com:KoffeinFlummi/ACE3 2015-01-22 00:58:53 -03:00
PabstMirror
cb561a2d93 Convert Old Ace_Options 2015-01-21 18:19:10 -06:00
PabstMirror
d5916ced9e Colors from config 2015-01-21 17:43:57 -06:00
PabstMirror
2b62c170fd Read from config 2015-01-21 17:29:42 -06:00
commy2
b0e7cefb06 Merge pull request #82 from KoffeinFlummi/weather 
weather module
 2015-01-22 00:23:40 +01:00
commy2
ce81f6d9f5 kestrel 360, weather 2015-01-22 00:22:09 +01:00
commy2
770a151bf5 CBA keybinding for vector 2015-01-21 23:49:16 +01:00
PabstMirror
fe4a0b9be8 Formating 2015-01-21 16:27:53 -06:00
commy2
1737e3e7fa vector config, DONE 2015-01-21 23:05:19 +01:00
PabstMirror
a595b48d32 More Locaization 2015-01-21 16:00:54 -06:00
commy2
efb761a14c vector settings 2015-01-21 22:52:39 +01:00
Thomas Kooi
7020a8ef30 Replaced some PFH by waitandExecute 2015-01-21 21:37:03 +01:00
PabstMirror
c29acb4c68 Localization start 2015-01-21 14:23:33 -06:00
commy2
2c4c1d7db2 add config, settings to vector 2015-01-21 21:15:51 +01:00
PabstMirror
92bbfd92d1 Color Sliders 2015-01-21 13:53:05 -06:00
Thomas Kooi
77bd8f753d Added AGM blood volume greyness effect 2015-01-21 16:04:34 +01:00
Thomas Kooi
dcd42f55e8 Minor improvements to handleTreatment 2015-01-21 15:53:18 +01:00
Thomas Kooi
7e5806b834 Improved drag and carry actions. 2015-01-21 15:52:59 +01:00
Thomas Kooi
bbf9ce61f0 Changed QGVAR(isDead) to ACE_isDead 
Minor improvements to debug function
 2015-01-21 15:52:11 +01:00
PabstMirror
0ae940fdfb Rough Conversion 
Gut keybind stuff, redo data arrays, reset button, progress on color
changer.
 2015-01-21 05:43:58 -06:00
Nicolás Badano
2c34c16621 weather: weird syntax! 2015-01-21 02:28:23 -03:00
PabstMirror
09bb14d11b Options Menu from CSE 2015-01-20 23:27:08 -06:00
Nicolás Badano
306b3250e5 Merge branch 'master' into weather 2015-01-21 02:21:07 -03:00
Nicolás Badano
3a57b477de weather: replace agm's seasonal by cse's monthly temperatures 2015-01-21 02:12:57 -03:00
Nicolás Badano
59144e7b53 weather: only force set misc parameters on clients 2015-01-21 01:07:33 -03:00
Nicolás Badano
851db25e56 weather: add config data for A3 islands 2015-01-21 01:05:27 -03:00
Nicolás Badano
bba99d64f7 weather: added temperature simulation and air density 2015-01-21 00:14:51 -03:00
Nicolás Badano
0f790267f1 weather: more tabs to spaces 2015-01-21 00:00:32 -03:00
Nicolás Badano
b3d14987bc weather: sync misc. parameters: lightnings, rainbow, fog 2015-01-21 00:00:06 -03:00
Nicolás Badano
a92ebf4e41 weather: fix for waves sync 2015-01-20 23:59:32 -03:00
Nicolás Badano
64649fa781 weather: tabs to spaces 2015-01-20 23:58:19 -03:00
Nicolás Badano
a35f9a2be4 weather: sync waves 2015-01-20 23:30:49 -03:00
Nicolás Badano
2f12fca967 Wind: remove debug prints 2015-01-20 23:19:57 -03:00
Nicolás Badano
a29e08ed3c Ensure the transition time for rain is never 0 2015-01-20 23:18:17 -03:00
Nicolás Badano
6d34c310ad Reduce intensity of initial wind 2015-01-20 23:17:32 -03:00
Nicolás Badano
4a29f6a3c3 Set wind and rain syncing. Change ACE_wind from macro to global variable 2015-01-20 23:17:09 -03:00
Nicolás Badano
71bd34234b weather: initial port of ACE2 features. variables names changed to use macros. 2015-01-20 20:18:40 -03:00
commy2
b9551f6ad8 split mags from ballistic 2015-01-20 22:40:15 +01:00
Nicolás Badano
2255a56885 Merge remote-tracking branch 'origin/wind_deflection' into weather 2015-01-20 18:10:24 -03:00
commy2
a1432e35d7 fix missing base class 2015-01-20 20:02:43 +01:00
commy2
7071f34131 split flashhiders and uniform/vest nerfs from ballistics 2015-01-20 19:55:17 +01:00
Thomas Kooi
a92430b701 Added events to carry object. 2015-01-20 18:57:53 +01:00
Thomas Kooi
9a0b73bf3a Changed drag/carry to event driven architecture 2015-01-20 18:57:33 +01:00
commy2
9d687b9b3e vector: fix potential error in FOS, prep settings, config 2015-01-20 18:26:31 +01:00
commy2
65e12745d6 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-01-20 13:17:59 +01:00
Glowbal
8554cf7e6c Can now also remove a medic class through setMedic 2015-01-20 11:57:16 +01:00
Glowbal
72ae6eb08f Updated playInjured 
Removed sleep.
Made use of waitUnitl execute.
Changed MP sound broadcasting. No longer using the broadcastSound_F function.
 2015-01-20 11:56:00 +01:00
Glowbal
1337c2c562 Made unit loop flag public 2015-01-20 11:36:52 +01:00
PabstMirror
aec687f007 #78 - targetEvent working in SP 2015-01-20 03:54:34 -06:00
Nicolás Badano
544dbb1e29 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-01-20 02:58:45 -03:00
Nicolás Badano
06743bef52 interaction: fix canInteract and exceptions in agm menu 2015-01-20 02:58:06 -03:00
Nicolás Badano
b6dbd8d3c4 interact_menu: add canInteract (including exceptions) and canInteractWith to condition. 2015-01-20 02:41:04 -03:00
Nicolás Badano
9e11aeb0b9 interaction: fix canInteract and exceptions in agm menu 2015-01-20 02:39:22 -03:00
PabstMirror
cb52ac18c9 Send marker configNames instead of index 
Upstream fix from AGM
If CfgMarkers don't match, will throw warning:
22:46:53
[3896,74.535,0,"z\ace\addons\markers\functions\fnc_setMarkerNetwork.sqf:11","WARNING:
CfgMarker not found changed to milDot"]
 2015-01-19 22:49:39 -06:00
jaynus
7e621616d0 function name error. 2015-01-19 20:19:33 -08:00
jaynus
c5d03ce2c0 GBU and DAGR guidance initializations. 2015-01-19 20:16:33 -08:00
jaynus
16a296e92b laser_selfdesginate commit for commanche 2015-01-19 20:13:12 -08: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
Nicolás Badano
3bdd706e5d Merge remote-tracking branch 'origin/master' into moreCbaKeyBinds 2015-01-20 00:38:18 -03:00
Nicolás Badano
f3746d8391 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into nouInteractionMenu 2015-01-19 23:56:36 -03:00
Nicolás Badano
1cb8da4c21 Merge branch 'interact_menu' of github.com:KoffeinFlummi/ACE3 into nouInteractionMenu 2015-01-19 23:56:16 -03:00
commy2
42f2270a3a stuff 2015-01-20 02:19:31 +01:00
commy2
599dc134d8 simplify stuff 2015-01-20 01:34:26 +01:00
commy2
70b642afc0 get kestrl to work 2015-01-20 01:05:57 +01:00
Nou
ef94011cdc Menu rendering should be done with the mission event handler for Draw3D because it executes before rendering the current frame, rather than after the current frame. 2015-01-19 15:13:41 -08:00
Nicolás Badano
b0e99ada12 Merge branch 'master' into HEAD 2015-01-19 19:03:02 -03:00
commy2
8c8e14b0ca port kestrel 2015-01-19 21:13:56 +01:00
commy2
97ee63a349 getting PFH to work on briefing screen, review 2015-01-19 17:47:52 +01:00
commy2
87adbe9b9e DFUNC 2015-01-19 17:30:04 +01:00
commy2
e55a85cc26 get markers to work 2015-01-19 16:59:00 +01:00
commy2
1c37c76cc6 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into agmPortMarkers 2015-01-19 14:42:25 +01:00
Garth "L-H" de Wet
3f83085aed Merge pull request #68 from KoffeinFlummi/agmGogglesPort 
Agm goggles port
 2015-01-19 13:57:08 +02:00
KoffeinFlummi
4356c0d02b Add addon variable to FCS 2015-01-19 12:38:07 +01:00
Garth L-H de Wet
2fe155f990 Converted a couple PFHs to use the waitAndExecute function as that is what they were doing. 
Fixed a couple bugs.
 2015-01-19 10:34:49 +02:00
Nou
1a2231c14a Privatize 2015-01-18 20:13:45 -08:00
Nou
84f404ae84 Remove debug, added scripted add/remove actions. 2015-01-18 20:08:34 -08:00
Thomas Kooi
29c4676b20 Added missing variables to private array. 2015-01-19 00:59:19 +01:00
Thomas Kooi
e4b1265a84 Fixed incorrect parameter passing in treatment actions 2015-01-19 00:58:36 +01:00
Thomas Kooi
76e877067c Fixed examine actions 2015-01-19 00:58:17 +01:00
Garth L-H de Wet
ef19ffad0c Glasses conditions are local to each unit. No longer global scope on each client. 2015-01-19 01:38:54 +02:00
Garth L-H de Wet
b499cc9a1d Rain effect is working as expected. 2015-01-19 01:12:45 +02:00
Garth L-H de Wet
10cdbeb4dd Made the glasses effects slowly fade (not completely away) over 30 seconds. 2015-01-19 01:04:32 +02:00
Thomas Kooi
a890400c55 Fixed tourniquet treatment actions. 2015-01-18 23:58:10 +01:00
Garth L-H de Wet
49e19610c2 Removed a bunch of spawns and used PFH's in their place. 2015-01-19 00:57:39 +02:00
Thomas Kooi
5745408647 Added hold and release functionality for CMS menu. 2015-01-18 23:44:32 +01:00
Nicolás Badano
fc8c391596 nametags: cba keybinds 2015-01-18 19:39:15 -03:00
Nicolás Badano
058aa8d920 interaction: cba keybinds 2015-01-18 19:38:58 -03:00
commy2
9e2eaa96e1 pull master into branch 2015-01-18 23:26:41 +01:00
Garth L-H de Wet
fc18cb443f Converted Goggles to use ACE/CBA macros. 2015-01-18 23:50:45 +02:00
Thomas Kooi
920453e150 Fixed incorrect personal aid kit model. 2015-01-18 22:37:26 +01:00
Nicolás Badano
112c9f319f scopes: partial fix 2015-01-18 18:34:45 -03:00
Thomas Kooi
e468832324 Added initial port of CSE medical (CMS) 2015-01-18 22:16:35 +01:00
Nicolás Badano
63af6892eb fix for safemode 2015-01-18 17:56:12 -03:00
Nicolás Badano
e38eb5c09d fix for fcs 2015-01-18 17:56:05 -03:00
Nicolás Badano
7895173407 overheating: cba keybinds 2015-01-18 17:08:56 -03:00
Nicolás Badano
5a77e2c220 reload: cba keybinds 2015-01-18 17:05:32 -03:00
Nicolás Badano
9ed9dc916b resting: cba keybinds 2015-01-18 17:05:17 -03:00
Nicolás Badano
dc8c5758f1 scopes: cba keybinds 2015-01-18 17:01:18 -03:00
Nicolás Badano
60649d780c scopes: cba keybinds 2015-01-18 17:01:07 -03:00
Nicolás Badano
d8d665cc03 vehicles: cba keybinds 2015-01-18 17:00:43 -03:00
Garth L-H de Wet
0f04d0dfb1 Moved goggles to addons folder and renamed all occurances of AGM to ACE. 2015-01-18 21:43:51 +02:00
Glowbal
b80cec4c18 Merge pull request #45 from KoffeinFlummi/csePort_fixed 
Port from CSE Common.
 2015-01-18 20:12:18 +01:00
Thomas Kooi
8dfdd11f3c Changed tabs to 4 spaces 2015-01-18 20:09:19 +01:00
KoffeinFlummi
a78730d387 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-01-18 20:03:59 +01:00
KoffeinFlummi
8872424abe Merge branch 'fcs-extension' 2015-01-18 20:03:40 +01:00
KoffeinFlummi
4978bb5294 Move FCS calculation to extension 2015-01-18 20:02:37 +01:00
Thomas Kooi
86663e8a8e Changed disableUserInput_f to setDisableUserInputStatus. 2015-01-18 19:54:43 +01:00
Nou
6a04408a74 Initial nou menu commit. 2015-01-18 10:38:27 -08:00
Nicolás Badano
d532caf1a0 fix execNextFrame (#56) 2015-01-18 15:26:26 -03:00
Nicolás Badano
d299331f80 Merge branch 'weaponSelecCbaKeyBinds' 2015-01-18 15:24:15 -03:00
Nicolás Badano
1b1e5fd70d Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into fcsCbaKeyBinds 2015-01-18 15:23:32 -03:00
commy2
67fcb0c7b6 Merge pull request #60 from KoffeinFlummi/vectorZoomFix 
Zoom level adjustment. fix #58
 2015-01-18 17:19:59 +01:00
commy2
a545efe02c work on port markers 2015-01-18 17:17:06 +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
Thomas Kooi
63c024bc79 Fixed undefined variable script error 2015-01-18 16:31:40 +01:00
VKing
99a31f8ae8 Zoom level adjustment. Ref #58 2015-01-18 16:03:34 +01:00
Nicolás Badano
415df07af4 weaponselect: replace keybinds for cba 2 2015-01-18 11:57:23 -03:00
Nicolás Badano
b867dc04ed weaponselect: replace keybinds for cba 2015-01-18 11:30:57 -03:00
Thomas Kooi
b76eabe1c4 Fixed incorrect parameters being given to callback function 2015-01-18 15:17:25 +01:00
Nicolás Badano
4d721418fa Merge pull request #54 from KoffeinFlummi/laserPointerImprovements 
Laser pointer improvements
 2015-01-18 10:03:16 -03:00
PabstMirror
6e8c394903 Standardize Config Version Stuff 2015-01-18 01:32:07 -06:00
commy2
cb8945a879 port markers 2015-01-18 08:20:55 +01:00
bux578
632a3f5e0a Merge branch 'master' into agmScopesPort 2015-01-18 08:18:24 +01:00
bux578
a1c167844d fix errors, but still no overlay 
and lots of spawns
 2015-01-18 08:13:37 +01:00
commy2
14745af70b port difficulties 2015-01-18 08:06:25 +01:00
commy2
06f39aa158 port lock backpacks 2015-01-18 07:56:09 +01:00
commy2
e67602d76e port movement 2015-01-18 06:45:28 +01:00
Nicolás Badano
74bfc31598 laserpointer: various improvements: 
- calculate system of reference vectors to offset the laser start.
- as much stuff as possible calculated in ASL, removing all conversions inside loops.
- halved the distance in which men are searched.
- increased the tolerance when calculating distance.
 2015-01-17 23:51:31 -03:00
Nicolás Badano
e7ec905892 Cache the units near to the camera instead of the player. 
Works even when no player exists or is somehow viewing the action remotely.
 2015-01-17 23:48:44 -03:00
commy2
8683667d24 add day laser pointer 2015-01-17 23:38:13 +01:00
commy2
fa2acfbb50 vector FOS mode 2015-01-17 22:49:06 +01:00
Nicolás Badano
a1cb57f4db smallarms: port 2015-01-17 18:14:56 -03:00
Nicolás Badano
daec785600 AGM_Smallarms pre CBA 2015-01-17 18:02:03 -03:00
Nicolás Badano
9247bb3411 safemode: port 2015-01-17 17:32:34 -03:00
Nicolás Badano
7c41eb04e9 AGM_SafeMode pre CBA 2015-01-17 17:01:47 -03:00
Nicolás Badano
16be448168 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-01-17 16:05:14 -03:00
Nicolás Badano
fd4a2192e9 map: small fixes 2015-01-17 16:04:48 -03:00
commy2
6658eafe3d vector object height, length mode 2015-01-17 19:25:12 +01:00
Nicolás Badano
9a790a229a Merge branch 'agmMapPort' of github.com:KoffeinFlummi/ACE3 2015-01-17 15:24:46 -03:00
Nicolás Badano
6abc6073e1 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-01-17 15:19:53 -03:00
Nicolás Badano
3fa6f1b0c9 gforces: fix for when there's no player 2015-01-17 15:18:11 -03:00
bux578
68b56d9161 Merge branch 'master' into agmScopesPort 2015-01-17 19:14:33 +01:00
PabstMirror
1d475111e7 Flashbang Icon Name 2015-01-17 12:12:02 -06:00
Nicolás Badano
6bee456aff Merge pull request #24 from KoffeinFlummi/agmGrenadesPort 
Port: AGM Grenades
 2015-01-17 15:05:15 -03:00
commy2
7a6d0eefe3 port weapon select 2015-01-17 18:26:51 +01:00
Thomas Kooi
d3c05209ea Changed loading bar to make use of PFH 2015-01-17 18:21:52 +01:00
Nicolás Badano
c851a14da9 common: added execNextFrame function 2015-01-17 13:56:24 -03:00
Nicolás Badano
4926b6970b fixes typos 2015-01-17 13:45:56 -03:00
Nicolás Badano
f165030e3b common: remove the support for code as string 2015-01-17 12:23:03 -03:00
Thomas Kooi
748f4f30be Removed throw for consistency. Not used anywhere else. 2015-01-17 14:26:50 +01:00
Thomas Kooi
42c90074cb Removed duplicate limitSpeed. Already present in vehicles pbo 2015-01-17 14:20:49 +01:00
Thomas Kooi
cdc2373872 Removed foreachDo 2015-01-17 14:14:12 +01:00
Thomas Kooi
781ebaca95 Changed StateUnconscious to "ACE_isUnconscious" 2015-01-17 14:13:37 +01:00
Thomas Kooi
7345cf91cf Minor code clean up 2015-01-17 13:54:44 +01:00
Thomas Kooi
eaa44fce6f Changed some spawns to call 2015-01-17 13:38:26 +01:00
Thomas Kooi
a8e257f7ab Changed setDead to no longer use spawn. 2015-01-17 13:35:15 +01:00
Thomas Kooi
d42b83947d Fixed script errors in limit speed functions (missing [) 2015-01-17 13:35:03 +01:00
Thomas Kooi
38947ba669 Moved sendDisplay & sendMessage functions to GUI instead of common. 2015-01-17 13:03:51 +01:00
Thomas Kooi
e5579f1c32 Removed spawn usage from limit movement speed functions 2015-01-17 12:53:23 +01:00
Glowbal
041a4fccc5 Removed CSE text 
Changed set count to pushback.
 2015-01-17 12:42:10 +01:00
Glowbal
31f0b80659 Fixed CBA macro mistake 2015-01-17 12:40:06 +01:00
Glowbal
6e4a12ff4d Fixed CBA macro mistake 
Fixed an CBA macro mistake.
 2015-01-17 12:39:33 +01:00
Thomas Kooi
83128ad3d2 Fixed minor issues with unconscious & blackout effect. 
Fixed error in XEH_postInit
 2015-01-17 12:35:59 +01:00
Thomas Kooi
8a61f5fbb5 Changed setUnconsciousState to no longer use spawn. 2015-01-17 12:08:11 +01:00
Thomas Kooi
a77082e4f7 Made functions compatible with removed/renamed functions. 2015-01-17 12:07:41 +01:00
Thomas Kooi
45284c7855 Changed customEventHandler_f to raiseScriptedEvent_f 
Should be replaced by the ACE eventhandler at a later stage.
 2015-01-17 12:07:03 +01:00
Thomas Kooi
6509491c19 Removed duplicate functions 2015-01-17 12:06:03 +01:00
Thomas Kooi
f25766d4e4 Moved effect functions to GUI folder 2015-01-17 12:05:07 +01:00
bux578
79695f00e9 Merge remote-tracking branch 'origin' into agmScopesPort 2015-01-17 09:22:34 +01:00
PabstMirror
1783bf4db6 #49 - targetEvent for flashbang 2015-01-17 00:39:46 -06:00
Nicolás Badano
27bd5c5790 hearing: fixes 2015-01-17 03:20:41 -03:00
PabstMirror
853dfba86a Merge branch 'master' into agmGrenadesPort 2015-01-17 00:15:07 -06:00
Nicolás Badano
a7e016fa8f overheating: change addPerFrameHandler to waitAndExecute 2015-01-17 03:13:05 -03:00
Nicolás Badano
fefb599a55 explosives: change addPerFrameHandler to waitAndExecute 2015-01-17 03:09:51 -03:00
Nicolás Badano
8a397f80ef hearing: change addPerFrameHandler to waitAndExecute 2015-01-17 03:02:52 -03:00
Nicolás Badano
2f4f6f3161 common: add waitAndExecute function 2015-01-17 02:58:24 -03:00
Nicolás Badano
c85db9baf9 hearing: fix PFH in case the game is paused 2015-01-17 02:24:28 -03:00
Nicolás Badano
800e16edc5 explosives: fix timer in case the game pauses 2015-01-17 02:14:09 -03:00
Nicolás Badano
1adbe8c6a9 nightvision: make EH calls traceable 2015-01-17 02:12:37 -03:00
Nicolás Badano
7fd578326f Merge pull request #47 from KoffeinFlummi/agmGForcesPort 
Port: AGM_GForces
 2015-01-17 01:15:52 -03:00
Nicolás Badano
402156aecf gforces: renamed function 2015-01-17 01:09:12 -03:00
PabstMirror
4cc57be48c Cleanup debug 2015-01-16 22:07:53 -06:00
Nicolás Badano
e61b828314 gforces: moved stuff out of config.cpp 2015-01-17 01:01:56 -03:00
Nicolás Badano
43b87cda0b gforces: tweaked based on pilot feedback (https://github.com/KoffeinFlummi/AGM/issues/1774#issuecomment-70341573) 2015-01-17 00:59:45 -03:00
Nicolás Badano
f594198eae gforces: port from AGM 2015-01-16 23:01:41 -03:00
PabstMirror
e260ea5314 Merge branch 'master' into agmMapPort 2015-01-16 19:21:03 -06:00
Nou
82d7f4bd5c Typo! Closes #46 2015-01-16 17:12:37 -08:00
Thomas Kooi
ef4248650e Added CSE gui port, minus the radial and configuration menus. 2015-01-17 00:22:37 +01:00
Thomas Kooi
afc103a946 Added CSE common port. 2015-01-17 00:21:47 +01:00
PabstMirror
2483e8f8d8 Merge branch 'master' into agmMapPort 2015-01-16 17:17:48 -06:00
PabstMirror
89654a42d2 Needs Testing 2015-01-16 17:13:26 -06:00
commy2
7678193ca1 remove obsolete stuff 2015-01-16 23:49:29 +01:00
commy2
cd533abd6f inventoryDisplayLoaded eh 2015-01-16 23:48:30 +01:00
commy2
d66b78bdd5 infoDisplayChanged via addEventHandler 2015-01-16 23:13:51 +01:00
Nicolás Badano
46b25e88c0 respawn: fixed actions and self_actions 2015-01-16 18:23:07 -03:00
Nicolás Badano
4445ec6195 nightvision: fix 2015-01-16 17:57:55 -03:00
Nicolás Badano
4a8e9a65b1 nightvision: Fix #42 2015-01-16 17:56:23 -03:00
Nicolás Badano
7c4af1dc17 nightvision: use ACE events to replace a PFH 2015-01-16 17:25:30 -03:00
Nicolás Badano
5f1a6c40e3 common: raise more local ACE events 2015-01-16 17:16:42 -03:00
Nicolás Badano
9654d3b36d ACE events fixes 2015-01-16 16:30:48 -03:00
Nicolás Badano
26325bb943 Throw the zeusDisplayChanged ACE event 2015-01-16 15:39:38 -03:00
Nicolás Badano
223600e689 Throw the playerVisionModeChanged ACE event 2015-01-16 15:39:19 -03:00
Nicolás Badano
8b3c70a16d Add PFH to throw the playerInventoryChanged ACE event 2015-01-16 15:28:37 -03:00
Nicolás Badano
8467013c1a Moved getAllGear function to common module 2015-01-16 15:24:25 -03:00
Nicolás Badano
7883389a53 Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git into agmNightVisionPort 2015-01-16 14:35:52 -03:00
Nicolás Badano
5bea43910d Merge pull request #38 from KoffeinFlummi/aceEvents 
Replace some AGM custom events by ACE events
 2015-01-16 14:20:39 -03:00
Nicolás Badano
78cca3c539 interaction: raise "interactionMenuOpened" ACE event locally 2 2015-01-16 12:45:15 -03:00
Nicolás Badano
00e68c4540 interaction: raise "interactionMenuOpened" ACE event locally 2015-01-16 12:42:48 -03:00
Nicolás Badano
bce84d9a2d respawn: raise "killedByFriendly" ACE event globally 2015-01-16 12:38:43 -03:00
Nicolás Badano
e1b1edc961 noradio: ace local event for playerChanged 2015-01-16 12:14:40 -03:00
Nicolás Badano
34135ffdd4 common: ACE local event for playerChanged 2015-01-16 12:14:18 -03:00
commy2
7cd2bc24c8 port magazinerepack 2015-01-16 15:37:32 +01:00
Nicolás Badano
60270d5415 Change the loop that updates ACE_player from BIS to PFH 2015-01-16 11:30:49 -03:00
Nicolás Badano
cf08d8cfa6 Merge branch 'master' of git@github.com:KoffeinFlummi/ACE3.git 2015-01-16 11:02:30 -03:00
Nicolás Badano
96d78d07b9 Merge branch 'agmNoRadio' of git@github.com:KoffeinFlummi/ACE3.git into agmPortNoRadio 2015-01-16 10:48:16 -03:00
commy2
fac9b2f4f4 menu fixes 2015-01-16 14:35:19 +01:00