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
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
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
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
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
commy2
fef150cff2
attempt to fix collisions
2015-03-17 00:24:25 +01:00
Nicolás Badano
f90f1cfc21
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-03-16 18:39:20 -03:00
Nicolás Badano
cf45de7c11
Typo on altimeter. Fix #204
2015-03-16 18:36:09 -03:00
commy2
2aaef08c1d
can drag / drop functions, localization
2015-03-16 20:39:49 +01:00
commy2
2da0eee1e2
add drop dragged object action
2015-03-16 20:09:54 +01:00
commy2
27404fed1b
function to drop object, fix position event
2015-03-16 19:25:29 +01:00
PabstMirror
d06760e77e
Use ACRE API: acre_api_fnc_setGlobalVolume
2015-03-16 13:14:45 -05:00
PabstMirror
5d0f0c2896
Rename ACE_EarBuds -> ACE_EarPlugs
...
Can't verify translations
2015-03-16 10:56:05 -05:00
commy2
ad181de578
main me
...
nu for reammo_box
2015-03-16 15:41:55 +01:00
commy2
efb3657da3
drag boxes
2015-03-16 14:31:16 +01:00
PabstMirror
ec0e2d72c2
Check firer's silencer instead of player's
2015-03-15 16:47:50 -05:00
PabstMirror
04412e8ba4
Replace spawn with waitAndExec
2015-03-15 16:46:06 -05:00
PabstMirror
1cdc341320
Headers, Formatting
2015-03-15 16:40:47 -05:00
commy2
1117942c7a
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into drag
2015-03-15 19:32:07 +01:00
commy2
898476fc2f
no target in self actions
2015-03-15 16:45:06 +01:00
commy2
2744f46bd2
spelling
2015-03-15 16:12:37 +01:00
commy2
b5f307919e
replace canInteract with canInteractWith
2015-03-15 13:00:10 +01:00
commy2
0064f5739c
manual merge
2015-03-15 09:30:26 +01:00
commy2
4dab0b73d5
add conditions on post init
2015-03-15 09:26:16 +01:00
commy2
876424695e
solve canInteract conflicts, fix #198
2015-03-15 09:02:11 +01:00
PabstMirror
5a2d7d59b6
Maptools - Use MACRO_ADDITEM from Main
2015-03-14 21:38:16 -05:00
Glowbal
4f08d0d006
Merge branch 'master' into SettingsMenuImprovements
...
Conflicts:
addons/optionsmenu/functions/fnc_onListBoxSettingsChanged.sqf
addons/optionsmenu/functions/fnc_onListBoxShowSelectionChanged.sqf
addons/optionsmenu/functions/fnc_onSettingsMenuOpen.sqf
addons/optionsmenu/functions/fnc_onSliderPosChanged.sqf
addons/optionsmenu/functions/fnc_resetSettings.sqf
addons/optionsmenu/functions/fnc_settingsMenuUpdateKeyView.sqf
addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf
addons/optionsmenu/functions/fnc_updateSetting.sqf
addons/optionsmenu/gui/settingsMenu.hpp
2015-03-15 00:46:14 +01:00
Nicolás Badano
5264819fd4
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
...
Conflicts:
addons/map/CfgVehicles.hpp
2015-03-14 17:22:25 -03:00
Nicolás Badano
096b270b83
Merge branch 'mapContours' into mapfx
...
Conflicts:
addons/map/config.cpp
2015-03-14 17:20:25 -03:00
