PabstMirror
|
ec38c8c951
|
Merge branch 'master' into interactionPrivates
Conflicts:
addons/interaction/functions/fnc_addPassengerActions.sqf
addons/interaction/functions/fnc_getDoorAnimations.sqf
addons/interaction/functions/fnc_moduleInteraction.sqf
addons/interaction/functions/fnc_moveDown.sqf
addons/interaction/functions/fnc_removeTag.sqf
addons/interaction/functions/fnc_showMouseHint.sqf
addons/interaction/functions/fnc_updateTooltipPosition.sqf
|
2015-05-14 12:53:18 -05:00 |
|
jonpas
|
633e94a114
|
CBA Macros to Interaction functions
|
2015-05-09 22:14:00 +02:00 |
|
jonpas
|
e9abd8c27a
|
Fixed lowercasing, improved examples
|
2015-05-09 04:55:41 +02:00 |
|
jonpas
|
2ff372e2a1
|
Function headers per Coding Guidelines for Interaction
|
2015-05-09 04:47:15 +02:00 |
|
jonpas
|
50d5e845ee
|
Lowercased beginning of functions pt2
|
2015-05-09 03:12:28 +02:00 |
|
jonpas
|
2a9f4d779d
|
Lowercased beginning of function names
|
2015-05-09 03:09:26 +02:00 |
|
PabstMirror
|
675b76f569
|
Privates - Interaction
|
2015-05-01 18:12:24 -05:00 |
|
esteldunedain
|
324b9510e3
|
Allow positions for actions to be computed dynamically. Also leverage that for the position of the "Weapon" action, instead of hard coding an exception for that.
|
2015-05-01 01:56:39 -03:00 |
|
commy2
|
f5d7331847
|
no team management on the dead or unconscious units, fix #803
|
2015-04-26 20:57:55 +02:00 |
|
esteldunedain
|
90288b495e
|
Interactions inside vehicles. Skip the "Main Interactions" level; mount its children intead.
|
2015-04-20 18:24:12 -03:00 |
|
PabstMirror
|
669dbe10c9
|
BecomeLeader - Don't create new group
|
2015-04-13 00:23:00 -05:00 |
|
jaynus
|
1bb6be5654
|
Cleaning up of all tabs in source code files.
|
2015-04-06 09:22:43 -07:00 |
|
Glowbal
|
b6b880fba0
|
Merge pull request #310 from KoffeinFlummi/medicalActionsWhileBoarded
Add medical actions while boarded.
|
2015-04-05 14:36:17 +02:00 |
|
Glowbal
|
92bdae9321
|
Removed diag_log spam
|
2015-04-05 13:25:53 +02:00 |
|
PabstMirror
|
75351f2a5b
|
TapShoulder - fix hint message
|
2015-04-04 17:54:15 -05:00 |
|
Nicolás Badano
|
5e79970740
|
Switching nicknames
|
2015-03-24 01:18:00 -03:00 |
|
Nicolás Badano
|
f8ea603977
|
Added dynamic actions to unload patients (unconscious) from vehicles
|
2015-03-21 15:32:32 -03:00 |
|
Nicolás Badano
|
f5f91c4802
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
|
2015-03-21 10:24:01 -03:00 |
|
Nicolás Badano
|
83d9aa4bb6
|
Replace tap shoulder and check (others) ammo animations by PutDown
|
2015-03-21 10:23:36 -03:00 |
|
Nicolás Badano
|
4210b175c3
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into dynamicInteractMenu
Conflicts:
addons/interact_menu/functions/fnc_compileMenu.sqf
addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf
|
2015-03-21 00:16:52 -03:00 |
|
Nicolás Badano
|
b3aa7c8970
|
Make collectActiveActionTree follow mounts correctly
|
2015-03-20 22:44:25 -03:00 |
|
PabstMirror
|
7e383dc10e
|
#198 canInteractWith EGVAR -> EFUNC
|
2015-03-20 17:55:39 -05:00 |
|
Nicolás Badano
|
66731c9cdd
|
First rough implementation of the passengers menu, with mounted main actions
|
2015-03-20 00:53:58 -03:00 |
|
commy2
|
b5f307919e
|
replace canInteract with canInteractWith
|
2015-03-15 13:00:10 +01:00 |
|
PabstMirror
|
1dd270812d
|
Finish keybind conversion for old interact
|
2015-03-10 12:47:58 -05:00 |
|
Nicolás Badano
|
cd00eda8c0
|
Fix interactions with civilians
|
2015-03-02 23:30:11 -03:00 |
|
Nicolás Badano
|
2b0cfac8e4
|
Removed obsolote code from ace_interaction (#109)
|
2015-02-28 23:00:24 -03:00 |
|
Nicolás Badano
|
dd92c5e845
|
Tap on either shoulder. "Tap" animation
|
2015-02-19 19:45:46 -03:00 |
|
Nicolás Badano
|
74d0ae95ff
|
Change ACE_Settings from modules
|
2015-02-03 02:53:02 -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
|
96b7c0d30c
|
ACE_Settings: replace all ACE_Options
|
2015-01-30 19:19:45 -03: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 |
|
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
|
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
|
167497ec2f
|
small fixes for explosives and interaction
|
2015-01-14 10:11:46 -03:00 |
|
Nicolás Badano
|
e53ed960dd
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3.git
|
2015-01-13 20:00:36 -03:00 |
|
Nicolás Badano
|
e24d6aa42f
|
Fix in interaction menu for attaching
|
2015-01-13 19:59:16 -03:00 |
|
commy2
|
ee7ae79f15
|
fix key release issues
|
2015-01-13 23:54:21 +01:00 |
|
commy2
|
270ff5535a
|
fix interaction menu
|
2015-01-13 19:14:34 +01:00 |
|
commy2
|
039ae01594
|
fix some sqf errors
|
2015-01-13 17:08:49 +01:00 |
|
commy2
|
9efc1f9547
|
fix script errors
|
2015-01-13 16:38:21 +01:00 |
|
jaynus
|
3fb2a8e245
|
big code clean up
|
2015-01-12 21:14:27 -08:00 |
|
Nicolás Badano
|
1aa862bc3b
|
Change stringtables and main variables prefixes to ACE
|
2015-01-12 01:20:02 -03:00 |
|
Nicolás Badano
|
6025fc5c57
|
Macros for the rest of interaction
|
2015-01-11 20:13:47 -03:00 |
|
Nicolás Badano
|
e823e60224
|
Remove unused code
|
2015-01-11 17:40:17 -03:00 |
|
Nicolás Badano
|
6769189e7c
|
AGM_Interaction pre CBA
|
2015-01-11 16:32:51 -03:00 |
|