e8112ada71
Merge branch 'master' into disarmingTest
2015-03-21 12:15:12 -05:00
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
8fac4b5798
Merge pull request #192 from KoffeinFlummi/medical-basic
...
Basic Medical Tweaks
2015-03-21 14:41:46 +01:00
75517f7ce4
Replace setDamage with setDead
2015-03-21 14:40:23 +01:00
f5f91c4802
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-03-21 10:24:01 -03:00
83d9aa4bb6
Replace tap shoulder and check (others) ammo animations by PutDown
2015-03-21 10:23:36 -03:00
9fd45fa707
Merge pull request #202 from KoffeinFlummi/vehLock-cleanup3
...
Vehicle Lock Cleanup
2015-03-21 09:51:47 -03:00
4be788a093
Merge pull request #208 from KoffeinFlummi/dynamicInteractMenu
...
Dynamic interact menu
2015-03-21 09:38:18 -03:00
4a8b5079a6
Fix #211
2015-03-21 09:37:01 -03:00
4fe09034ff
Merge branch 'master' into dynamicInteractMenu
2015-03-21 08:55:05 -03:00
e7d7fa8e6c
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-03-21 00:27:41 -03:00
14566c783b
Prevent canInteractWith from throwing errors if third parameter is not supplied
2015-03-21 00:27:19 -03:00
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
0dcb1dfab8
GUI
2015-03-20 20:48:39 -05:00
22483ce22e
Fix ranks, and uniform/vest drop
2015-03-20 20:47:34 -05:00
2d6fb7e148
Merge branch 'dynamicInteractMenu' of github.com:KoffeinFlummi/ACE3 into dynamicInteractMenu
2015-03-20 22:45:51 -03:00
3d6660b115
Debug stuff
2015-03-20 22:44:36 -03:00
b3aa7c8970
Make collectActiveActionTree follow mounts correctly
2015-03-20 22:44:25 -03:00
52623f71b8
Use Inventory Scaling Option
2015-03-20 20:27:04 -05:00
38745f4871
Various Changes
2015-03-20 20:17:49 -05:00
f8e758e136
Merge branch 'master' into disarmingTest
2015-03-20 19:05:54 -05:00
a060e4bea5
Apply translations to epipen and morphine actions
2015-03-21 00:31:47 +01:00
b1ed80a23d
Remove trailing whitespace in medical stringtable
2015-03-21 00:28:19 +01:00
510538bc53
Remove superfluous todo
2015-03-21 00:26:14 +01:00
88fb2765e3
Standardize actions across basic and advanced
2015-03-21 00:21:30 +01:00
7e383dc10e
#198 canInteractWith EGVAR -> EFUNC
2015-03-20 17:55:39 -05:00
6f8b5cc676
Fix missing dollar sign
2015-03-20 23:53:25 +01:00
fea63e597e
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medical-basic
2015-03-20 23:48:42 +01:00
8840284309
Fix progressBar
2015-03-20 17:46:21 -05:00
955506dbe8
stuff in to merge folder
2015-03-20 19:56:39 +01:00
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
33d4bf2f5a
Add localization for basic treatments and actions
2015-03-20 18:21:03 +01:00
9082712ff7
Replace Original with English keys in stringtable
2015-03-20 17:54:26 +01:00
66078a047b
Wut.
2015-03-20 07:52:41 +01:00
3e69123454
Make collectActiveActionTree follow mounts correctly
2015-03-20 00:55:13 -03:00
66731c9cdd
First rough implementation of the passengers menu, with mounted main actions
2015-03-20 00:53:58 -03:00
b854db0195
Updated interact_menu api calls on ace_dragging
2015-03-19 23:33:11 -03:00
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
07570fccd4
Make isMedic even prettier
2015-03-19 22:34:12 +01:00
5589b80c70
Rewrite and fix isMedic
2015-03-19 22:27:12 +01:00
97082e4ce3
Simplify condition checking in canTreat.
2015-03-19 22:01:40 +01:00
69e0ebf107
Add injury texts
2015-03-19 21:31:56 +01:00
102d86d7d1
Merge remote-tracking branch 'origin/master' into medical-basic
2015-03-19 21:30:27 +01:00
3dda70a4af
fixed variable name
2015-03-19 21:14:42 +01:00
49cdf6512e
Merge branch 'master' into dynamicInteractMenu
2015-03-19 15:09:31 -03:00
b89e573005
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-03-19 15:08:53 -03:00
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
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
f96126153c
Reenable hiding useless actions
2015-03-19 14:45:05 -03:00
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
