KoffeinFlummi
3482633fb1
Basic treatment structure
2015-02-20 22:04:01 +01:00
Nicolás Badano
908f23a78f
Removed filtering actions
2015-02-19 20:10:07 -03:00
PabstMirror
3511a74ef9
Don't show sound if not enabled
2015-02-19 16:59:21 -06:00
Nicolás Badano
dd92c5e845
Tap on either shoulder. "Tap" animation
2015-02-19 19:45:46 -03:00
PabstMirror
3ade628d87
Handle 3 Soundwave options
2015-02-19 16:42:28 -06:00
Nicolás Badano
bc3a226c64
Text under the icon
2015-02-19 18:56:43 -03:00
Nicolás Badano
41145e5731
reduce size of the menu
2015-02-19 18:03:25 -03:00
Nicolás Badano
0dfeb22ec8
tidy up
2015-02-19 18:03:14 -03:00
Glowbal
b58abaa2c0
Added a transparant background
2015-02-19 22:01:09 +01:00
Glowbal
ab6879845c
Merge branch 'master' into standardize_ui
2015-02-19 21:42:47 +01:00
Glowbal
a81c1fbef5
Overhauled AGM hint.
2015-02-19 21:38:51 +01:00
PabstMirror
a8e269bc18
Cleanup Escort Logic
...
No more ERROR spam
2015-02-19 14:34:14 -06:00
Glowbal
2cf0ceff2a
Merge pull request #147 from KoffeinFlummi/common_cleanup
...
Clean up of CSE code
2015-02-19 21:33:57 +01:00
PabstMirror
ae61dff44e
Move draw to function (wip)
2015-02-19 14:29:38 -06:00
Garth "L-H" de Wet
455d682706
Merge pull request #128 from KoffeinFlummi/IEDSupport
...
IED support
2015-02-19 21:44:00 +02:00
Nicolás Badano
861a6b1775
avoid all submenus opening simultaneously by switching menu paths to use uids
2015-02-19 15:47:59 -03:00
Nicolás Badano
f7d5d615ee
allow actions to be defined for different selections
2015-02-19 15:36:27 -03:00
Glowbal
21199a4ee6
Now uses BIS_fnc_rscLayer
2015-02-19 19:32:49 +01:00
Glowbal
c8d4acfc81
Refactored displayText to no longer use spawn.
2015-02-19 19:29:54 +01:00
Glowbal
b0373de576
Tabs to spaces
2015-02-19 19:14:52 +01:00
Glowbal
612fa69c1c
Renamed string_removeWhiteSpace to stringRemoveWhiteSpace.
2015-02-19 19:12:14 +01:00
Glowbal
8488f10b92
Merge pull request #149 from KoffeinFlummi/cseMissionModules
...
Port: CSE Ambiance sound module
2015-02-19 19:07:38 +01:00
Glowbal
af3709f481
Fixed forgotten missionModules.
2015-02-19 19:07:19 +01:00
Glowbal
1ea35548e0
Fixed ambiance sounds module.
2015-02-19 18:40:40 +01:00
Nicolás Badano
30943cbfd4
move the main menu actions to the right cuadrant
2015-02-19 12:03:20 -03:00
Nicolás Badano
a8797fe45a
Fix for the angular spacing of submenus
2015-02-19 12:02:48 -03:00
Nicolás Badano
db5e8bcc34
Modify the opacity of icons along with that of the text
2015-02-19 12:01:47 -03:00
Garth L-H de Wet
96404bc42a
Fixed isNull check not working. Fixed audio not being found.
2015-02-19 15:59:14 +02:00
Nicolás Badano
d055315661
interact_menu: tab to space
2015-02-19 10:49:36 -03:00
Nicolás Badano
53f632c716
Merge branch 'selfInteractionMenu' of github.com:KoffeinFlummi/ACE3 into selfInteractionMenu
2015-02-19 10:39:28 -03:00
Nicolás Badano
3b35d9d109
Make interact sub menus open as circle sectors instead of full circles
2015-02-19 10:38:09 -03:00
Nicolás Badano
8e6600d5ec
Tweak distances
2015-02-19 10:36:59 -03:00
Garth L-H de Wet
f5a6f6f404
Fixed various points raised in the PR.
2015-02-19 15:30:01 +02:00
Garth L-H de Wet
89a81dbed1
Forgotten function added.
2015-02-19 12:40:21 +02:00
Garth L-H de Wet
00643c3c83
Ensured actual fuse time is used instead of simply 1.
2015-02-19 12:39:13 +02:00
Garth L-H de Wet
8c83320675
Separated dialing phone code into separate function to neaten up the original function.
2015-02-19 12:32:41 +02:00
Garth L-H de Wet
e592f233f3
Merge branch 'master' into IEDSupport
2015-02-19 12:26:38 +02:00
PabstMirror
244d7a5572
Fix opacity fading on other render levels
2015-02-19 03:02:58 -06:00
Nicolás Badano
043987fc93
basic self actions
2015-02-18 18:58:06 -03:00
KoffeinFlummi
7e9a02089f
Merge branch 'medical-visuals' into medical-rewrite
...
Conflicts:
addons/medical/functions/fnc_handleDamage.sqf
2015-02-18 19:26:30 +01:00
KoffeinFlummi
3aae72aa70
Cleanup
2015-02-18 19:22:35 +01:00
KoffeinFlummi
58873e1c97
Pain Effect
2015-02-18 19:01:25 +01:00
PabstMirror
b86869d7a1
UAV-Recharge Headers
2015-02-17 22:37:04 -06:00
PabstMirror
c6c200a684
comments
2015-02-17 22:24:37 -06:00
PabstMirror
e649c8e853
Headers and formating
2015-02-17 22:07:29 -06:00
PabstMirror
c291f29702
Move model to folder
2015-02-17 22:06:37 -06:00
PabstMirror
c3b5430bc4
NVG KeyBinds
2015-02-17 22:05:52 -06:00
PabstMirror
37216d5144
Remove HandCuff animEH
2015-02-17 17:05:07 -06:00
Glowbal
bfc748fbbe
Added missionmodules.
2015-02-17 07:51:51 +01:00
Glowbal
d86e2464b3
Removed missionModules
2015-02-17 07:51:35 +01:00
Glowbal
d60081a9c3
Renamed missionModules to missionmodules.
2015-02-17 07:49:37 +01:00
PabstMirror
9cdf06383d
Back to getIn
2015-02-16 19:20:55 -06:00
PabstMirror
dc82e50d72
fix
2015-02-16 18:30:35 -06:00
PabstMirror
eee4b256cd
More Changes and add EH
2015-02-16 18:03:09 -06:00
PabstMirror
d3f4f2883f
Merge pull request #150 from KoffeinFlummi/moduleSounds
...
Added UAV exchange battery sound
2015-02-16 11:58:11 -06:00
Glowbal
da19a89be8
Replaced _targetUnit for ObjNull
...
Replaced _targetUnit for objNull.
2015-02-16 15:56:36 +01:00
PabstMirror
e0d1d08913
Change AnimChange EH
2015-02-15 18:19:01 -06:00
PabstMirror
a0c2a00777
Cleanup
2015-02-15 16:45:13 -06:00
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
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
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
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
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
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