Nicolás Badano
dbb9765035
Fix isSubPath
2015-03-21 14:28:17 -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
9fd45fa707
Merge pull request #202 from KoffeinFlummi/vehLock-cleanup3
...
Vehicle Lock Cleanup
2015-03-21 09:51:47 -03:00
Nicolás Badano
4be788a093
Merge pull request #208 from KoffeinFlummi/dynamicInteractMenu
...
Dynamic interact menu
2015-03-21 09:38:18 -03:00
Nicolás Badano
4a8b5079a6
Fix #211
2015-03-21 09:37:01 -03:00
Nicolás Badano
4fe09034ff
Merge branch 'master' into dynamicInteractMenu
2015-03-21 08:55:05 -03:00
Nicolás Badano
e7d7fa8e6c
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-03-21 00:27:41 -03:00
Nicolás Badano
14566c783b
Prevent canInteractWith from throwing errors if third parameter is not supplied
2015-03-21 00:27:19 -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
2d6fb7e148
Merge branch 'dynamicInteractMenu' of github.com:KoffeinFlummi/ACE3 into dynamicInteractMenu
2015-03-20 22:45:51 -03:00
Nicolás Badano
3d6660b115
Debug stuff
2015-03-20 22:44:36 -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
PabstMirror
8840284309
Fix progressBar
2015-03-20 17:46:21 -05:00
commy2
955506dbe8
stuff in to merge folder
2015-03-20 19:56:39 +01:00
PabstMirror
a146be57f2
Modifyed build tool for pboProject problems
...
Should work on last release of mikero's tools
(because that version of rapify struggles with some CBA macros)
Runs config.cpp though cfgConvert twice to "demacro" config.cpp
Then restores backup when finished
2015-03-20 13:04:54 -05:00
Nicolás Badano
3e69123454
Make collectActiveActionTree follow mounts correctly
2015-03-20 00:55:13 -03:00
Nicolás Badano
66731c9cdd
First rough implementation of the passengers menu, with mounted main actions
2015-03-20 00:53:58 -03:00
Nicolás Badano
b854db0195
Updated interact_menu api calls on ace_dragging
2015-03-19 23:33:11 -03:00
Nicolás Badano
84bf44e026
Refactoring of interact_menu:
...
- Reordering of action members
- Removed full path from actions, so they can be mounted under different paths if needed
- Added api for creating actions
- Api for adding actions for objects or classes
2015-03-19 23:32:44 -03:00
Nicolás Badano
49cdf6512e
Merge branch 'master' into dynamicInteractMenu
2015-03-19 15:09:31 -03:00
Nicolás Badano
b89e573005
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-03-19 15:08:53 -03:00
Nicolás Badano
b7c73f705c
Interact menu usability improvements:
...
- Submenu scale as a function of the number of children
- Added menu expansion animation to better communicate where the options come from
- Unused action point are faded as soon as the user hovers a certain action point
2015-03-19 15:08:36 -03:00
Nicolás Badano
a3b913ad8b
Interact menu usability improvements:
...
- Submenu scale as a function of the number of children
- Added menu expansion animation to better communicate where the options come from
- Unused action point are faded as soon as the user hovers a certain action point
2015-03-19 15:04:48 -03:00
Nicolás Badano
f96126153c
Reenable hiding useless actions
2015-03-19 14:45:05 -03:00
Nicolás Badano
acd3ca0d56
Interact menu:
...
- Allow dynamically adding children actions just-in-time
- Added optional custom parameters for actions
2015-03-19 13:00:10 -03:00
bux578
fed840a4f9
Update README.md
2015-03-19 13:09:56 +01:00
commy2
785d415189
Merge pull request #152 from KoffeinFlummi/fixesForFCS
...
Fixes for fcs
2015-03-18 17:58:34 +01:00
commy2
4235bd8b91
restore lost files?
2015-03-18 17:57:55 +01:00
commy2
31db62a85d
manual merge
2015-03-18 17:53:26 +01:00
commy2
1071284010
properly remove fake weapon, fix grabDrag action with fake weapon
2015-03-18 16:55:57 +01:00
commy2
330fc5658f
fake weapon had mass > 0, fix #205
2015-03-18 16:47:04 +01:00
commy2
89709e835d
Merge pull request #197 from KoffeinFlummi/drag
...
add PBO to drag objects
2015-03-18 16:04:12 +01:00
commy2
be17e25487
handle dc is the same fnc as handle killed
2015-03-18 16:02:01 +01:00
commy2
0bc7811912
don't drag or carry dead objects
2015-03-18 15:52:34 +01:00
commy2
4ea6b91e47
use eventhandlers instead of PFH
2015-03-18 15:42:33 +01:00
commy2
ec6496ed2f
fix authors, add weight checks
2015-03-18 14:14:16 +01:00
commy2
c23c0788f6
tweaks, carry static weapons
2015-03-18 13:36:22 +01:00
commy2
ac8ff45d44
lock / unlock events
2015-03-18 11:29:58 +01:00
commy2
ab39608e4d
change height when carrying, fix most cases of floating objects
2015-03-18 01:36:56 +01:00
commy2
dc7cfab06f
change default carry position
2015-03-17 15:45:34 +01:00
commy2
75548e21d9
add carry objects
2015-03-17 15:42:25 +01:00
commy2
57becc203c
handle disconnection when dragging
2015-03-17 13:47:07 +01:00
commy2
5f39cf213b
some fixes for MP
2015-03-17 12:20:46 +01:00
commy2
6d868d1bd1
fix collisions when releasing, fix crate fliping in buildings
2015-03-17 11:44:41 +01:00
Nicolás Badano
3030b78ea2
Refactor the interact_menu so options for multiple objects can coexist inside a single action point
2015-03-17 00:37:28 -03:00
Nicolás Badano
eb4ccd9505
Merge branch 'hearingCleanup' of github.com:KoffeinFlummi/ACE3
...
Conflicts:
addons/hearing/functions/fnc_updateVolume.sqf
2015-03-16 20:39:49 -03:00
Nicolás Badano
5b91996c69
Add hearing module and additional customization parameters:
...
- Enable/Disable combat deafness altogether (default on)
- Volume when using earbuds (default 50%)
- Volume when unconscious (default 40%)
2015-03-16 20:28:37 -03:00
Nicolás Badano
4c1f7111b5
Add map module
2015-03-16 20:24:53 -03:00
