PabstMirror
e8112ada71
Merge branch 'master' into disarmingTest
2015-03-21 12:15:12 -05:00
PabstMirror
8a9ac4147f
Update $PBOPREFIX$
...
Only getting error on server, not client
`Warning Message: Script z\ace\addons\gforces\XEH_preInit.sqf not found`
2015-03-21 12:14:38 -05:00
Felix Wiegand
8fac4b5798
Merge pull request #192 from KoffeinFlummi/medical-basic
...
Basic Medical Tweaks
2015-03-21 14:41:46 +01:00
KoffeinFlummi
75517f7ce4
Replace setDamage with setDead
2015-03-21 14:40:23 +01: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
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
PabstMirror
0dcb1dfab8
GUI
2015-03-20 20:48:39 -05:00
PabstMirror
22483ce22e
Fix ranks, and uniform/vest drop
2015-03-20 20:47:34 -05: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
52623f71b8
Use Inventory Scaling Option
2015-03-20 20:27:04 -05:00
PabstMirror
38745f4871
Various Changes
2015-03-20 20:17:49 -05:00
PabstMirror
f8e758e136
Merge branch 'master' into disarmingTest
2015-03-20 19:05:54 -05:00
KoffeinFlummi
a060e4bea5
Apply translations to epipen and morphine actions
2015-03-21 00:31:47 +01:00
KoffeinFlummi
b1ed80a23d
Remove trailing whitespace in medical stringtable
2015-03-21 00:28:19 +01:00
KoffeinFlummi
510538bc53
Remove superfluous todo
2015-03-21 00:26:14 +01:00
KoffeinFlummi
88fb2765e3
Standardize actions across basic and advanced
2015-03-21 00:21:30 +01:00
PabstMirror
7e383dc10e
#198 canInteractWith EGVAR -> EFUNC
2015-03-20 17:55:39 -05:00
KoffeinFlummi
6f8b5cc676
Fix missing dollar sign
2015-03-20 23:53:25 +01:00
KoffeinFlummi
fea63e597e
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medical-basic
2015-03-20 23:48:42 +01:00
PabstMirror
8840284309
Fix progressBar
2015-03-20 17:46:21 -05:00
KoffeinFlummi
33d4bf2f5a
Add localization for basic treatments and actions
2015-03-20 18:21:03 +01:00
KoffeinFlummi
9082712ff7
Replace Original with English keys in stringtable
2015-03-20 17:54:26 +01:00
KoffeinFlummi
66078a047b
Wut.
2015-03-20 07:52:41 +01: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
KoffeinFlummi
07570fccd4
Make isMedic even prettier
2015-03-19 22:34:12 +01:00
KoffeinFlummi
5589b80c70
Rewrite and fix isMedic
2015-03-19 22:27:12 +01:00
KoffeinFlummi
97082e4ce3
Simplify condition checking in canTreat.
2015-03-19 22:01:40 +01:00
KoffeinFlummi
69e0ebf107
Add injury texts
2015-03-19 21:31:56 +01:00
KoffeinFlummi
102d86d7d1
Merge remote-tracking branch 'origin/master' into medical-basic
2015-03-19 21:30:27 +01:00
Glowbal
3dda70a4af
fixed variable name
2015-03-19 21:14:42 +01: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
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
