Commit Graph

1756 Commits

Author SHA1 Message Date
jaynus
ec6fb6fcb8 containerize. 2015-04-01 10:34:16 -07:00
jaynus
c3f915a0ac tabs because 2015-04-01 10:22:27 -07:00
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
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
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
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
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
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
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
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
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
e7ec618f97 function decription 2015-03-28 02:10:04 +01:00
commy2
d12ba196c5 function to return attachments, muzzles with magazines and ammo, moved stuff around 2015-03-28 01:43:30 +01:00
commy2
66c026d4a0 refueling the uav didn't work on UAVs local to server or HC 2015-03-28 00:30:51 +01:00
commy2
5f1201d75a fix unexpected stringtable format 2015-03-27 19:08:01 +01:00
jaynus
d6b227e654 Merge branch 'master' into lasers 2015-03-27 10:40:33 -07:00
PabstMirror
47c72ac4ae Disable Debug Laser / Commenting 2015-03-27 12:08:05 -05:00
PabstMirror
4d62865ea2 Stop placement on interact_menu open 2015-03-27 11:53:04 -05:00
PabstMirror
91a1ed3264 Cancle attach action 2015-03-27 11:36:31 -05:00
PabstMirror
86c7776802 and this 2015-03-27 11:14:19 -05:00
PabstMirror
f43666eb93 Use CBA PFEH instead of BI stacked 2015-03-27 11:14:04 -05:00
PabstMirror
51e8dbf53f misc 2015-03-27 00:12:39 -05:00
PabstMirror
d03e474075 Replace selection dialog with interact children 2015-03-27 00:02:54 -05:00
PabstMirror
efe57461b5 misc 2015-03-26 20:05:30 -05:00
Glowbal
4336cf0fc1 Merge pull request #258 from KoffeinFlummi/BananaPort
Banana
2015-03-27 00:04:53 +01:00
PabstMirror
9ae4f39d05 Binary Seach for attach pos 2015-03-26 17:49:11 -05:00
Glowbal
f652ae89d1 Banana 2015-03-26 23:14:22 +01:00
PabstMirror
559f0dbaea Unconc - dropping object handled in dragging 2015-03-26 16:32:44 -05:00
PabstMirror
6a71a04ad9 opps 2015-03-26 15:52:30 -05:00