jaynus
37bbbc607f
derp.
2015-04-01 10:20:58 -07:00
jaynus
46284622b3
Optional container variable for adding item to a specific container (vest/backpack/uniform)
2015-04-01 10:20:24 -07:00
Garth L-H de Wet
7d5555a2e0
Renamed functions to be more inline with their purpose.
...
Removed legacy code.
2015-04-01 19:09:19 +02:00
Garth L-H de Wet
e06e7a2a51
Added a function that will add the passed item to the unit or place it in a ground holder if the unit has no space.
2015-04-01 18:48:46 +02:00
PabstMirror
43a9e7bfc8
#176 - Belt Repacking
2015-04-01 11:21:30 -05:00
PabstMirror
0daa029622
Show Vehicle Name/Icon for interaction
2015-03-31 23:56:41 -05:00
PabstMirror
41489e271c
Merge pull request #261 from KoffeinFlummi/attachCleanup
...
Attach cleanup
2015-03-31 19:46:25 -05:00
Nicolás Badano
0d8bd0bc80
Merge pull request #279 from KoffeinFlummi/fixesInteractionConditions
...
Fixed various interaction conditions
2015-03-31 20:10:05 -03:00
Garth L-H de Wet
c020128f0e
Made explosives use children action points rather than the listbox at all points.
...
Added the ability to defuse on explosives. "on explosives", there is a helper object that handles defusing.
Known issue, it appears that the attachTo explosives don't detonate. This means the currently approach should be changed to a object variable method, instead of an attached object method.
2015-03-31 23:20:32 +02:00
Nicolás Badano
e38f48d7ad
Remove debug stuff
2015-03-31 18:16:53 -03:00
Nicolás Badano
1def2bd2b4
Fix bugs with interaction with vehicles and passengers
2015-03-31 18:09:29 -03:00
Nicolás Badano
4381f164d1
Fix the self interaction menu of vehicles
2015-03-31 18:09:23 -03:00
Nicolás Badano
149fd13fce
Prevent the interact menu from closing dialogs opened by the actions
2015-03-31 18:09:20 -03:00
Nicolás Badano
9a182b98b6
Fix the FCS keybinds
2015-03-31 18:09:14 -03:00
Garth L-H de Wet
613257141b
Merge branch 'removedExpPlaceMenu' into explosiveInteraction
...
Conflicts:
addons/explosives/CfgVehicles.hpp
addons/explosives/functions/fnc_openPlaceUI.sqf
2015-03-31 19:29:09 +02:00
Garth L-H de Wet
8158a3e841
Fixed small errors caused by working blind.
2015-03-31 19:26:38 +02:00
Garth L-H de Wet
9c13a87d83
Merge branch 'master' into explosiveInteraction
2015-03-31 17:21:55 +02:00
Garth L-H de Wet
37fe824426
Added pickup action to put down explosives.
2015-03-31 17:12:12 +02:00
PabstMirror
146812b5e6
Dragging - Detect static weapon disassembled
...
Static weapons can still be disassembled at any time during dragging.
This just adds a simple distance check and drops if object moves away
from player.
2015-03-30 21:51:11 -05:00
Nicolás Badano
1e0ece9fa2
Revert "Revert "1.42 - cursor mode when bipod deployed""
2015-03-30 17:32:55 -03:00
Nicolás Badano
8ed94e51f8
Merge pull request #276 from KoffeinFlummi/revert-272-142menudeploy
...
Revert "1.42 - cursor mode when bipod deployed"
2015-03-30 17:32:10 -03:00
Nicolás Badano
d9bfb84675
Revert "1.42 - cursor mode when bipod deployed"
2015-03-30 17:31:50 -03:00
Nicolás Badano
a7f1e58dcf
Merge pull request #272 from KoffeinFlummi/142menudeploy
...
1.42 - cursor mode when bipod deployed
2015-03-30 17:26:18 -03:00
commy2
d2e6d5887a
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-03-29 21:23:20 +02:00
commy2
54369b772f
fix: crate instantly drops when trying to pick up with lowered weapon
2015-03-29 20:46:29 +02:00
PabstMirror
1e2b47d6e7
Wirecutters - use new createAction system
2015-03-29 12:08:01 -05:00
PabstMirror
24b47584a2
InteractMenu - Fix Actions Added to Objects
2015-03-29 12:04:57 -05:00
PabstMirror
209bdc8dfd
Merge pull request #257 from KoffeinFlummi/captivesFixRespawn
...
Captives fix respawn Fix #230
2015-03-29 11:23:33 -05:00
commy2
6ca84c3d31
delete obsolete ammo configs
2015-03-29 14:25:13 +02:00
commy2
33f0ff9b82
1.42 ensure ace is loaded after marksmen configs
2015-03-29 14:19:01 +02:00
commy2
4a9124c170
changed behavior of silencers from Marksmen
2015-03-29 14:09:51 +02:00
PabstMirror
95a9daf18b
Minor Header Correction
2015-03-28 19:08:25 -05:00
commy2
e574d19844
1.42 - cursor mode when bipod deployed
2015-03-28 16:24:17 +01:00
commy2
c3b9d42834
prepare realistic names for marksman
2015-03-28 12:39:51 +01:00
commy2
b10d3b26ce
replace variables with new scripting commands
2015-03-28 11:23:13 +01:00
commy2
6c8064097f
delete old resting, farewell
2015-03-28 11:19:39 +01:00
commy2
86e5896c73
intendation
2015-03-28 09:05:58 +01:00
commy2
d959aa1619
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-03-28 08:38:37 +01:00
commy2
53aaeaacd5
fix #263
2015-03-28 08:38:16 +01:00
commy2
23cd523108
fix more inheritance
2015-03-28 08:06:08 +01:00
commy2
853c4d8dca
142 - fix inheritance changes
2015-03-28 07:50:52 +01:00
PabstMirror
40ccf7b241
Captives - Should disable reloading
2015-03-28 01:46:13 -05:00
commy2
772551cbb3
fix broken hungarian string
2015-03-28 07:39:23 +01:00
commy2
d7aaead032
remove obsolete function for channel
2015-03-28 07:04:50 +01:00
commy2
7486ae3036
ace_common_fnc_currentChannel is no longer relyable
2015-03-28 06:55:46 +01:00
PabstMirror
4e4834974a
cleanup debug
2015-03-27 23:26:41 -05:00
PabstMirror
aa5a580645
Cleanup
2015-03-27 23:24:11 -05:00
PabstMirror
909f53753a
Fix JIP Marker SYnc
2015-03-27 23:19:03 -05:00
PabstMirror
e5cbca02e4
Show placement angle in preview
2015-03-27 22:55:19 -05:00
PabstMirror
24bba5dea6
Headers
2015-03-27 20:51:30 -05:00
